From: Ian Romanick <ian.d.romanick@intel.com>
Date: Thu, 30 Jul 2009 03:07:59 +0000 (-0700)
Subject: ARB prog: Fix the order of swizzle application
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e511633985ebdb423d1addefa1267a03a76da33b;p=mesa.git

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 4d67eca902f..8f2b3062203 100644
--- 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;
 	 }