diff options
author | Chris Forbes <[email protected]> | 2014-02-27 07:28:05 +1300 |
---|---|---|
committer | Ian Romanick <[email protected]> | 2014-03-03 09:36:01 +0200 |
commit | 5fbd6494517be0bc2f2ead4d6966776fcb0d426d (patch) | |
tree | 0e93c14914b95fbbc957e8aec6796bdaee44d41b /src | |
parent | 05b9e6a96359aeafadbf06cb202e044626c19d2f (diff) |
i965: Widen sampler key bitfields for 32 samplers
Previously the `high` 16 samplers on Haswell+ would not get sampler
workarounds applied.
Don't bother widening YUV fields, since they're ignored and going away
soon anyway.
Signed-off-by: Chris Forbes <[email protected]>
Cc: "10.1" <[email protected]>
Cc: Kenneth Graunke <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
(cherry picked from commit 590920f93e227f1fb4258dd01b662e8bda8b3af4)
Diffstat (limited to 'src')
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_program.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_program.h b/src/mesa/drivers/dri/i965/brw_program.h index 51182eabd16..f4dedf868fb 100644 --- a/src/mesa/drivers/dri/i965/brw_program.h +++ b/src/mesa/drivers/dri/i965/brw_program.h @@ -33,7 +33,7 @@ struct brw_sampler_prog_key_data { */ uint16_t swizzles[MAX_SAMPLERS]; - uint16_t gl_clamp_mask[3]; + uint32_t gl_clamp_mask[3]; /** * YUV conversions, needed for the GL_MESA_ycbcr extension. @@ -44,12 +44,12 @@ struct brw_sampler_prog_key_data { /** * For RG32F, gather4's channel select is broken. */ - uint16_t gather_channel_quirk_mask; + uint32_t gather_channel_quirk_mask; /** * Whether this sampler uses the compressed multisample surface layout. */ - uint16_t compressed_multisample_layout_mask; + uint32_t compressed_multisample_layout_mask; }; #ifdef __cplusplus |