Permalink
Browse files

Standardized the glTexStorage*() calls to use osg::maximum(_numMipmap…

…Levels,1) of rnumber of mipmaps to keep the usage consistent.

Fixed the erronous Texture2DArray glTexStorage call so that it used the _numMipmapLevels as above to resolve bug in allocation.
  • Loading branch information...
robertosfield committed Sep 12, 2018
1 parent 6624670 commit ca134dca2df6e1a385df8c931245be3cf79c7b0f
Showing with 6 additions and 6 deletions.
  1. +1 −1 src/osg/Texture1D.cpp
  2. +1 −1 src/osg/Texture2D.cpp
  3. +2 −2 src/osg/Texture2DArray.cpp
  4. +1 −1 src/osg/Texture3D.cpp
  5. +1 −1 src/osg/TextureCubeMap.cpp
@@ -239,7 +239,7 @@ void Texture1D::apply(State& state) const
textureObject->bind();
applyTexParameters(GL_TEXTURE_1D, state);
extensions->glTexStorage1D( GL_TEXTURE_1D, (_numMipmapLevels >0)?_numMipmapLevels:1, texStorageSizedInternalFormat, _textureWidth);
extensions->glTexStorage1D( GL_TEXTURE_1D, osg::maximum(_numMipmapLevels,1), texStorageSizedInternalFormat, _textureWidth);
}
else
{
@@ -306,7 +306,7 @@ 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, (_numMipmapLevels >0)?_numMipmapLevels:1, texStorageSizedInternalFormat,
extensions->glTexStorage2D( GL_TEXTURE_2D, osg::maximum(_numMipmapLevels,1), texStorageSizedInternalFormat,
_textureWidth, _textureHeight);
}
else
@@ -355,7 +355,7 @@ void Texture2DArray::apply(State& state) const
// First we need to allocate the texture memory
if(texStorageSizedInternalFormat!=0)
{
extensions->glTexStorage3D(GL_TEXTURE_2D_ARRAY, 1, texStorageSizedInternalFormat, _textureWidth, _textureHeight, textureDepth);
extensions->glTexStorage3D(GL_TEXTURE_2D_ARRAY, osg::maximum(_numMipmapLevels,1), texStorageSizedInternalFormat, _textureWidth, _textureHeight, textureDepth);
}
else
{
@@ -454,7 +454,7 @@ void Texture2DArray::apply(State& state) const
if (texStorageSizedInternalFormat!=0)
{
extensions->glTexStorage3D( GL_TEXTURE_2D_ARRAY, (_numMipmapLevels >0)?_numMipmapLevels:1, texStorageSizedInternalFormat, _textureWidth, _textureHeight, _textureDepth);
extensions->glTexStorage3D( GL_TEXTURE_2D_ARRAY, osg::maximum(_numMipmapLevels,1), texStorageSizedInternalFormat, _textureWidth, _textureHeight, _textureDepth);
}
else
extensions->glTexImage3D( GL_TEXTURE_2D_ARRAY, 0, _internalFormat,
@@ -323,7 +323,7 @@ void Texture3D::apply(State& state) const
textureObject->bind();
applyTexParameters(GL_TEXTURE_3D, state);
extensions->glTexStorage3D( GL_TEXTURE_3D, (_numMipmapLevels >0)?_numMipmapLevels:1, texStorageSizedInternalFormat, _textureWidth, _textureHeight, _textureDepth);
extensions->glTexStorage3D( GL_TEXTURE_3D, osg::maximum(_numMipmapLevels,1), texStorageSizedInternalFormat, _textureWidth, _textureHeight, _textureDepth);
}
else
{
@@ -353,7 +353,7 @@ void TextureCubeMap::apply(State& state) const
if(texStorageSizedInternalFormat!=0)
{
extensions->glTexStorage2D(GL_TEXTURE_CUBE_MAP, _numMipmapLevels==0 ? 1 : _numMipmapLevels, texStorageSizedInternalFormat, _textureWidth, _textureHeight);
extensions->glTexStorage2D(GL_TEXTURE_CUBE_MAP, osg::maximum(_numMipmapLevels,1), texStorageSizedInternalFormat, _textureWidth, _textureHeight);
}
else

0 comments on commit ca134dc

Please sign in to comment.