Mesa (master): i965: Use the enum type for gen6_gather_wa sampler key field.

Kenneth Graunke kwg at kemper.freedesktop.org
Wed Dec 3 01:01:12 UTC 2014


Module: Mesa
Branch: master
Commit: 793ac67d3ddf636dcb9c21624809207993ab5aac
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=793ac67d3ddf636dcb9c21624809207993ab5aac

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Mon Dec  1 22:23:22 2014 -0800

i965: Use the enum type for gen6_gather_wa sampler key field.

Requested by Matt Turner.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Matt Turner <mattst88 at gmail.com>

---

 src/mesa/drivers/dri/i965/brw_program.h |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_program.h b/src/mesa/drivers/dri/i965/brw_program.h
index bb926f3..57de272 100644
--- a/src/mesa/drivers/dri/i965/brw_program.h
+++ b/src/mesa/drivers/dri/i965/brw_program.h
@@ -44,6 +44,12 @@
  *  @{
  */
 
+enum PACKED gen6_gather_sampler_wa {
+   WA_SIGN = 1,      /* whether we need to sign extend */
+   WA_8BIT = 2,      /* if we have an 8bit format needing wa */
+   WA_16BIT = 4,     /* if we have a 16bit format needing wa */
+};
+
 /**
  * Sampler information needed by VS, WM, and GS program cache keys.
  */
@@ -68,7 +74,7 @@ struct brw_sampler_prog_key_data {
    /**
     * For Sandybridge, which shader w/a we need for gather quirks.
     */
-   uint8_t gen6_gather_wa[MAX_SAMPLERS];
+   enum gen6_gather_sampler_wa gen6_gather_wa[MAX_SAMPLERS];
 };
 
 
@@ -149,12 +155,6 @@ struct brw_wm_prog_key {
 
 /** @} */
 
-enum gen6_gather_sampler_wa {
-   WA_SIGN = 1,      /* whether we need to sign extend */
-   WA_8BIT = 2,      /* if we have an 8bit format needing wa */
-   WA_16BIT = 4,     /* if we have a 16bit format needing wa */
-};
-
 #ifdef __cplusplus
 extern "C" {
 #endif




More information about the mesa-commit mailing list