Changeset 8195

Timestamp:

04/23/08 16:10:41

Author:

robert

Message:

Added mutex to object creation to avoid a race condition when using threaded multiple graphics context

Files:

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

OpenSceneGraph/trunk/src/osg/TextureRectangle.cpp

@@ -147 +147 @@
-    const unsigned int contextID = state.getContextID();
-
+
+    static OpenThreads::Mutex s_mutex;
+
-    // get the texture object for the current contextID.
-    TextureObject* textureObject = getTextureObject(contextID);
-
+
+
-    if (textureObject != 0)
-    {
@@ -190 +194 @@
-    else if (_image.valid() && _image->data())
-    {
+
+        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(s_mutex);
+
-        // we don't have a applyTexImage1D_subload yet so can't reuse.. so just generate a new texture object.        
-        _textureObjectBuffer[contextID] = textureObject = generateTextureObject(contextID,GL_TEXTURE_RECTANGLE);
-
+
-        textureObject->bind();
-
@@ -206 +213 @@
-            non_const_this->_image = 0;
-        }
+
+
-    }
-    else if ( (_textureWidth!=0) && (_textureHeight!=0) && (_internalFormat!=0) )