Changeset 7074 for OpenSceneGraph/trunk/src/osgDB/DatabasePager.cpp

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.

Files:

• OpenSceneGraph/trunk/src/osgDB/DatabasePager.cpp (modified) (5 diffs)

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;
 }