diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-14 15:09:39 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-14 15:09:39 +0200 |
| commit | a0fc33d46dfe59745f22decb93fe147292335602 (patch) | |
| tree | 1a4f7f0752a1c8935e12130c3142031272495ce6 /mesalib/src/mesa/state_tracker/st_extensions.c | |
| parent | dafebc5bb70303f0b5baf0b087cf4d9a64b5c7f0 (diff) | |
| parent | e066f54c99aecce620158fe7f31589242df55677 (diff) | |
| download | vcxsrv-a0fc33d46dfe59745f22decb93fe147292335602.tar.gz vcxsrv-a0fc33d46dfe59745f22decb93fe147292335602.tar.bz2 vcxsrv-a0fc33d46dfe59745f22decb93fe147292335602.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_extensions.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_extensions.c | 4 |
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; |