Changeset 7074

Timestamp:

07/06/07 15:08:51 (6 years ago)

Author:

robert

Message:

Added include/osg/GLObjects + .cpp which provide osg::flush*DeletedGLObjects() methods.

Added and cleaned up DeleteHandler? calls in osgViewer to help avoid crashes on exit.

Changed DatabasePager? across to dynamically checcking osg::getCompileContext(..)

Updated wrappers.

Location:

OpenSceneGraph/trunk

Files:

• applications/osgviewer/osgviewer.cpp (modified) (2 diffs)
• examples/osgteapot/osgteapot.cpp (modified) (3 diffs)
• include/osg/GLObjects (added)
• include/osgDB/DatabasePager (modified) (3 diffs)
• src/osg/CMakeLists.txt (modified) (2 diffs)
• src/osg/GLObjects.cpp (added)
• src/osg/GraphicsContext.cpp (modified) (1 diff)
• src/osgDB/DatabasePager.cpp (modified) (5 diffs)
• src/osgUtil/SceneView.cpp (modified) (3 diffs)
• src/osgViewer/GraphicsWindowCarbon.cpp (modified) (2 diffs)
• src/osgViewer/GraphicsWindowWin32.cpp (modified) (2 diffs)
• src/osgViewer/GraphicsWindowX11.cpp (modified) (3 diffs)
• src/osgWrappers/osgDB/DatabasePager.cpp (modified) (1 diff)

OpenSceneGraph/trunk/applications/osgviewer/osgviewer.cpp

@@ -158 +158 @@
         int processNum = 0;
 
-        osgDB::DatabasePager* dp = viewer.getScene()->getDatabasePager();
-
         for(unsigned int i=0; i<osg::GraphicsContext::getMaxContextID(); ++i)
         {
@@ -172 +170 @@
                 ++processNum;
             }
-
-            dp->addCompileGraphicsContext(gc);
         }
     }

OpenSceneGraph/trunk/examples/osgteapot/osgteapot.cpp

@@ -333 +333 @@
 int main(int , char **)
 {
-#if 1    
+#if 1
 
     // create viewer on heap as a test, this looks to be causing problems
@@ -345 +345 @@
     viewer->setSceneData( createTeapot() );
 
-    // create the windows and run the threads.
     return viewer->run();
     
@@ -358 +357 @@
     // create the windows and run the threads.
     return viewer.run();
-
 #endif
 

OpenSceneGraph/trunk/include/osgDB/DatabasePager

@@ -219 +219 @@
         }
         
-        
-        /** Add a graphics context that should be used to compile/delete OpenGL objects.*/
-        void addCompileGraphicsContext(osg::GraphicsContext* gc);
-        
-        /** Removed a graphics context that should be used to compile/delete OpenGL objects.*/
-        void removeCompileGraphicsContext(osg::GraphicsContext* gc);
-
-        
         /** Turn the compilation of rendering objects for specfied graphics context on (true) or off(false). */
         void setCompileGLObjectsForContextID(unsigned int contextID, bool on);
@@ -232 +224 @@
         /** Get whether the compilation of rendering objects for specfied graphics context on (true) or off(false). */
         bool getCompileGLObjectsForContextID(unsigned int contextID);
-
 
         /** Rerturn true if an external draw thread should call compileGLObjects(..) or not.*/
@@ -376 +367 @@
 
         ActiveGraphicsContexts          _activeGraphicsContexts;
-        CompileGraphicsContexts         _compileGraphicsContexts;
+        // CompileGraphicsContexts         _compileGraphicsContexts;
         
         bool                            _doPreCompile;

OpenSceneGraph/trunk/src/osg/CMakeLists.txt

@@ -60 +60 @@
     ${HEADER_PATH}/GL2Extensions
     ${HEADER_PATH}/GLExtensions
+    ${HEADER_PATH}/GLObjects
     ${HEADER_PATH}/GLU
     ${HEADER_PATH}/Geode
