This patch modifies r600_colorformat_endian_swap(), so for 16-bit and for
32-bit buffers, the endianess configuration will be determined not only
by the color/texture format, but also by the do_endian_swap parameter.
The only exception is for array formats, which are always set to not do
swapping, because for them gallium sets an alias based on the machine's
endianess.
Signed-off-by: Oded Gabbay <oded.gab...@gmail.com>
---
src/gallium/drivers/r600/r600_state_common.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/gallium/drivers/r600/r600_state_common.c
b/src/gallium/drivers/r600/r600_state_common.c
index 2aea982..1d44ef0 100644
--- a/src/gallium/drivers/r600/r600_state_common.c
+++ b/src/gallium/drivers/r600/r600_state_common.c
@@ -2691,17 +2691,25 @@ uint32_t r600_colorformat_endian_swap(uint32_t
colorformat, bool do_endian_swap)
return ENDIAN_NONE;
/* 16-bit buffers. */
+ case V_0280A0_COLOR_8_8:
+ /*
+ * No need to do endian swaps on array formats,
+ * as mesa<-->pipe formats conversion take into account
+ * the endianess
+ */
+ return ENDIAN_NONE;
+
case V_0280A0_COLOR_5_6_5:
case V_0280A0_COLOR_1_5_5_5:
case V_0280A0_COLOR_4_4_4_4:
case V_0280A0_COLOR_16:
- case V_0280A0_COLOR_8_8:
- return ENDIAN_8IN16;
+ return (do_endian_swap ? ENDIAN_8IN16 : ENDIAN_NONE);
/* 32-bit buffers. */
case V_0280A0_COLOR_8_8_8_8:
+ case V_0280A0_COLOR_16_16:
/*
- * No need to do endian swaps on four 8-bits components,
+ * No need to do endian swaps on array formats,
* as mesa<-->pipe formats conversion take into account
* the endianess
*/
@@ -2712,8 +2720,7 @@ uint32_t r600_colorformat_endian_swap(uint32_t
colorformat, bool do_endian_swap)
case V_0280A0_COLOR_24_8:
case V_0280A0_COLOR_32_FLOAT:
case V_0280A0_COLOR_16_16_FLOAT:
- case V_0280A0_COLOR_16_16:
- return ENDIAN_8IN32;
+ return (do_endian_swap ? ENDIAN_8IN32 : ENDIAN_NONE);
/* 64-bit buffers. */
case V_0280A0_COLOR_16_16_16_16:
--
2.5.5
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
