diff options
author | Marek Olšák <maraeo@gmail.com> | 2012-10-26 17:37:07 +0200 |
---|---|---|
committer | Marek Olšák <maraeo@gmail.com> | 2012-10-29 12:51:41 +0100 |
commit | b3921e1f53833420e0a0fd581f741744e7957a05 (patch) | |
tree | e16146e47d22c009490dc9a0cf294c503b3a511c /src/gallium/include/pipe/p_state.h | |
parent | 00e6819e9964458395c597b9b1745a913c5c889b (diff) | |
download | external_mesa3d-b3921e1f53833420e0a0fd581f741744e7957a05.zip external_mesa3d-b3921e1f53833420e0a0fd581f741744e7957a05.tar.gz external_mesa3d-b3921e1f53833420e0a0fd581f741744e7957a05.tar.bz2 |
mesa: bump MAX_VARYING to 32
We're starting to get apps utilizing more than 16 varyings and
most current hardware supports 32 anyway.
Tested with r600g.
swrast, softpipe and llvmpipe still advertise 16 varyings.
This fixes a WebGL crash after launching this demo:
https://developer.mozilla.org/en-US/demos/detail/falling-cubes
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=54402
NOTE: This is a candidate for the stable branches.
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/gallium/include/pipe/p_state.h')
-rw-r--r-- | src/gallium/include/pipe/p_state.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h index 6d0db0f..f84bfd7 100644 --- a/src/gallium/include/pipe/p_state.h +++ b/src/gallium/include/pipe/p_state.h @@ -59,7 +59,7 @@ extern "C" { #define PIPE_MAX_CONSTANT_BUFFERS 32 #define PIPE_MAX_SAMPLERS 16 #define PIPE_MAX_SHADER_INPUTS 32 -#define PIPE_MAX_SHADER_OUTPUTS 32 +#define PIPE_MAX_SHADER_OUTPUTS 48 /* 32 GENERICs + POS, PSIZE, FOG, etc. */ #define PIPE_MAX_SHADER_SAMPLER_VIEWS 32 #define PIPE_MAX_SHADER_RESOURCES 32 #define PIPE_MAX_TEXTURE_LEVELS 16 @@ -145,7 +145,7 @@ struct pipe_rasterizer_state unsigned line_stipple_factor:8; /**< [1..256] actually */ unsigned line_stipple_pattern:16; - unsigned sprite_coord_enable:PIPE_MAX_SHADER_OUTPUTS; + unsigned sprite_coord_enable; /* bitfield referring to 32 GENERIC inputs */ float line_width; float point_size; /**< used when no per-vertex size */ |