diff --git a/include/osg/Texture b/include/osg/Texture index 96d0f8648..4243fb896 100644 --- a/include/osg/Texture +++ b/include/osg/Texture @@ -668,7 +668,7 @@ class OSG_EXPORT Texture : public osg::StateAttribute GLint layer; GLenum access; GLenum format; - + ImageAttachment() : unit(0), level(0), layered(GL_FALSE), layer(0), access(0), format(0) {} }; @@ -794,7 +794,7 @@ class OSG_EXPORT Texture : public osg::StateAttribute void setTextureCompressionETCSupported(bool flag) { _isTextureCompressionETCSupported=flag; } bool isTextureCompressionETCSupported() const { return _isTextureCompressionETCSupported; } - + void setTextureCompressionETC2Supported(bool flag) { _isTextureCompressionETC2Supported=flag; } bool isTextureCompressionETC2Supported() const { return _isTextureCompressionETC2Supported; } @@ -834,9 +834,6 @@ class OSG_EXPORT Texture : public osg::StateAttribute void setMaxTextureSize(GLint maxsize) { _maxTextureSize=maxsize; } GLint maxTextureSize() const { return _maxTextureSize; } - void setNumTextureUnits(GLint nunits ) { _numTextureUnits=nunits; } - GLint numTextureUnits() const { return _numTextureUnits; } - bool isCompressedTexImage2DSupported() const { return _glCompressedTexImage2D!=0; } bool isCompressedTexSubImage2DSupported() const { return _glCompressedTexSubImage2D!=0; } @@ -938,7 +935,6 @@ class OSG_EXPORT Texture : public osg::StateAttribute bool _isTextureMaxLevelSupported; GLint _maxTextureSize; - GLint _numTextureUnits; }; /** Gets the extension for the specified context. Creates the diff --git a/src/osg/Texture.cpp b/src/osg/Texture.cpp index 46819fe9b..090337c20 100644 --- a/src/osg/Texture.cpp +++ b/src/osg/Texture.cpp @@ -2667,27 +2667,6 @@ Texture::Extensions::Extensions(unsigned int contextID) } } - if( _isMultiTexturingSupported ) - { - _numTextureUnits = 0; - #if defined(OSG_GLES2_AVAILABLE) || defined(OSG_GL3_AVAILABLE) - glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS,&_numTextureUnits); - #else - if (osg::asciiToFloat(version)>=2.0) - { - glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS,&_numTextureUnits); - } - else - { - glGetIntegerv(GL_MAX_TEXTURE_UNITS,&_numTextureUnits); - } - #endif - } - else - { - _numTextureUnits = 1; - } - setGLExtensionFuncPtr(_glCompressedTexImage2D,"glCompressedTexImage2D","glCompressedTexImage2DARB"); setGLExtensionFuncPtr(_glCompressedTexSubImage2D,"glCompressedTexSubImage2D","glCompressedTexSubImage2DARB"); setGLExtensionFuncPtr(_glGetCompressedTexImage,"glGetCompressedTexImage","glGetCompressedTexImageARB");;