mesa: Fix default (swrast) GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS.

The swrast pipeline shouldn't have any problem with all the frag and vert
textures being bound at the same time.  Note that this may result in
DRI drivers that don't set this limit having an improbable return
(fragment + vertex < combined), but it seems like it shouldn't cause
problems for apps.

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)
 /*@}*/