Mesa (gallium-0.2): gallium: fix MaxTextureCoordUnits init

[Brian Paul]

Module: Mesa
Branch: gallium-0.2
Commit: 6cbaa2226fa1237b9f314828fbbc1c8db6509de8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6cbaa2226fa1237b9f314828fbbc1c8db6509de8

Author: Brian Paul <brian.e.paul at gmail.com>
Date:   Sun Jan  4 10:04:44 2009 -0700

gallium: fix MaxTextureCoordUnits init

Fixes Cell regression.

---

 src/mesa/state_tracker/st_extensions.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index 7023659..8ec2113 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -92,9 +92,10 @@ void st_init_limits(struct st_context *st)
       = _min(screen->get_param(screen, PIPE_CAP_MAX_VERTEX_TEXTURE_UNITS),
              MAX_VERTEX_TEXTURE_IMAGE_UNITS);
 
-   c->MaxTextureCoordUnits = MAX_TEXTURE_COORD_UNITS;
+   c->MaxTextureCoordUnits
+      = _min(c->MaxTextureImageUnits, MAX_TEXTURE_COORD_UNITS);
 
-   c->MaxTextureUnits = MIN2(c->MaxTextureImageUnits, c->MaxTextureCoordUnits);
+   c->MaxTextureUnits = _min(c->MaxTextureImageUnits, c->MaxTextureCoordUnits);
 
    c->MaxDrawBuffers
       = _clamp(screen->get_param(screen, PIPE_CAP_MAX_RENDER_TARGETS),