From 439b5b008fc7b4fd694fbb52cfcdeaec945143ad Mon Sep 17 00:00:00 2001 From: Oded Gabbay Date: Wed, 24 Feb 2016 14:43:28 +0200 Subject: [PATCH] gallium/radeon: return correct values for BE in r600_translate_colorswap MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Because I changed the swizzle check, I also need to adapt the return values for each check. It's basically almost the same as before, we just cross between STD and STD_REV, and cross between ALT and ALT_REV This fixes the rgba test in gl-1.0-readpixsanity (piglit) and also fixes tri-flat (mesa demos). Signed-off-by: Oded Gabbay Cc: "11.1 11.2" Reviewed-by: Marek Olšák --- src/gallium/drivers/radeon/r600_texture.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/radeon/r600_texture.c b/src/gallium/drivers/radeon/r600_texture.c index 1df0c300e85..9a3ccb5a6cf 100644 --- a/src/gallium/drivers/radeon/r600_texture.c +++ b/src/gallium/drivers/radeon/r600_texture.c @@ -1304,13 +1304,13 @@ unsigned r600_translate_colorswap(enum pipe_format format) return V_0280A0_SWAP_ALT_REV; /* WXYZ */ #else if (HAS_SWIZZLE(1,W) && HAS_SWIZZLE(2,X)) - return V_0280A0_SWAP_STD; /* ZWXY */ + return V_0280A0_SWAP_STD_REV; /* ZWXY */ else if (HAS_SWIZZLE(1,X) && HAS_SWIZZLE(2,W)) - return V_0280A0_SWAP_STD_REV; /* YXWZ */ + return V_0280A0_SWAP_STD; /* YXWZ */ else if (HAS_SWIZZLE(1,W) && HAS_SWIZZLE(2,Z)) - return V_0280A0_SWAP_ALT; /* XWZY */ + return V_0280A0_SWAP_ALT_REV; /* XWZY */ else if (HAS_SWIZZLE(1,Z) && HAS_SWIZZLE(2,W)) - return V_0280A0_SWAP_ALT_REV; /* YZWX */ + return V_0280A0_SWAP_ALT; /* YZWX */ #endif break; } -- 2.30.2