diff options
| author | Roland Scheidegger <[email protected]> | 2014-05-08 16:25:47 +0200 |
|---|---|---|
| committer | Roland Scheidegger <[email protected]> | 2014-05-08 16:26:49 +0200 |
| commit | cf93f8695770ef1c4274857f02739d2a338a4237 (patch) | |
| tree | e3939206e3d59adf9890d9059c9a4561d98a0192 | |
| parent | 9af68e9b1d116cdc8eb6a22bac091fe4716679e6 (diff) | |
llvmpipe: change LP_MAX_SHADER_INSTRUCTIONS limit definition.
When the limit was changed to be defined in terms of LP_MAX_SHADER_VARIANTS
(75f1fea14f524ef05e980d825fda3ae226ae2ffe) when it was increased, this
inadvertently lowered the limit in some branches (that have a lower
LP_MAX_SHADER_VARIANTS number) when merged. So, make sure the limit is always
at least the number it once was.
Reviewed-by: Jose Fonseca <[email protected]>
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_limits.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_limits.h b/src/gallium/drivers/llvmpipe/lp_limits.h index 5ea0c83723a..131c02e4bb9 100644 --- a/src/gallium/drivers/llvmpipe/lp_limits.h +++ b/src/gallium/drivers/llvmpipe/lp_limits.h @@ -78,8 +78,10 @@ /** * Max number of instructions (for all fragment shaders combined per context) * that will be kept around (counted in terms of llvm ir). + * Note: the definition looks odd, but there's branches which use a different + * number of max shader variants. */ -#define LP_MAX_SHADER_INSTRUCTIONS (512*LP_MAX_SHADER_VARIANTS) +#define LP_MAX_SHADER_INSTRUCTIONS MAX2(128*1024, 512*LP_MAX_SHADER_VARIANTS) /** * Max number of setup variants that will be kept around. |