gallivm: Swizzle constants into the right AoS ordering.

Constants array is always assumed to be RGBA, which means we need to
swizzle the constant elements into place to match the AoS ordering
(e.g., BGRA) that was passed to lp_build_tgsi_aos().

Signed-off-by: José Fonseca <jfonseca@vmware.com>

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c
index a021efd69ff8b15c1c45ccac55b577b2c4b32767..74b3b75039aeee668f4743f8ede2d6039e2b58a8 100644 (file)
--- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c
@@ -189,7 +189,7 @@ emit_fetch(
           * NOTE: constants array is always assumed to be RGBA
           */
 
-         swizzle = lp_build_const_int32(bld->base.gallivm, chan);
+         swizzle = lp_build_const_int32(bld->base.gallivm, bld->swizzles[chan]);
 
          res = LLVMBuildInsertElement(builder, res, scalar, swizzle, "");
       }