Changeset 7146

Timestamp:

07/22/07 22:33:20

Author:

robert

Message:

Added support for using the CompileContext? to do GL object deletion.

Files:

• OpenSceneGraph/trunk/src/osgViewer/CompositeViewer.cpp (modified) (3 diffs)
• OpenSceneGraph/trunk/src/osgViewer/Viewer.cpp (modified) (9 diffs)

OpenSceneGraph/trunk/src/osgViewer/CompositeViewer.cpp

@@ -565 +565 @@
-    {
-        _sceneView->getCullVisitor()->setDatabaseRequestHandler(_databasePager.get());
+        
+        _flushOperation = new osg::FlushDeletedGLObjectsOperation(0.1);
-    }
-    
@@ -578 +580 @@
-        if (view) _sceneView->setFusionDistance(view->getFusionDistanceMode(), view->getFusionDistanceValue());
-
+        osg::GraphicsContext* compileContext = osg::GraphicsContext::getCompileContext(_sceneView->getState()->getContextID());
+        osg::GraphicsThread* compileThread = compileContext ? compileContext->getGraphicsThread() : 0;
+
-        _sceneView->inheritCullSettings(*(_sceneView->getCamera()));
-        _sceneView->cull();
@@ -589 +594 @@
-        }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-};
-

OpenSceneGraph/trunk/src/osgViewer/Viewer.cpp

@@ -138 +138 @@
-    {
-        _sceneView->getCullVisitor()->setDatabaseRequestHandler(_databasePager.get());
+        
+        _flushOperation = new osg::FlushDeletedGLObjectsOperation(0.1);
-    }
-    
@@ -203 +205 @@
-             _databasePager->compileGLObjects(*(_sceneView->getState()), availableTime);
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-        if (aquireGPUStats)
@@ -226 +239 @@
-    }
-    
-
-
+
+
+
-
-};
@@ -262 +276 @@
-        }
-    
+        
+        _flushOperation = new osg::FlushDeletedGLObjectsOperation(0.1);
+
-        // osg::notify(osg::NOTICE)<<"constructed"<<std::endl;
-    }
@@ -367 +384 @@
-        osgUtil::SceneView* sceneView = _sceneView[_currentDraw].get();
-        
+        osg::GraphicsContext* compileContext = osg::GraphicsContext::getCompileContext(sceneView->getState()->getContextID());
+        osg::GraphicsThread* compileThread = compileContext ? compileContext->getGraphicsThread() : 0;
+
-        if (sceneView || _done)
-        {
@@ -428 +448 @@
-            }
-
-
+
+
+
+
+
+
+
+
-
-            if (aquireGPUStats)
@@ -457 +484 @@
-        osgUtil::SceneView* sceneView = _sceneView[_currentDraw].get();
-        if (!sceneView || _done) return;
+
+        osg::GraphicsContext* compileContext = osg::GraphicsContext::getCompileContext(sceneView->getState()->getContextID());
+        osg::GraphicsThread* compileThread = compileContext ? compileContext->getGraphicsThread() : 0;
-
-        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex[_currentDraw]);
@@ -516 +546 @@
-            _databasePager->compileGLObjects(*(sceneView->getState()), availableTime);
-        }
-
+
+
+
+
+
+
+
+
+
-
-        if (aquireGPUStats)
@@ -590 +628 @@
-    osg::observer_ptr<osgDB::DatabasePager> _databasePager;
-
+    osg::ref_ptr<osg::FlushDeletedGLObjectsOperation> _flushOperation;
-
-};