@@ -213 +214 @@
     FrontFace.cpp
     GLExtensions.cpp
+    GLObjects.cpp
     Geode.cpp
     Geometry.cpp

OpenSceneGraph/trunk/src/osg/GraphicsContext.cpp

@@ -281 +281 @@
 GraphicsContext* GraphicsContext::getCompileContext(unsigned int contextID)
 {
-    osg::notify(osg::NOTICE)<<"GraphicsContext::getCompileContext "<<contextID<<std::endl;
+    //osg::notify(osg::NOTICE)<<"GraphicsContext::getCompileContext "<<contextID<<std::endl;
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(s_contextIDMapMutex);
     return s_contextIDMap[contextID]._compileContext.get();

OpenSceneGraph/trunk/src/osgDB/DatabasePager.cpp

@@ -293 +293 @@
             startThread();
         }
-                
     }
 }
@@ -595 +594 @@
                 }
                 
-                if (loadedObjectsNeedToBeCompiled && !_compileGraphicsContexts.empty())
-                {
-                    for(CompileGraphicsContexts::iterator citr = _compileGraphicsContexts.begin();
-                        citr != _compileGraphicsContexts.end();
-                        ++citr)
+                if (loadedObjectsNeedToBeCompiled)
+                {
+                    for(ActiveGraphicsContexts::iterator itr = _activeGraphicsContexts.begin();
+                        itr != _activeGraphicsContexts.end();
+                        ++itr)
                     {
-                        osg::GraphicsContext* gc = citr->get();
+                        osg::GraphicsContext* gc = osg::GraphicsContext::getCompileContext(*itr);
                         if (gc)
                         {   
-                            osg::OperationsThread* gt = gc->getGraphicsThread();                            
-                            if (gt) gt->add(new DatabasePager::CompileOperation(this));
+                            osg::OperationsThread* gt = gc->getGraphicsThread();
+                            if (gt)
+                            {
+                                gt->add(new DatabasePager::CompileOperation(this));
+                            }
                             else
                             {
                                 gc->makeCurrent();
-                                
-                                // osg::notify(osg::NOTICE)<<"Database pager thread compiling"<<std::endl;
                                 
                                 compileAllGLObjects(*(gc->getState()));
@@ -618 +618 @@
                         }
                     }
+
                     // osg::notify(osg::NOTICE)<<"Done compiling in paging thread"<<std::endl;                   
                 }
@@ -884 +885 @@
 }
 
-void DatabasePager::addCompileGraphicsContext(osg::GraphicsContext* gc)
-{
-    for(CompileGraphicsContexts::iterator itr = _compileGraphicsContexts.begin();
-        itr != _compileGraphicsContexts.end();
-        ++itr)
-    {
-        if (*itr == gc)
-        {
-            return;
-        }
-    }
-    
-    _compileGraphicsContexts.push_back(gc);
-    
-    setCompileGLObjectsForContextID(gc->getState()->getContextID(),true);
-}
-
-void DatabasePager::removeCompileGraphicsContext(osg::GraphicsContext* gc)
-{
-    for(CompileGraphicsContexts::iterator itr = _compileGraphicsContexts.begin();
-        itr != _compileGraphicsContexts.end();
-        ++itr)
-    {
-        if (*itr == gc)
-        {
-            _compileGraphicsContexts.erase(itr);
-            return;
-        }
-    }
-}
-
 void DatabasePager::setCompileGLObjectsForContextID(unsigned int contextID, bool on)
 {
@@ -952 +922 @@
 {
     if (_activeGraphicsContexts.count(contextID)==0) return false;
-    
-    for(CompileGraphicsContexts::const_iterator citr = _compileGraphicsContexts.begin();
-        citr != _compileGraphicsContexts.end();
-        ++citr)
-    {
-        const osg::GraphicsContext* gc = citr->get();
-        if (gc && gc->getState()->getContextID()==contextID) return false;
-    }
-
-    return true;    
+
+    return osg::GraphicsContext::getCompileContext(contextID)==0;
 }
 

OpenSceneGraph/trunk/src/osgUtil/SceneView.cpp

@@ -17 +17 @@
 #include <osg/Timer>
 #include <osg/GLExtensions>
+#include <osg/GLObjects>
 #include <osg/Notify>
 #include <osg/Texture>
-#include <osg/VertexProgram>
-#include <osg/FragmentProgram>
 #include <osg/AlphaFunc>
 #include <osg/TexEnv>
@@ -26 +25 @@
 #include <osg/LightModel>
 #include <osg/CollectOccludersVisitor>
-#include <osg/Shader>
-#include <osg/BufferObject>
 
 #include <osg/GLU>
@@ -836 +833 @@
     _requiresFlush = false;
     
-    double availableTime = 100.0f;
+    osg::flushAllDeletedGLObjects(getState()->getContextID());
+ }
+
+void SceneView::flushDeletedGLObjects(double& availableTime)
+{
+    osg::State* state = _renderInfo.getState();
+
+    _requiresFlush = false;
+
     double currentTime = state->getFrameStamp()?state->getFrameStamp()->getReferenceTime():0.0;
-    
-    osg::FrameBufferObject::flushDeletedFrameBufferObjects(state->getContextID(),currentTime,availableTime);
-    osg::RenderBuffer::flushDeletedRenderBuffers(state->getContextID(),currentTime,availableTime);
-    osg::Texture::flushAllDeletedTextureObjects(state->getContextID());
-    osg::Drawable::flushAllDeletedDisplayLists(state->getContextID());
-    osg::Drawable::flushDeletedVertexBufferObjects(state->getContextID(),currentTime,availableTime);
-    osg::VertexProgram::flushDeletedVertexProgramObjects(state->getContextID(),currentTime,availableTime);
-    osg::FragmentProgram::flushDeletedFragmentProgramObjects(state->getContextID(),currentTime,availableTime);
-    osg::Program::flushDeletedGlPrograms(state->getContextID(),currentTime,availableTime);
-    osg::Shader::flushDeletedGlShaders(state->getContextID(),currentTime,availableTime);
-    osg::BufferObject::flushDeletedBufferObjects(state->getContextID(),currentTime,availableTime);
- }
-
-void SceneView::flushDeletedGLObjects(double& availableTime)
-{
-    osg::State* state = _renderInfo.getState();
-
-    _requiresFlush = false;
-
-    double currentTime = state->getFrameStamp()?state->getFrameStamp()->getReferenceTime():0.0;
-
-    osg::FrameBufferObject::flushDeletedFrameBufferObjects(state->getContextID(),currentTime,availableTime);
-    osg::RenderBuffer::flushDeletedRenderBuffers(state->getContextID(),currentTime,availableTime);
-    osg::Texture::flushDeletedTextureObjects(state->getContextID(),currentTime,availableTime);
-    osg::Drawable::flushDeletedDisplayLists(state->getContextID(),availableTime);
-    osg::Drawable::flushDeletedVertexBufferObjects(state->getContextID(),currentTime,availableTime);
-    osg::VertexProgram::flushDeletedVertexProgramObjects(state->getContextID(),currentTime,availableTime);
-    osg::FragmentProgram::flushDeletedFragmentProgramObjects(state->getContextID(),currentTime,availableTime);
-    osg::Program::flushDeletedGlPrograms(state->getContextID(),currentTime,availableTime);
-    osg::Shader::flushDeletedGlShaders(state->getContextID(),currentTime,availableTime);
-    osg::BufferObject::flushDeletedBufferObjects(state->getContextID(),currentTime,availableTime);
+
+    osg::flushDeletedGLObjects(getState()->getContextID(), currentTime, availableTime);
 }
 

OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCarbon.cpp

@@ -344 +344 @@
     
     /** dtor */
-    ~OSXCarbonWindowingSystemInterface() {
-        if (_displayIds)
-            delete[] _displayIds;
+    ~OSXCarbonWindowingSystemInterface()
+    {
+        if (osg::Referenced::getDeleteHandler())
+        {
+            osg::Referenced::getDeleteHandler()->setNumFramesToRetainObjects(0);
+            osg::Referenced::getDeleteHandler()->flushAll();
+        }
+
+        if (_displayIds) delete[] _displayIds;
         _displayIds = NULL;
     }
@@ -1135 +1141 @@
     ~RegisterWindowingSystemInterfaceProxy()
     {
+        if (osg::Referenced::getDeleteHandler())
+        {
+            osg::Referenced::getDeleteHandler()->setNumFramesToRetainObjects(0);
+            osg::Referenced::getDeleteHandler()->flushAll();
+        }
+
         osg::GraphicsContext::setWindowingSystemInterface(0);
     }

OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowWin32.cpp

@@ -568 +568 @@
 Win32WindowingSystem::~Win32WindowingSystem()
 {
+    if (osg::Referenced::getDeleteHandler())
+    {
+        osg::Referenced::getDeleteHandler()->setNumFramesToRetainObjects(0);
+        osg::Referenced::getDeleteHandler()->flushAll();
+    }
+    
     unregisterWindowClasses();
 }
@@ -2185 +2191 @@
     ~RegisterWindowingSystemInterfaceProxy()
     {
+        if (osg::Referenced::getDeleteHandler())
+        {
+            osg::Referenced::getDeleteHandler()->setNumFramesToRetainObjects(0);
+            osg::Referenced::getDeleteHandler()->flushAll();
+        }
+
         osg::GraphicsContext::setWindowingSystemInterface(0);
     }

OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowX11.cpp

@@ -19 +19 @@
 #include <osgViewer/api/X11/GraphicsWindowX11>
 #include <osgViewer/api/X11/PixelBufferX11>
+
+#include <osg/DeleteHandler>
 
 #include <X11/Xlib.h>
@@ -1179 +1181 @@
     ~X11WindowingSystemInterface()
     {
+        if (osg::Referenced::getDeleteHandler())
+        {
+            osg::Referenced::getDeleteHandler()->setNumFramesToRetainObjects(0);
+            osg::Referenced::getDeleteHandler()->flushAll();
+        }
+
         //osg::notify(osg::NOTICE)<<"~X11WindowingSystemInterface()"<<std::endl;
         XSetErrorHandler(0);
@@ -1252 +1260 @@
     {
         osg::notify(osg::INFO)<<"~RegisterWindowingSystemInterfaceProxy()"<<std::endl;
+
+        if (osg::Referenced::getDeleteHandler())
+        {
+            osg::Referenced::getDeleteHandler()->setNumFramesToRetainObjects(0);
+            osg::Referenced::getDeleteHandler()->flushAll();
+        }
+
         osg::GraphicsContext::setWindowingSystemInterface(0);
+
     }
 };

OpenSceneGraph/trunk/src/osgWrappers/osgDB/DatabasePager.cpp

@@ -260 +260 @@
                   "Merge the changes to the scene graph by calling calling removeExpiredSubgraphs then addLoadedDataToSceneGraph. ",
                   "Note, must only be called from single thread update phase. ");
-        I_Method1(void, addCompileGraphicsContext, IN, osg::GraphicsContext *, gc,
-                  Properties::NON_VIRTUAL,
-                  __void__addCompileGraphicsContext__osg_GraphicsContext_P1,
-                  "Add a graphics context that should be used to compile/delete OpenGL objects. ",
-                  "");
-        I_Method1(void, removeCompileGraphicsContext, IN, osg::GraphicsContext *, gc,
-                  Properties::NON_VIRTUAL,
-                  __void__removeCompileGraphicsContext__osg_GraphicsContext_P1,
-                  "Removed a graphics context that should be used to compile/delete OpenGL objects. ",
-                  "");
         I_Method2(void, setCompileGLObjectsForContextID, IN, unsigned int, contextID, IN, bool, on,
                   Properties::NON_VIRTUAL,