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

Removed the unused Texture::Extensions::numTextureUnits()

Browse Source
This commit is contained in:
Robert Osfield
2013-12-16 11:28:10 +00:00
parent 5571c361dc
commit 723ecfad8d
2 changed files with 2 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/osg/Texture
View File

@@ -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

21
src/osg/Texture.cpp
View File

@@ -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");;