Mesa (master): vc4: Fix swapped 565 dithering versus no-dithering render configs.

[Eric Anholt]

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

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Sep 24 13:41:24 2014 -0700

vc4: Fix swapped 565 dithering versus no-dithering render configs.

Fixes many 565 piglit tests (like fbo-generatemipmap-formats) that weren't
expecting dithering.

---

 src/gallium/drivers/vc4/vc4_packet.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/vc4/vc4_packet.h b/src/gallium/drivers/vc4/vc4_packet.h
index a7de4e8..a8b3566 100644
--- a/src/gallium/drivers/vc4/vc4_packet.h
+++ b/src/gallium/drivers/vc4/vc4_packet.h
@@ -214,9 +214,9 @@ enum vc4_packet {
 #define VC4_RENDER_CONFIG_DECIMATE_MODE_4X         (1 << 4)
 #define VC4_RENDER_CONFIG_DECIMATE_MODE_16X        (2 << 4)
 
-#define VC4_RENDER_CONFIG_FORMAT_BGR565            (0 << 2)
+#define VC4_RENDER_CONFIG_FORMAT_BGR565_DITHERED   (0 << 2)
 #define VC4_RENDER_CONFIG_FORMAT_RGBA8888          (1 << 2)
-#define VC4_RENDER_CONFIG_FORMAT_BGR565_DITHERED   (2 << 2)
+#define VC4_RENDER_CONFIG_FORMAT_BGR565            (2 << 2)
 #define VC4_RENDER_CONFIG_FORMAT_MASK              (3 << 2)
 
 #define VC4_RENDER_CONFIG_TILE_BUFFER_64BIT        (1 << 1)