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 <chrisf@ijw.co.nz>
Cc: "10.1" <mesa-stable@lists.freedesktop.org>
Cc: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
(cherry picked from commit 590920f93e)
This commit is contained in:
Chris Forbes 2014-02-27 07:28:05 +13:00 committed by Ian Romanick
parent 05b9e6a963
commit 5fbd649451

View file

@ -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