commit e1590abb17f1effd92c136207f363de6cf52df18
author Keith Whitwell <keith@tungstengraphics.com> Sat May 24 13:23:06 2008 +0100
committer Keith Whitwell <keith@tungstengraphics.com> Sat May 24 13:23:06 2008 +0100
tree ca31ce566f2e421264e0dea7214976c49c89f2b8
parent a2b1c46535d02bb4cc154f26481eda264a65abe8

mesa: pre-swizzle normal scale state value

src/mesa/main/ffvertex_prog.c

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index e36f1f6..7a099b2 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -775,8 +775,7 @@
 	 struct ureg rescale = register_param2(p, STATE_INTERNAL,
                                                STATE_NORMAL_SCALE);
 
-	 emit_op2( p, OPCODE_MUL, transformed_normal, 0, normal,
-		   swizzle1(rescale, X));
+	 emit_op2( p, OPCODE_MUL, transformed_normal, 0, normal, rescale );
          normal = transformed_normal;
       }
       

src/mesa/shader/prog_statevars.c

diff --git a/src/mesa/shader/prog_statevars.c b/src/mesa/shader/prog_statevars.c
index 37bd17b..44fbfdc 100644
--- a/src/mesa/shader/prog_statevars.c
+++ b/src/mesa/shader/prog_statevars.c
@@ -397,7 +397,11 @@
    case STATE_INTERNAL:
       switch (state[1]) {
       case STATE_NORMAL_SCALE:
-         ASSIGN_4V(value, ctx->_ModelViewInvScale, 0, 0, 1);
+         ASSIGN_4V(value, 
+                   ctx->_ModelViewInvScale, 
+                   ctx->_ModelViewInvScale, 
+                   ctx->_ModelViewInvScale, 
+                   1);
          return;
       case STATE_TEXRECT_SCALE:
          {