Mesa (master): mesa: Fix default (swrast) GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS.

[Eric Anholt]

Module: Mesa
Branch: master
Commit: cb640c8d40c4ee34160a14d646c244f44a5013f6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cb640c8d40c4ee34160a14d646c244f44a5013f6

Author: Eric Anholt <eric at anholt.net>
Date:   Thu Dec 10 10:03:16 2009 -0800

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.

---

 src/mesa/main/config.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index c504897..2eac1cc 100644
--- 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)
 /*@}*/