Fix comment about MaxTextureUnits, needs to be min of coord and image units.

See bug 5994.
Also add a few assertions.
Use MaxTextureUnits in get.c code.
There's probably other places where we need to clean-up the usage of the
MaxTexture[Coord/Image]Units constants.
This commit is contained in:
Brian Paul
2006-04-13 19:21:58 +00:00
parent 564b2aa2ef
commit da238ee06a
5 changed files with 17 additions and 9 deletions

View File

@@ -495,8 +495,7 @@ StateVars = [
# GL_ARB_multitexture
( "GL_MAX_TEXTURE_UNITS_ARB", GLint,
["MIN2(ctx->Const.MaxTextureImageUnits, ctx->Const.MaxTextureCoordUnits)"],
"", ["ARB_multitexture"] ),
["ctx->Const.MaxTextureUnits"], "", ["ARB_multitexture"] ),
( "GL_ACTIVE_TEXTURE_ARB", GLint,
[ "GL_TEXTURE0_ARB + ctx->Texture.CurrentUnit"], "", ["ARB_multitexture"] ),
( "GL_CLIENT_ACTIVE_TEXTURE_ARB", GLint,