From da238ee06a8d169eb590aa5e50998136f1b5aba5 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 13 Apr 2006 19:21:58 +0000 Subject: 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. --- src/mesa/main/get_gen.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/mesa/main/get_gen.py') diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py index 5b3d35fc44..9dd6b8f79e 100644 --- a/src/mesa/main/get_gen.py +++ b/src/mesa/main/get_gen.py @@ -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, -- cgit v1.2.3