Mesa (master): i965: Fix typo in shader channel select field name.

[Kenneth Graunke]

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

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Fri Jul 27 11:24:19 2012 -0700

i965: Fix typo in shader channel select field name.

"chanel" isn't very searchable.  I can type, honest!

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/mesa/drivers/dri/i965/brw_structs.h           |    8 +++---
 src/mesa/drivers/dri/i965/gen7_blorp.cpp          |    8 +++---
 src/mesa/drivers/dri/i965/gen7_wm_surface_state.c |   24 ++++++++++----------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_structs.h b/src/mesa/drivers/dri/i965/brw_structs.h
index 67bfb98..465d2a2 100644
--- a/src/mesa/drivers/dri/i965/brw_structs.h
+++ b/src/mesa/drivers/dri/i965/brw_structs.h
@@ -881,10 +881,10 @@ struct gen7_surface_state
 
       /* Only on Haswell */
       GLuint pad0:4;
-      GLuint shader_chanel_select_a:3;
-      GLuint shader_chanel_select_b:3;
-      GLuint shader_chanel_select_g:3;
-      GLuint shader_chanel_select_r:3;
+      GLuint shader_channel_select_a:3;
+      GLuint shader_channel_select_b:3;
+      GLuint shader_channel_select_g:3;
+      GLuint shader_channel_select_r:3;
 
       GLuint alpha_clear_color:1;
       GLuint blue_clear_color:1;
diff --git a/src/mesa/drivers/dri/i965/gen7_blorp.cpp b/src/mesa/drivers/dri/i965/gen7_blorp.cpp
index cc28d8c..66eb2c8 100644
--- a/src/mesa/drivers/dri/i965/gen7_blorp.cpp
+++ b/src/mesa/drivers/dri/i965/gen7_blorp.cpp
@@ -187,10 +187,10 @@ gen7_blorp_emit_surface_state(struct brw_context *brw,
    }
 
    if (intel->is_haswell) {
-      surf->ss7.shader_chanel_select_r = HSW_SCS_RED;
-      surf->ss7.shader_chanel_select_g = HSW_SCS_GREEN;
-      surf->ss7.shader_chanel_select_b = HSW_SCS_BLUE;
-      surf->ss7.shader_chanel_select_a = HSW_SCS_ALPHA;
+      surf->ss7.shader_channel_select_r = HSW_SCS_RED;
+      surf->ss7.shader_channel_select_g = HSW_SCS_GREEN;
+      surf->ss7.shader_channel_select_b = HSW_SCS_BLUE;
+      surf->ss7.shader_channel_select_a = HSW_SCS_ALPHA;
    }
 
    /* Emit relocation to surface contents */
diff --git a/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c b/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
index 2522276..62d2be8 100644
--- a/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
@@ -339,10 +339,10 @@ gen7_update_texture_surface(struct gl_context *ctx, GLuint unit)
     */
 
    if (brw->intel.is_haswell) {
-      surf->ss7.shader_chanel_select_r = HSW_SCS_RED;
-      surf->ss7.shader_chanel_select_g = HSW_SCS_GREEN;
-      surf->ss7.shader_chanel_select_b = HSW_SCS_BLUE;
-      surf->ss7.shader_chanel_select_a = HSW_SCS_ALPHA;
+      surf->ss7.shader_channel_select_r = HSW_SCS_RED;
+      surf->ss7.shader_channel_select_g = HSW_SCS_GREEN;
+      surf->ss7.shader_channel_select_b = HSW_SCS_BLUE;
+      surf->ss7.shader_channel_select_a = HSW_SCS_ALPHA;
    }
 
    /* Emit relocation to surface contents */
@@ -387,10 +387,10 @@ gen7_create_constant_surface(struct brw_context *brw,
    gen7_set_surface_tiling(surf, I915_TILING_NONE); /* tiling now allowed */
 
    if (brw->intel.is_haswell) {
-      surf->ss7.shader_chanel_select_r = HSW_SCS_RED;
-      surf->ss7.shader_chanel_select_g = HSW_SCS_GREEN;
-      surf->ss7.shader_chanel_select_b = HSW_SCS_BLUE;
-      surf->ss7.shader_chanel_select_a = HSW_SCS_ALPHA;
+      surf->ss7.shader_channel_select_r = HSW_SCS_RED;
+      surf->ss7.shader_channel_select_g = HSW_SCS_GREEN;
+      surf->ss7.shader_channel_select_b = HSW_SCS_BLUE;
+      surf->ss7.shader_channel_select_a = HSW_SCS_ALPHA;
    }
 
    /* Emit relocation to surface contents.  Section 5.1.1 of the gen4
@@ -532,10 +532,10 @@ gen7_update_renderbuffer_surface(struct brw_context *brw,
    }
 
    if (intel->is_haswell) {
-      surf->ss7.shader_chanel_select_r = HSW_SCS_RED;
-      surf->ss7.shader_chanel_select_g = HSW_SCS_GREEN;
-      surf->ss7.shader_chanel_select_b = HSW_SCS_BLUE;
-      surf->ss7.shader_chanel_select_a = HSW_SCS_ALPHA;
+      surf->ss7.shader_channel_select_r = HSW_SCS_RED;
+      surf->ss7.shader_channel_select_g = HSW_SCS_GREEN;
+      surf->ss7.shader_channel_select_b = HSW_SCS_BLUE;
+      surf->ss7.shader_channel_select_a = HSW_SCS_ALPHA;
    }
 
    drm_intel_bo_emit_reloc(brw->intel.batch.bo,