aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/state_tracker/st_extensions.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-09-14 14:47:07 +0200
committermarha <marha@users.sourceforge.net>2011-09-14 14:47:07 +0200
commite066f54c99aecce620158fe7f31589242df55677 (patch)
treef914574daeee09dafd33fa910d9c05cb2bdc7a3d /mesalib/src/mesa/state_tracker/st_extensions.c
parent49659ef96348cc1bb20813abf7578acdb3cfe3d1 (diff)
downloadvcxsrv-e066f54c99aecce620158fe7f31589242df55677.tar.gz
vcxsrv-e066f54c99aecce620158fe7f31589242df55677.tar.bz2
vcxsrv-e066f54c99aecce620158fe7f31589242df55677.zip
mesa git update 14 sep 2011
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_extensions.c')
-rw-r--r--mesalib/src/mesa/state_tracker/st_extensions.c4
1 files changed, 2 insertions, 2 deletions
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;