Mesa (master): r600g: fixup missing scaled r600 types.

Dave Airlie airlied at kemper.freedesktop.org
Fri Sep 16 13:09:35 UTC 2011


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

Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Sep 16 14:08:30 2011 +0100

r600g: fixup missing scaled r600 types.

I was still missing a couple of types on r600/r700 codepaths.

Fixes these up.

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

---

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

diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
index f6a840a..2e2ce40 100644
--- a/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@ -377,6 +377,8 @@ static uint32_t r600_translate_colorswap(enum pipe_format format)
 	case PIPE_FORMAT_R32G32B32A32_FLOAT:
 	case PIPE_FORMAT_R32G32B32A32_SNORM:
 	case PIPE_FORMAT_R32G32B32A32_UNORM:
+	case PIPE_FORMAT_R32G32B32A32_USCALED:
+	case PIPE_FORMAT_R32G32B32A32_SSCALED:
 		return V_0280A0_SWAP_STD;
 	default:
 		R600_ERR("unsupported colorswap format %d\n", format);
@@ -506,6 +508,8 @@ static uint32_t r600_translate_colorformat(enum pipe_format format)
 		return V_0280A0_COLOR_32_32_32_32_FLOAT;
 	case PIPE_FORMAT_R32G32B32A32_SNORM:
 	case PIPE_FORMAT_R32G32B32A32_UNORM:
+	case PIPE_FORMAT_R32G32B32A32_SSCALED:
+	case PIPE_FORMAT_R32G32B32A32_USCALED:
 		return V_0280A0_COLOR_32_32_32_32;
 
 	/* YUV buffers. */




More information about the mesa-commit mailing list