Mesa (master): r600g: add missing colorswaps for r8 uint/sint.

Dave Airlie airlied at kemper.freedesktop.org
Mon Jan 2 20:47:15 UTC 2012


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

Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Jan  2 20:44:30 2012 +0000

r600g: add missing colorswaps for r8 uint/sint.

fixes some warnings in GL3.0 tests.

Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/gallium/drivers/r600/evergreen_state.c |    2 ++
 src/gallium/drivers/r600/r600_state.c      |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c
index 6f5d6f7..ed75ae3 100644
--- a/src/gallium/drivers/r600/evergreen_state.c
+++ b/src/gallium/drivers/r600/evergreen_state.c
@@ -294,6 +294,8 @@ static uint32_t r600_translate_colorswap(enum pipe_format format)
 	case PIPE_FORMAT_L8_SRGB:
 	case PIPE_FORMAT_R8_UNORM:
 	case PIPE_FORMAT_R8_SNORM:
+	case PIPE_FORMAT_R8_UINT:
+	case PIPE_FORMAT_R8_SINT:
 		return V_028C70_SWAP_STD;
 
 	/* 16-bit buffers. */
diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
index 7f44035..12157ff 100644
--- a/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@ -290,6 +290,8 @@ static uint32_t r600_translate_colorswap(enum pipe_format format)
 	case PIPE_FORMAT_L8_SRGB:
 	case PIPE_FORMAT_R8_UNORM:
 	case PIPE_FORMAT_R8_SNORM:
+	case PIPE_FORMAT_R8_UINT:
+	case PIPE_FORMAT_R8_SINT:
 		return V_0280A0_SWAP_STD;
 
 	case PIPE_FORMAT_L4A4_UNORM:




More information about the mesa-commit mailing list