Mesa (master): r600g: Synchronize supported color formats between Evergreen and r600/r700.

[Henri Verbeet]

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

Author: Henri Verbeet <hverbeet at gmail.com>
Date:   Wed Nov 17 00:29:03 2010 +0100

r600g: Synchronize supported color formats between Evergreen and r600/r700.

---

 src/gallium/drivers/r600/eg_state_inlines.h |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/r600/eg_state_inlines.h b/src/gallium/drivers/r600/eg_state_inlines.h
index 031182a..698299e 100644
--- a/src/gallium/drivers/r600/eg_state_inlines.h
+++ b/src/gallium/drivers/r600/eg_state_inlines.h
@@ -449,8 +449,10 @@ static INLINE uint32_t r600_translate_colorformat(enum pipe_format format)
 		return V_028C70_COLOR_16_16;
 
 		/* 64-bit buffers. */
-	case PIPE_FORMAT_R16G16B16A16_SSCALED:
+	case PIPE_FORMAT_R16G16B16_USCALED:
+	case PIPE_FORMAT_R16G16B16A16_USCALED:
 	case PIPE_FORMAT_R16G16B16_SSCALED:
+	case PIPE_FORMAT_R16G16B16A16_SSCALED:
 	case PIPE_FORMAT_R16G16B16A16_UNORM:
 	case PIPE_FORMAT_R16G16B16A16_SNORM:
 		return V_028C70_COLOR_16_16_16_16;
@@ -462,6 +464,7 @@ static INLINE uint32_t r600_translate_colorformat(enum pipe_format format)
 	case PIPE_FORMAT_R32G32_FLOAT:
 		return V_028C70_COLOR_32_32_FLOAT;
 
+	case PIPE_FORMAT_R32G32_USCALED:
 	case PIPE_FORMAT_R32G32_SSCALED:
 		return V_028C70_COLOR_32_32;