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>

diff --git a/src/mesa/drivers/dri/i965/brw_program.h b/src/mesa/drivers/dri/i965/brw_program.h
index 2956dbae2162f210be289d827d4d342045d156f8..0116646fe1987ed8b432b45e18ed11413cbf721b 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_program.h
+++ b/src/mesa/drivers/dri/i965/brw_program.h
@@ -39,7 +39,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.
@@ -50,12 +50,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;
 
    /**
     * For Sandybridge, which shader w/a we need for gather quirks.