Mesa (master): r600g: add missing vertex fetch formats to the translation table.

Dave Airlie airlied at kemper.freedesktop.org
Thu Sep 2 03:37:43 UTC 2010


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

Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Sep  2 13:32:25 2010 +1000

r600g: add missing vertex fetch formats to the translation table.

fixes at least 2 more piglits.

---

 src/gallium/drivers/r600/r600_state_inlines.h |    2 ++
 src/gallium/drivers/r600/r600d.h              |    1 +
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_state_inlines.h b/src/gallium/drivers/r600/r600_state_inlines.h
index d67d4be..8486682 100644
--- a/src/gallium/drivers/r600/r600_state_inlines.h
+++ b/src/gallium/drivers/r600/r600_state_inlines.h
@@ -252,6 +252,7 @@ static INLINE uint32_t r600_translate_colorformat(enum pipe_format format)
 	case PIPE_FORMAT_R8SG8SB8UX8U_NORM:
 	case PIPE_FORMAT_X8B8G8R8_UNORM:
 	case PIPE_FORMAT_X8R8G8B8_UNORM:
+	case PIPE_FORMAT_R8G8B8_UNORM:
 		return V_0280A0_COLOR_8_8_8_8;
 
 	case PIPE_FORMAT_R10G10B10A2_UNORM:
@@ -278,6 +279,7 @@ static INLINE uint32_t r600_translate_colorformat(enum pipe_format format)
 
 		/* 128-bit buffers. */
 	case PIPE_FORMAT_R32G32B32_FLOAT:
+	  	return V_0280A0_COLOR_32_32_32_FLOAT;
 	case PIPE_FORMAT_R32G32B32A32_FLOAT:
 		return V_0280A0_COLOR_32_32_32_32_FLOAT;
 
diff --git a/src/gallium/drivers/r600/r600d.h b/src/gallium/drivers/r600/r600d.h
index 9bdfe4f..7b9a983 100644
--- a/src/gallium/drivers/r600/r600d.h
+++ b/src/gallium/drivers/r600/r600d.h
@@ -199,6 +199,7 @@
 #define     V_0280A0_COLOR_16_16_16_16_FLOAT           0x00000020
 #define     V_0280A0_COLOR_32_32_32_32                 0x00000022
 #define     V_0280A0_COLOR_32_32_32_32_FLOAT           0x00000023
+#define     V_0280A0_COLOR_32_32_32_FLOAT              0x00000030
 #define   S_0280A0_ARRAY_MODE(x)                       (((x) & 0xF) << 8)
 #define   G_0280A0_ARRAY_MODE(x)                       (((x) >> 8) & 0xF)
 #define   C_0280A0_ARRAY_MODE                          0xFFFFF0FF




More information about the mesa-commit mailing list