Merge branch 'mesa_7_7_branch'

[mesa.git] / src / mesa / main / config.h

diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index c5048970cca03fb0b62652d6109a1330cf859a55..2eac1cc2ed9bfcc3eeee501961011ca901cd6c80 100644 (file)
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -243,7 +243,8 @@
 /*@{*/
 #define MAX_VERTEX_GENERIC_ATTRIBS 16
 #define MAX_VERTEX_TEXTURE_IMAGE_UNITS MAX_TEXTURE_IMAGE_UNITS
-#define MAX_COMBINED_TEXTURE_IMAGE_UNITS MAX_TEXTURE_IMAGE_UNITS
+#define MAX_COMBINED_TEXTURE_IMAGE_UNITS (MAX_VERTEX_TEXTURE_IMAGE_UNITS + \
+                                         MAX_TEXTURE_IMAGE_UNITS)
 /*@}*/