Changeset 12935

Timestamp:

02/01/12 18:42:42 (16 months ago)

Author:

robert

Message:

From Colin McDonald?, "I have an application with multiple windows. They share GL objects
between the contexts, using the GraphicsContext::Traits sharedContext
and setting the same contextID.

When one of these shared contexts is closed, GraphicsContext::close
deletes all GLObjects for that contextID, regardless of the fact that
they are shared. This means that all of the other contexts sharing the
objects have to recompile them.

The attached tweak makes GraphicsContext::close a bit less brutal for
shared contexts. I have also changed a misleading diagnostic message.
"

Files:

• OpenSceneGraph/trunk/src/osg/GraphicsContext.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/src/osg/GraphicsContext.cpp

@@ -305 +305 @@
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(s_contextIDMapMutex);
     
+    s_contextIDMap[contextID].incrementUsageCount();
+
     OSG_INFO<<"GraphicsContext::incrementContextIDUsageCount("<<contextID<<") to "<<s_contextIDMap[contextID]._numContexts<<std::endl;
-
-    s_contextIDMap[contextID].incrementUsageCount();
 }
 
@@ -539 +539 @@
         if (makeCurrent())
         {
-        
-            OSG_INFO<<"Doing delete of GL objects"<<std::endl;
-
-            osg::deleteAllGLObjects(_state->getContextID());
-
-            OSG_INFO<<"Done delete of GL objects"<<std::endl;
+            if ( !sharedContextExists )
+            {
+                OSG_INFO<<"Doing delete of GL objects"<<std::endl;
+
+                osg::deleteAllGLObjects(_state->getContextID());
+
+                OSG_INFO<<"Done delete of GL objects"<<std::endl;
+            }
+            else
+            {
+                // If the GL objects are shared with other contexts then only flush those
+                // which have already been deleted
+
+                osg::flushAllDeletedGLObjects(_state->getContextID());
+            }
 
             _state->reset();
@@ -562 +571 @@
     // the the flushDelete*() methods not being invoked, such as when using GraphicContextEmbedded where makeCurrent
     // does not work.
-    if (_state.valid())
+    if ( !sharedContextExists && _state.valid())
     {
         OSG_INFO<<"Doing discard of deleted OpenGL objects."<<std::endl;