Macintosh-SW
/
MacGLide
mirror of https://github.com/jenshemprich/MacGLide.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Correctly checking the client state

This commit is contained in:
Jens Hemprich 2006-08-22 21:12:28 +00:00
parent eee80bf39b
commit 44b073af49
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
MacGLide/OpenGLide/Glide.cpp
View File

@ -382,9 +382,14 @@ bool VerifyTextureEnabledState_impl(const char* functionname)
{
glReportErrors("VerifyActiveTextureUnit_impl");
// emember state
GLint current;
glGetIntegerv(GL_ACTIVE_TEXTURE_ARB, &current);
// remember state
GLint activeTexture;
glGetIntegerv(GL_ACTIVE_TEXTURE_ARB, &activeTexture);
GLint activeClientTexture;
if (InternalConfig.EXT_compiled_vertex_array)
{
glGetIntegerv(GL_CLIENT_ACTIVE_TEXTURE_ARB, &activeClientTexture);
}
glReportError();
bool bVerified = true;
if (OpenGL.ColorAlphaUnit2)
@ -399,18 +404,27 @@ bool VerifyTextureEnabledState_impl(const char* functionname)
GlideMsg("Warning: texture unit GL_TEXTURE%d_ARB is %s in %s()\n", OpenGL.ColorAlphaUnit1 + unit_index - GL_TEXTURE0_ARB, bState ? "enabled" : "disabled", functionname);
bVerified = false;
}
bState = glIsEnabled(GL_TEXTURE_COORD_ARRAY);
if (bState != (OpenGL.ColorAlphaUnitColorEnabledState[unit_index] ||
OpenGL.ColorAlphaUnitAlphaEnabledState[unit_index]))
if (InternalConfig.EXT_compiled_vertex_array)
{
GlideMsg("Warning: texcoord array for unit GL_TEXTURE%d_ARB is %s in %s()\n", OpenGL.ColorAlphaUnit1 + unit_index - GL_TEXTURE0_ARB, bState ? "enabled" : "disabled", functionname);
bVerified = false;
glClientActiveTextureARB(OpenGL.ColorAlphaUnit1 + unit_index);
bState = glIsEnabled(GL_TEXTURE_COORD_ARRAY);
if (bState != (OpenGL.ColorAlphaUnitColorEnabledState[unit_index] ||
OpenGL.ColorAlphaUnitAlphaEnabledState[unit_index]))
{
GlideMsg("Warning: texcoord array for unit GL_TEXTURE%d_ARB is %s in %s()\n", OpenGL.ColorAlphaUnit1 + unit_index - GL_TEXTURE0_ARB, bState ? "enabled" : "disabled", functionname);
bVerified = false;
}
}
glReportError();
}
}
// Restore previous state
glActiveTextureARB(current);
glActiveTextureARB(activeTexture);
if (InternalConfig.EXT_compiled_vertex_array)
{
glClientActiveTextureARB(activeClientTexture);
}
glReportError();
return bVerified;
}
#endif