From: Eric Anholt <eric@anholt.net>
Date: Sat, 10 Jan 2015 21:58:58 +0000 (+1300)
Subject: vc4: Fix clear color setup for RGB565.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c1226629846613f9442e5fc5ad9be305176a4f0f;p=mesa.git

vc4: Fix clear color setup for RGB565.

The util_pack_color() thing only sets up the low bits of the union, so
only return them, too.  Fixes intermittent failure on
fbo-alphatest-formats and es3conform's framebuffer-objects test under
simulation.
---

diff --git a/src/gallium/drivers/vc4/vc4_draw.c b/src/gallium/drivers/vc4/vc4_draw.c
index bb4b9a42217..3a6d6254a1b 100644
--- a/src/gallium/drivers/vc4/vc4_draw.c
+++ b/src/gallium/drivers/vc4/vc4_draw.c
@@ -288,7 +288,10 @@ pack_rgba(enum pipe_format format, const float *rgba)
 {
         union util_color uc;
         util_pack_color(rgba, format, &uc);
-        return uc.ui[0];
+        if (util_format_get_blocksize(format) == 2)
+                return uc.us;
+        else
+                return uc.ui[0];
 }
 
 static void