Changeset 9549 for OpenSceneGraph/trunk/include/osg/State

Timestamp:

01/26/09 16:16:24 (4 years ago)

Author:

robert

Message:

Fixed effective leak in Program::PerContextProgram? caused by previously osg::State keeping a set of std::ref_ptr<Program::PerContextProgram?> without ever pruning this list.
The fix was to convert the osg::State to use C pointers for the set of applied PerContexProgram? objects, and use the osg::Oberver mechanism to avoid dangling pointers for being maintained in osg::State.

Files:

• OpenSceneGraph/trunk/include/osg/State (modified) (5 diffs)

OpenSceneGraph/trunk/include/osg/State

@@ -20 +20 @@
 #include <osg/Uniform>
 #include <osg/BufferObject>
+#include <osg/observer_ptr>
 
 #include <osg/FrameStamp>
@@ -85 +86 @@
   *   \c captureCurrentState() and \c getModelViewMatrix()).
   */
-class OSG_EXPORT State : public Referenced
+class OSG_EXPORT State : public Referenced, public Observer
 {
     public :
@@ -961 +962 @@
 
 
-        void setLastAppliedProgramObject(const Program::PerContextProgram* program) { if (_lastAppliedProgramObject!=program) { _lastAppliedProgramObject = program; if (program) _appliedProgramObjectSet.insert(program); } }
-        const Program::PerContextProgram* getLastAppliedProgramObject() const { return _lastAppliedProgramObject; }
+        inline void setLastAppliedProgramObject(const Program::PerContextProgram* program)
+        {
+            if (_lastAppliedProgramObject!=program)
+            {
+                _lastAppliedProgramObject = program; 
+                if (program && _appliedProgramObjectSet.count(program)==0)
+                {
+                    _appliedProgramObjectSet.insert(program); 
+                    program->addObserver(this);
+                }
+            }
+        }
+        inline const Program::PerContextProgram* getLastAppliedProgramObject() const { return _lastAppliedProgramObject; }
 
         inline GLint getUniformLocation( const std::string& name ) const { return _lastAppliedProgramObject ? _lastAppliedProgramObject->getUniformLocation(name) : -1; }
@@ -1065 +1077 @@
         void initializeExtensionProcs();
 
+        virtual void objectDeleted(void* object);
+
     protected:
 
@@ -1207 +1221 @@
         typedef std::vector<ref_ptr<const Matrix> >                     MatrixStack;
         
-        typedef std::set<osg::ref_ptr<const Program::PerContextProgram> > AppliedProgramObjectSet;
+        typedef std::set<const Program::PerContextProgram* >            AppliedProgramObjectSet;
 
         ModeMap                                                         _modeMap;