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

From Tim Moore, fix for race conditions in takeOrGenerate() methods

Browse Source
This commit is contained in:
Robert Osfield
2010-12-17 13:43:41 +00:00
parent d8e3225cd8
commit 362edaa1b9
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/osg/BufferObject.cpp
View File

@@ -749,14 +749,17 @@ GLBufferObject* GLBufferObjectSet::takeFromOrphans(BufferObject* bufferObject)
GLBufferObject* GLBufferObjectSet::takeOrGenerate(BufferObject* bufferObject)
{
// see if we can recyle GLBufferObject from the orphane list
if (!_pendingOrphanedGLBufferObjects.empty())
// see if we can recyle GLBufferObject from the orphan list
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
handlePendingOrphandedGLBufferObjects();
return takeFromOrphans(bufferObject);
if (!_pendingOrphanedGLBufferObjects.empty())
{
handlePendingOrphandedGLBufferObjects();
return takeFromOrphans(bufferObject);
}
}
else if (!_orphanedGLBufferObjects.empty())
if (!_orphanedGLBufferObjects.empty())
{
return takeFromOrphans(bufferObject);
}

13
src/osg/Texture.cpp
View File

@@ -514,14 +514,17 @@ Texture::TextureObject* Texture::TextureObjectSet::takeFromOrphans(Texture* text
Texture::TextureObject* Texture::TextureObjectSet::takeOrGenerate(Texture* texture)
{
// see if we can recyle TextureObject from the orphane list
if (!_pendingOrphanedTextureObjects.empty())
// see if we can recyle TextureObject from the orphan list
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
handlePendingOrphandedTextureObjects();
return takeFromOrphans(texture);
if (!_pendingOrphanedTextureObjects.empty())
{
handlePendingOrphandedTextureObjects();
return takeFromOrphans(texture);
}
}
else if (!_orphanedTextureObjects.empty())
if (!_orphanedTextureObjects.empty())
{
return takeFromOrphans(texture);
}