diff options
| author | Marek Olšák <maraeo@gmail.com> | 2011-09-12 12:46:45 +0200 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2011-09-12 16:55:21 +0200 |
| commit | f37a5081b229b020553c45e32e9888af77cfd3d6 (patch) | |
| tree | 92d4801da0818307f967eacc7b60bacc6ffc6c49 | |
| parent | 4682e706012fe26627a2f827db01b5068cc62814 (diff) | |
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@vmware.com>
| -rw-r--r-- | 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 0ad9e1286ea..722db8d774f 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; |