Mesa (master): st/mesa: clamp Max program param limits

[Marek Olšák]

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

Author: Marek Olšák <maraeo at gmail.com>
Date:   Mon Sep 12 12:46:45 2011 +0200

st/mesa: clamp Max program param limits

Setting just MAX_PROGRAM_ENV_PARAMS to 4096 breaks everything,
so let's do this instead.

This fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=40767

Reviewed-by: Brian Paul <brianp at vmware.com>

---

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

diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index 0ad9e12..722db8d 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/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;