Mesa (10.1): i965: Widen sampler key bitfields for 32 samplers

[Ian Romanick]

Module: Mesa
Branch: 10.1
Commit: 5fbd6494517be0bc2f2ead4d6966776fcb0d426d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5fbd6494517be0bc2f2ead4d6966776fcb0d426d

Author: Chris Forbes <chrisf at ijw.co.nz>
Date:   Thu Feb 27 07:28:05 2014 +1300

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 at ijw.co.nz>
Cc: "10.1" <mesa-stable at lists.freedesktop.org>
Cc: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
(cherry picked from commit 590920f93e227f1fb4258dd01b662e8bda8b3af4)

---

 src/mesa/drivers/dri/i965/brw_program.h |    6 +++---
 1 file 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 51182ea..f4dedf8 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