From: Brian Paul <brian.e.paul@gmail.com>
Date: Sun, 4 Jan 2009 17:04:44 +0000 (-0700)
Subject: gallium: fix MaxTextureCoordUnits init
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6cbaa2226fa1237b9f314828fbbc1c8db6509de8;p=mesa.git

gallium: fix MaxTextureCoordUnits init

Fixes Cell regression.
---

diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index 7023659c17d..8ec2113f074 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),