FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-organised Texture::computeInternalFormatWithImage() to avoid testing

Browse Source 
for extensions when not required.
This commit is contained in:
Robert Osfield
2004-06-28 22:09:52 +00:00
parent 9b03d8c67e
commit fdbb1fe021
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/osg/Texture.cpp
View File

@@ -333,19 +333,24 @@ void Texture::dirtyTextureParameters()
void Texture::computeInternalFormatWithImage(const osg::Image& image) const
{
const unsigned int contextID = 0; // state.getContextID(); // set to 0 right now, assume same paramters for each graphics context...
const Extensions* extensions = getExtensions(contextID,true);
// static bool s_ARB_Compression = isGLExtensionSupported("GL_ARB_texture_compression");
// static bool s_S3TC_Compression = isGLExtensionSupported("GL_EXT_texture_compression_s3tc");
GLint internalFormat = image.getInternalTextureFormat();
switch(_internalFormatMode)
{
case(USE_IMAGE_DATA_FORMAT):
internalFormat = image.getInternalTextureFormat();
break;
if (_internalFormatMode==USE_IMAGE_DATA_FORMAT)
{
internalFormat = image.getInternalTextureFormat();
}
else if (_internalFormatMode==USE_USER_DEFINED_FORMAT)
{
internalFormat = _internalFormat;
}
else
{
const unsigned int contextID = 0; // state.getContextID(); // set to 0 right now, assume same paramters for each graphics context...
const Extensions* extensions = getExtensions(contextID,true);
switch(_internalFormatMode)
{
case(USE_ARB_COMPRESSION):
if (extensions->isTextureCompressionARBSupported())
{
@@ -411,10 +416,7 @@ void Texture::computeInternalFormatWithImage(const osg::Image& image) const
else internalFormat = image.getInternalTextureFormat();
break;
case(USE_USER_DEFINED_FORMAT):
internalFormat = _internalFormat;
break;
}
}
_internalFormat = internalFormat;