From Tom Jolly, add detection for whether multi-texturing is supported before

checking for number of texture units supported, using 1 as a fallback value
2004-09-01 10:41:50 +00:00
parent da5fa4cbcd
commit d9af748b78
1 changed files with 8 additions and 1 deletions
--- a/src/osg/Texture.cpp
+++ b/src/osg/Texture.cpp
@@ -1196,7 +1196,14 @@ void Texture::Extensions::setupGLExtensions()
        }
    }

-    glGetIntegerv(GL_MAX_TEXTURE_UNITS,&_numTextureUnits);
+    if( _isMultiTexturingSupported )
+    {
+       glGetIntegerv(GL_MAX_TEXTURE_UNITS,&_numTextureUnits);
+    }
+    else
+    {
+       _numTextureUnits = 1;
+    }

    _glCompressedTexImage2D = getGLExtensionFuncPtr("glCompressedTexImage2D","glCompressedTexImage2DARB");
    _glCompressedTexSubImage2D = getGLExtensionFuncPtr("glCompressedTexSubImage2D","glCompressedTexSubImage2DARB");