From Bob Kuehne, added getting of the max number of texture units in

the Texture::Extension object
This commit is contained in:
Robert Osfield
2004-05-07 11:28:55 +00:00
parent 2c352ceb7c
commit 48dad727b1
2 changed files with 11 additions and 1 deletions

View File

@@ -1102,6 +1102,7 @@ void Texture::Extensions::lowestCommonDenominator(const Extensions& rhs)
if (!rhs._isGenerateMipMapSupported) _isGenerateMipMapSupported = false;
if (rhs._maxTextureSize<_maxTextureSize) _maxTextureSize = rhs._maxTextureSize;
if (rhs._numTextureUnits<_numTextureUnits) _numTextureUnits = rhs._numTextureUnits;
if (!rhs._glCompressedTexImage2D) _glCompressedTexImage2D = 0;
if (!rhs._glCompressedTexSubImage2D) _glCompressedTexSubImage2D = 0;
@@ -1147,8 +1148,9 @@ void Texture::Extensions::setupGLExtensions()
_maxTextureSize = osg_max_size;
}
}
}
glGetIntegerv(GL_MAX_TEXTURE_UNITS,&_numTextureUnits);
_glCompressedTexImage2D = getGLExtensionFuncPtr("glCompressedTexImage2D","glCompressedTexImage2DARB");
_glCompressedTexSubImage2D = getGLExtensionFuncPtr("glCompressedTexSubImage2D","glCompressedTexSubImage2DARB");