FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Colin McDonald, "I have an application with multiple windows. They share GL objects

Browse Source 
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.
"
This commit is contained in:
Robert Osfield 2012-02-01 17:42:42 +00:00
parent 43f9a76169
commit fe61dcac69
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/osg/GraphicsContext.cpp
View File

@ -304,9 +304,9 @@ void GraphicsContext::incrementContextIDUsageCount(unsigned int contextID)
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(s_contextIDMapMutex);
OSG_INFO<<"GraphicsContext::incrementContextIDUsageCount("<<contextID<<") to "<<s_contextIDMap[contextID]._numContexts<<std::endl;
s_contextIDMap[contextID].incrementUsageCount();
OSG_INFO<<"GraphicsContext::incrementContextIDUsageCount("<<contextID<<") to "<<s_contextIDMap[contextID]._numContexts<<std::endl;
}
void GraphicsContext::decrementContextIDUsageCount(unsigned int contextID)
@ -538,12 +538,21 @@ void GraphicsContext::close(bool callCloseImplementation)
if (makeCurrent())
{
OSG_INFO<<"Doing delete of GL objects"<<std::endl;
if ( !sharedContextExists )
{
OSG_INFO<<"Doing delete of GL objects"<<std::endl;
osg::deleteAllGLObjects(_state->getContextID());
osg::deleteAllGLObjects(_state->getContextID());
OSG_INFO<<"Done delete of GL objects"<<std::endl;
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();
@ -561,7 +570,7 @@ void GraphicsContext::close(bool callCloseImplementation)
// now discard any deleted deleted OpenGL objects that the are still hanging around - such as due to
// 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;