diff options
| author | Oded Gabbay <[email protected]> | 2016-04-19 16:25:23 +0300 |
|---|---|---|
| committer | Oded Gabbay <[email protected]> | 2016-04-26 11:00:16 +0300 |
| commit | 686ad477bdfc698b8ff7ccfba6225b2c1c68214a (patch) | |
| tree | 3062a75e4262554bc668c27256eef865a48896ca | |
| parent | 2242dbe11d56b05ede7a928a9973adda4b145ad7 (diff) | |
r600g: set endianess of 16/32-bit buffers according to do_endian_swap
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.
v4:
V_0280A0_COLOR_16_16 and V_0280A0_COLOR_16_16_FLOAT should be set to
8IN16 because the bytes inside need to be swapped even for array formats.
Signed-off-by: Oded Gabbay <[email protected]>
Cc: "11.1 11.2" <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
| -rw-r--r-- | src/gallium/drivers/r600/r600_state_common.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c index 3e58d21735b..e60a8aa9739 100644 --- a/src/gallium/drivers/r600/r600_state_common.c +++ b/src/gallium/drivers/r600/r600_state_common.c @@ -2691,17 +2691,24 @@ 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: /* - * 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 */ @@ -2711,9 +2718,11 @@ uint32_t r600_colorformat_endian_swap(uint32_t colorformat, bool do_endian_swap) case V_0280A0_COLOR_8_24: case V_0280A0_COLOR_24_8: case V_0280A0_COLOR_32_FLOAT: + return (do_endian_swap ? ENDIAN_8IN32 : ENDIAN_NONE); + case V_0280A0_COLOR_16_16_FLOAT: case V_0280A0_COLOR_16_16: - return ENDIAN_8IN32; + return ENDIAN_8IN16; /* 64-bit buffers. */ case V_0280A0_COLOR_16_16_16_16: |