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

From Joseph Steel, "he change is to initializeExtensionProcs() to

Browse Source 
verify the version of the OpenGL implementation before attempting to get the
MaxTextureCoords parameter."
This commit is contained in:
Robert Osfield
2007-12-11 11:57:32 +00:00
parent 880682f138
commit 42723fec8f
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/osg/State.cpp
View File

@@ -742,12 +742,18 @@ void State::initializeExtensionProcs()
_glDisableVertexAttribArray = (DisableVertexAttribProc) osg::getGLExtensionFuncPtr("glDisableVertexAttribArray","glDisableVertexAttribArrayARB");
_glBindBuffer = (BindBufferProc) osg::getGLExtensionFuncPtr("glBindBuffer","glBindBufferARB");
_glMaxTextureCoords = 1;
glGetIntegerv(GL_MAX_TEXTURE_COORDS,&_glMaxTextureCoords);
_glMaxTextureUnits = 1;
glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS,&_glMaxTextureUnits);
_glMaxTextureUnits = maximum(_glMaxTextureCoords,_glMaxTextureUnits);
if (osg::getGLVersionNumber() < 2.0)
{
_glMaxTextureCoords = _glMaxTextureUnits;
}
else
{
glGetIntegerv(GL_MAX_TEXTURE_COORDS,&_glMaxTextureCoords);
_glMaxTextureUnits = maximum(_glMaxTextureCoords,_glMaxTextureUnits);
}
_extensionProcsInitialized = true;
}