From e511633985ebdb423d1addefa1267a03a76da33b Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Wed, 29 Jul 2009 20:07:59 -0700 Subject: 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. --- src/mesa/shader/prog_parameter_layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/mesa/shader') 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; } -- cgit v1.2.3