ARB prog: Fix the order of swizzle application

The swizzle used to generate the "original" value from the value
stored in the parameter array happens before the swizzle specified in
the instruction.  This fixes problems seen in progs/vp/vp-tris with arl-*.txt.

diff --git a/src/mesa/shader/prog_parameter_layout.c b/src/mesa/shader/prog_parameter_layout.c
index 4d67eca902f713ee1c6b60440bcba11571036c70..8f2b30622036251513a6cfbf334828b34117d418 100644 (file)
--- a/src/mesa/shader/prog_parameter_layout.c
+++ b/src/mesa/shader/prog_parameter_layout.c
@@ -187,7 +187,7 @@ _mesa_layout_parameters(struct asm_parser_state *state)
               _mesa_add_unnamed_constant(layout, v, p->Size, & swizzle);
 
            inst->Base.SrcReg[i].Swizzle = 
-              _mesa_combine_swizzles(inst->Base.SrcReg[i].Swizzle, swizzle);
+              _mesa_combine_swizzles(swizzle, inst->Base.SrcReg[i].Swizzle);
            break;
         }