summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2009-07-29 20:07:59 -0700
committerIan Romanick <ian.d.romanick@intel.com>2009-07-29 20:07:59 -0700
commite511633985ebdb423d1addefa1267a03a76da33b (patch)
tree2196246927367dd65417ee2b723d33f50192f2ca /src/mesa
parent8a430dd4dad8520a7a37573e03d85cfb6316cb56 (diff)
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.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/shader/prog_parameter_layout.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/shader/prog_parameter_layout.c b/src/mesa/shader/prog_parameter_layout.c
index 4d67eca902..8f2b306220 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;
}