From d9af748b782bca19ce759ca09ad7bb2ef052e510 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 1 Sep 2004 10:41:50 +0000 Subject: [PATCH] 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 --- src/osg/Texture.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/osg/Texture.cpp b/src/osg/Texture.cpp index 437d932e0..ba845daea 100644 --- 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");