Module: Mesa Branch: asm-shader-rework-1 Commit: e511633985ebdb423d1addefa1267a03a76da33b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e511633985ebdb423d1addefa1267a03a76da33b
Author: Ian Romanick <[email protected]> Date: Wed Jul 29 20:07:59 2009 -0700 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 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 4d67eca..8f2b306 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; } _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
