Changeset 8606

Timestamp:

07/16/08 15:23:58

Author:

robert

Message:

Moved the _textureObjectBuffer assignment to after the imagery has been download to avoid crashes under multi-threaded compile of texture objects (was causing a crash with 3D Textures, but is something that would happen with other Texture types as well.)

Files:

• OpenSceneGraph/trunk/src/osg/Texture1D.cpp (modified) (2 diffs)
• OpenSceneGraph/trunk/src/osg/Texture2D.cpp (modified) (2 diffs)
• OpenSceneGraph/trunk/src/osg/Texture2DArray.cpp (modified) (2 diffs)
• OpenSceneGraph/trunk/src/osg/Texture3D.cpp (modified) (2 diffs)
• OpenSceneGraph/trunk/src/osg/TextureCubeMap.cpp (modified) (2 diffs)
• OpenSceneGraph/trunk/src/osg/TextureRectangle.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/src/osg/Texture1D.cpp

@@ -151 +151 @@
-
-        // we don't have a applyTexImage1D_subload yet so can't reuse.. so just generate a new texture object.        
-_textureObjectBuffer[contextID] = 
+
-
-        textureObject->bind();
@@ -163 +163 @@
-        // update the modified count to show that it is upto date.
-        getModifiedCount(contextID) = _image->getModifiedCount();
+    
+        _textureObjectBuffer[contextID] = textureObject;
-    
-        if (_unrefImageDataAfterApply && areAllTextureObjectsLoaded() && _image->getDataVariance()==STATIC)

OpenSceneGraph/trunk/src/osg/Texture2D.cpp

@@ -185 +185 @@
-        
-        
-_textureObjectBuffer[contextID] =
+
-                contextID,GL_TEXTURE_2D,_numMipmapLevels,_internalFormat,_textureWidth,_textureHeight,1,0);
-        
@@ -211 +211 @@
-        getModifiedCount(contextID) = image->getModifiedCount();
-
+        _textureObjectBuffer[contextID] = textureObject;
-
-        if (_unrefImageDataAfterApply && areAllTextureObjectsLoaded() && image->getDataVariance()==STATIC)

OpenSceneGraph/trunk/src/osg/Texture2DArray.cpp

@@ -243 +243 @@
-
-        // create texture object
-_textureObjectBuffer[contextID] = 
+
-                contextID,GL_TEXTURE_2D_ARRAY_EXT,_numMipmapLevels,_internalFormat,_textureWidth,_textureHeight,_textureDepth,0);
-        
@@ -272 +272 @@
-        textureObject->setAllocated(_numMipmapLevels,_internalFormat,_textureWidth,_textureHeight,_textureDepth,0);
-
+        _textureObjectBuffer[contextID] = textureObject;
+        
-        // no idea what this for ;-)
-        if (_unrefImageDataAfterApply && areAllTextureObjectsLoaded())

OpenSceneGraph/trunk/src/osg/Texture3D.cpp

@@ -232 +232 @@
-        computeRequiredTextureDimensions(state,*_image,_textureWidth, _textureHeight, _textureDepth,_numMipmapLevels);
-
-_textureObjectBuffer[contextID] = 
+
-
-        textureObject->bind();
@@ -245 +245 @@
-        // update the modified count to show that it is upto date.
-        getModifiedCount(contextID) = _image->getModifiedCount();
+
+        _textureObjectBuffer[contextID] = textureObject;
-
-        if (_unrefImageDataAfterApply && areAllTextureObjectsLoaded() && _image->getDataVariance()==STATIC)

OpenSceneGraph/trunk/src/osg/TextureCubeMap.cpp

@@ -228 +228 @@
-        }
-
-_textureObjectBuffer[contextID] = 
+
-                contextID,GL_TEXTURE_CUBE_MAP,_numMipmapLevels,_internalFormat,_textureWidth,_textureHeight,1,0);
-        
@@ -253 +253 @@
-
-        }
+
+        _textureObjectBuffer[contextID] = textureObject;
-
-        if (_unrefImageDataAfterApply && areAllTextureObjectsLoaded())

OpenSceneGraph/trunk/src/osg/TextureRectangle.cpp

@@ -198 +198 @@
-
-        // we don't have a applyTexImage1D_subload yet so can't reuse.. so just generate a new texture object.        
-_textureObjectBuffer[contextID] = 
+
-        
-        textureObject->bind();
@@ -207 +207 @@
-
-        textureObject->setAllocated(1,_internalFormat,_textureWidth,_textureHeight,1,0);
+        
+        _textureObjectBuffer[contextID] = textureObject;
-
-        if (_unrefImageDataAfterApply && areAllTextureObjectsLoaded() && _image->getDataVariance()==STATIC)