summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/config.h
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2006-04-13 19:21:58 +0000
committerBrian Paul <[email protected]>2006-04-13 19:21:58 +0000
commitda238ee06a8d169eb590aa5e50998136f1b5aba5 (patch)
tree5900bcd798bb50b2ba4582f828624fde8df49baf /src/mesa/main/config.h
parent564b2aa2ef8d5b859bb51d39024373a4865e93e9 (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/config.h')
-rw-r--r--src/mesa/main/config.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index af4e7aad05b..95555cb7d47 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -108,7 +108,11 @@
/** Maximum rectangular texture size - GL_NV_texture_rectangle */
#define MAX_TEXTURE_RECT_SIZE 2048
-/** Number of texture units - GL_ARB_multitexture */
+/** Number of texture units - GL_ARB_multitexture
+ * This needs to be the larger of MAX_TEXTURE_COORD_UNITS and
+ * MAX_TEXTURE_IMAGE_UNITS seen below, since MAX_TEXTURE_UNITS is used
+ * to dimension some arrays that store both coord and image data.
+*/
#define MAX_TEXTURE_UNITS 8
/*@}*/