Mesa (master): i965: clean-up tex target switches

[Brian Paul]

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

Author: Brian Paul <bri...@vmware.com>
Date:   Wed Aug 26 14:43:45 2009 -0600

i965: clean-up tex target switches

---

 src/mesa/drivers/dri/i965/brw_wm_glsl.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_wm_glsl.c 
b/src/mesa/drivers/dri/i965/brw_wm_glsl.c
index 2a31077..c68056d 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_glsl.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_glsl.c
@@ -2648,11 +2648,15 @@ static void emit_txb(struct brw_wm_compile *c,
            brw_MOV(p, brw_message_reg(3), src[1]);
            brw_MOV(p, brw_message_reg(4), brw_imm_f(0));
            break;
-       default:
+       case TEXTURE_3D_INDEX:
+       case TEXTURE_CUBE_INDEX:
            brw_MOV(p, brw_message_reg(2), src[0]);
            brw_MOV(p, brw_message_reg(3), src[1]);
            brw_MOV(p, brw_message_reg(4), src[2]);
            break;
+       default:
+            /* invalid target */
+            abort();
     }
     brw_MOV(p, brw_message_reg(5), src[3]);          /* bias */
     brw_MOV(p, brw_message_reg(6), brw_imm_f(0));    /* ref (unused?) */
@@ -2711,10 +2715,14 @@ static void emit_tex(struct brw_wm_compile *c,
            emit = WRITEMASK_XY;
            nr = 2;
            break;
-       default:
+       case TEXTURE_3D_INDEX:
+       case TEXTURE_CUBE_INDEX:
            emit = WRITEMASK_XYZ;
            nr = 3;
            break;
+       default:
+           /* invalid target */
+           abort();
     }
     msg_len = 1;
 

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit