Mesa (master): freedreno/a3xx: fix border color order

[Rob Clark]

Module: Mesa
Branch: master
Commit: 7e20c09d4ac22012a9d2697fb83e6815edb5a64d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7e20c09d4ac22012a9d2697fb83e6815edb5a64d

Author: Rob Clark <robclark at freedesktop.org>
Date:   Sat Sep 27 18:19:54 2014 -0400

freedreno/a3xx: fix border color order

Signed-off-by: Rob Clark <robclark at freedesktop.org>

---

 src/gallium/drivers/freedreno/a3xx/fd3_emit.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_emit.c b/src/gallium/drivers/freedreno/a3xx/fd3_emit.c
index c48381c..430339a 100644
--- a/src/gallium/drivers/freedreno/a3xx/fd3_emit.c
+++ b/src/gallium/drivers/freedreno/a3xx/fd3_emit.c
@@ -194,11 +194,10 @@ emit_textures(struct fd_context *ctx, struct fd_ringbuffer *ring,
 					(BORDERCOLOR_SIZE * tex_off[sb]) +
 					(BORDERCOLOR_SIZE * i));
 
-			/* TODO not quite sure if bcolor is pre or post swizzle: */
-			for (j = 0; j < 4; j++) {
-				bcolor[j] =
-					util_float_to_half(sampler->base.border_color.f[j]);
-			}
+			bcolor[0] = util_float_to_half(sampler->base.border_color.f[2]);
+			bcolor[1] = util_float_to_half(sampler->base.border_color.f[1]);
+			bcolor[2] = util_float_to_half(sampler->base.border_color.f[0]);
+			bcolor[3] = util_float_to_half(sampler->base.border_color.f[3]);
 
 			OUT_RING(ring, sampler->texsamp0);
 			OUT_RING(ring, sampler->texsamp1);