From e066f54c99aecce620158fe7f31589242df55677 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Wed, 14 Sep 2011 14:47:07 +0200
Subject: mesa git update 14 sep 2011

---
 mesalib/src/mesa/state_tracker/st_extensions.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mesalib/src/mesa/state_tracker/st_extensions.c')

diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c
index 0ad9e1286..722db8d77 100644
--- a/mesalib/src/mesa/state_tracker/st_extensions.c
+++ b/mesalib/src/mesa/state_tracker/st_extensions.c
@@ -176,8 +176,8 @@ void st_init_limits(struct st_context *st)
       /* Gallium doesn't really care about local vs. env parameters so use the
        * same limits.
        */
-      pc->MaxLocalParams = pc->MaxParameters;
-      pc->MaxEnvParams = pc->MaxParameters;
+      pc->MaxLocalParams = MIN2(pc->MaxParameters, MAX_PROGRAM_LOCAL_PARAMS);
+      pc->MaxEnvParams = MIN2(pc->MaxParameters, MAX_PROGRAM_ENV_PARAMS);
 
       options->EmitNoNoise = TRUE;
 
-- 
cgit v1.2.3