diff options
author | Brian Paul <brian.paul@tungstengraphics.com> | 2006-04-13 19:21:58 +0000 |
---|---|---|
committer | Brian Paul <brian.paul@tungstengraphics.com> | 2006-04-13 19:21:58 +0000 |
commit | da238ee06a8d169eb590aa5e50998136f1b5aba5 (patch) | |
tree | 5900bcd798bb50b2ba4582f828624fde8df49baf /src/mesa/main/mtypes.h | |
parent | 564b2aa2ef8d5b859bb51d39024373a4865e93e9 (diff) |
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.
Diffstat (limited to 'src/mesa/main/mtypes.h')
-rw-r--r-- | src/mesa/main/mtypes.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index c443411b62..c8831386bb 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2302,7 +2302,7 @@ struct gl_constants GLint MaxTextureRectSize; /* GL_NV_texture_rectangle */ GLuint MaxTextureCoordUnits; GLuint MaxTextureImageUnits; - GLuint MaxTextureUnits; /* = MAX(CoordUnits, ImageUnits) */ + GLuint MaxTextureUnits; /* = MIN(CoordUnits, ImageUnits) */ GLfloat MaxTextureMaxAnisotropy; /* GL_EXT_texture_filter_anisotropic */ GLfloat MaxTextureLodBias; /* GL_EXT_texture_lod_bias */ GLuint MaxArrayLockSize; |