Mesa (8.0): r600g: add missing r32 uint/sint fbo formats.

Dave Airlie airlied at kemper.freedesktop.org
Mon Jan 23 01:53:55 PST 2012


Module: Mesa
Branch: 8.0
Commit: ee6a817f8059cf8a31a0f91169fc144984804d40
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ee6a817f8059cf8a31a0f91169fc144984804d40

Author: Dave Airlie <airlied at redhat.com>
Date:   Sat Jan 14 17:32:14 2012 +0000

r600g: add missing r32 uint/sint fbo formats.

Fixes the GL3 required formats test.

Signed-off-by: Dave Airlie <airlied at redhat.com>
(cherry picked from commit 5250bd00c00ac8470320f4fae1d74425132f2083)

---

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

diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c
index f3aab69..185ea77 100644
--- a/src/gallium/drivers/r600/evergreen_state.c
+++ b/src/gallium/drivers/r600/evergreen_state.c
@@ -508,6 +508,10 @@ static uint32_t r600_translate_colorformat(enum pipe_format format)
 	case PIPE_FORMAT_Z32_FLOAT_S8X24_UINT:
 		return V_028C70_COLOR_X24_8_32_FLOAT;
 
+	case PIPE_FORMAT_R32_UINT:
+	case PIPE_FORMAT_R32_SINT:
+		return V_028C70_COLOR_32;
+
 	case PIPE_FORMAT_R32_FLOAT:
 	case PIPE_FORMAT_Z32_FLOAT:
 		return V_028C70_COLOR_32_FLOAT;
diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
index 5fe038e..39ab247 100644
--- a/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@ -509,6 +509,10 @@ static uint32_t r600_translate_colorformat(enum pipe_format format)
 	case PIPE_FORMAT_Z32_FLOAT_S8X24_UINT:
 		return V_0280A0_COLOR_X24_8_32_FLOAT;
 
+	case PIPE_FORMAT_R32_UINT:
+	case PIPE_FORMAT_R32_SINT:
+		return V_0280A0_COLOR_32;
+
 	case PIPE_FORMAT_R32_FLOAT:
 	case PIPE_FORMAT_Z32_FLOAT:
 		return V_0280A0_COLOR_32_FLOAT;



More information about the mesa-commit mailing list