prevent immutability resetting when textureobject is taken from orphans

openscenegraph · Mar 26, 2020 · 4e7a67d · 4e7a67d
1 parent 864b087
commit 4e7a67d
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 16 deletions.
diff --git a/include/osg/Texture b/include/osg/Texture
@@ -1002,7 +1002,8 @@ class OSG_EXPORT Texture : public osg::StateAttribute
                 _texture(texture),
                 _allocated(false),
                 _frameLastUsed(0),
-                _timeStamp(0) {}
+                _timeStamp(0),
+                _immutableSetted(false) {}
 
             inline TextureObject(Texture* texture, GLuint id, const TextureProfile& profile):
                 _id(id),
@@ -1013,7 +1014,8 @@ class OSG_EXPORT Texture : public osg::StateAttribute
                 _texture(texture),
                 _allocated(false),
                 _frameLastUsed(0),
-                _timeStamp(0) {}
+                _timeStamp(0),
+                _immutableSetted(false) {}
 
             inline TextureObject(Texture* texture,
                           GLuint    id,
@@ -1032,7 +1034,8 @@ class OSG_EXPORT Texture : public osg::StateAttribute
                 _texture(texture),
                 _allocated(false),
                 _frameLastUsed(0),
-                _timeStamp(0) {}
+                _timeStamp(0),
+                _immutableSetted(false) {}
 
             inline bool match(GLenum    target,
                        GLint     numMipmapLevels,
@@ -1085,6 +1088,7 @@ class OSG_EXPORT Texture : public osg::StateAttribute
             bool                _allocated;
             unsigned int        _frameLastUsed;
             double              _timeStamp;
+            bool                _immutableSetted;
 
         protected:
             virtual ~TextureObject();

diff --git a/src/osg/Texture1D.cpp b/src/osg/Texture1D.cpp
@@ -238,8 +238,11 @@ void Texture1D::apply(State& state) const
             textureObject = generateAndAssignTextureObject(contextID, GL_TEXTURE_1D, _numMipmapLevels, texStorageSizedInternalFormat, _textureWidth, 1, 1, 0);
             textureObject->bind();
             applyTexParameters(GL_TEXTURE_1D, state);
-
-            extensions->glTexStorage1D( GL_TEXTURE_1D, osg::maximum(_numMipmapLevels,1), texStorageSizedInternalFormat, _textureWidth);
+            if(!textureObject->_immutableSetted)
+            {
+                extensions->glTexStorage1D( GL_TEXTURE_1D, osg::maximum(_numMipmapLevels,1), texStorageSizedInternalFormat, _textureWidth);
+                textureObject->_immutableSetted = true;
+            }
         }
         else
         {

diff --git a/src/osg/Texture2D.cpp b/src/osg/Texture2D.cpp
@@ -306,8 +306,12 @@ void Texture2D::apply(State& state) const
              textureObject = generateAndAssignTextureObject(contextID, GL_TEXTURE_2D, _numMipmapLevels, texStorageSizedInternalFormat, _textureWidth, _textureHeight, 1, _borderWidth);
              textureObject->bind();
              applyTexParameters(GL_TEXTURE_2D, state);
-             extensions->glTexStorage2D( GL_TEXTURE_2D, osg::maximum(_numMipmapLevels,1), texStorageSizedInternalFormat,
-                      _textureWidth, _textureHeight);
+             if(!textureObject->_immutableSetted)
+             {
+                 extensions->glTexStorage2D( GL_TEXTURE_2D, osg::maximum(_numMipmapLevels,1), texStorageSizedInternalFormat,
+                          _textureWidth, _textureHeight);
+                 textureObject->_immutableSetted = true;
+             }
          }
          else
          {

diff --git a/src/osg/Texture2DArray.cpp b/src/osg/Texture2DArray.cpp
@@ -353,9 +353,10 @@ void Texture2DArray::apply(State& state) const
         applyTexParameters(GL_TEXTURE_2D_ARRAY, state);
 
         // First we need to allocate the texture memory
-        if(texStorageSizedInternalFormat!=0)
+        if(texStorageSizedInternalFormat!=0 && !textureObject->_immutableSetted)
         {
             extensions->glTexStorage3D(GL_TEXTURE_2D_ARRAY, osg::maximum(_numMipmapLevels,1), texStorageSizedInternalFormat, _textureWidth, _textureHeight, textureDepth);
+            textureObject->_immutableSetted = true;
         }
         else
         {
@@ -452,9 +453,10 @@ void Texture2DArray::apply(State& state) const
 
         applyTexParameters(GL_TEXTURE_2D_ARRAY,state);
 
-        if (texStorageSizedInternalFormat!=0)
+        if (texStorageSizedInternalFormat!=0 && !textureObject->_immutableSetted)
         {
             extensions->glTexStorage3D( GL_TEXTURE_2D_ARRAY, osg::maximum(_numMipmapLevels,1), texStorageSizedInternalFormat, _textureWidth, _textureHeight, _textureDepth);
+            textureObject->_immutableSetted = true;
         }
         else
             extensions->glTexImage3D( GL_TEXTURE_2D_ARRAY, 0, _internalFormat,

diff --git a/src/osg/Texture2DMultisample.cpp b/src/osg/Texture2DMultisample.cpp
@@ -108,8 +108,11 @@ void Texture2DMultisample::apply(State& state) const
         {
             textureObject = generateAndAssignTextureObject(contextID, getTextureTarget(), 1, texStorageSizedInternalFormat, _textureWidth, _textureHeight, 1, 0);
             textureObject->bind();
-
-            extensions->glTexStorage2DMultisample( GL_TEXTURE_2D_MULTISAMPLE, _numSamples, texStorageSizedInternalFormat, _textureWidth, _textureHeight, _fixedsamplelocations);
+            if(!textureObject->_immutableSetted)
+            {
+                extensions->glTexStorage2DMultisample( GL_TEXTURE_2D_MULTISAMPLE, _numSamples, texStorageSizedInternalFormat, _textureWidth, _textureHeight, _fixedsamplelocations);
+                textureObject->_immutableSetted = true;
+            }
         }
         else
         {

diff --git a/src/osg/Texture3D.cpp b/src/osg/Texture3D.cpp
@@ -322,8 +322,11 @@ void Texture3D::apply(State& state) const
             textureObject = generateAndAssignTextureObject(contextID, GL_TEXTURE_3D, _numMipmapLevels, texStorageSizedInternalFormat, _textureWidth, _textureHeight, _textureDepth,0);
             textureObject->bind();
             applyTexParameters(GL_TEXTURE_3D, state);
-
-            extensions->glTexStorage3D( GL_TEXTURE_3D, osg::maximum(_numMipmapLevels,1), texStorageSizedInternalFormat, _textureWidth, _textureHeight, _textureDepth);
+            if(!textureObject->_immutableSetted)
+            {
+                extensions->glTexStorage3D( GL_TEXTURE_3D, osg::maximum(_numMipmapLevels,1), texStorageSizedInternalFormat, _textureWidth, _textureHeight, _textureDepth);
+                textureObject->_immutableSetted = true;
+            }
         }
         else
         {

diff --git a/src/osg/TextureCubeMap.cpp b/src/osg/TextureCubeMap.cpp
@@ -353,7 +353,11 @@ void TextureCubeMap::apply(State& state) const
 
         if(texStorageSizedInternalFormat!=0)
         {
-            extensions->glTexStorage2D(GL_TEXTURE_CUBE_MAP, osg::maximum(_numMipmapLevels,1), texStorageSizedInternalFormat, _textureWidth, _textureHeight);
+            if(!textureObject->_immutableSetted)
+            {
+                extensions->glTexStorage2D(GL_TEXTURE_CUBE_MAP, osg::maximum(_numMipmapLevels,1), texStorageSizedInternalFormat, _textureWidth, _textureHeight);
+                textureObject->_immutableSetted = true;
+            }
 
         }
         else

diff --git a/src/osg/TextureRectangle.cpp b/src/osg/TextureRectangle.cpp
@@ -281,8 +281,11 @@ void TextureRectangle::apply(State& state) const
             textureObject = generateAndAssignTextureObject(contextID, GL_TEXTURE_RECTANGLE, 0, texStorageSizedInternalFormat, _textureWidth, _textureHeight, 1, 0);
             textureObject->bind();
             applyTexParameters(GL_TEXTURE_RECTANGLE, state);
-
-            extensions->glTexStorage2D( GL_TEXTURE_RECTANGLE, 1, texStorageSizedInternalFormat, _textureWidth, _textureHeight);
+            if(!textureObject->_immutableSetted)
+            {
+                extensions->glTexStorage2D( GL_TEXTURE_RECTANGLE, 1, texStorageSizedInternalFormat, _textureWidth, _textureHeight);
+                textureObject->_immutableSetted = true;
+            }
         }
         else
         {