From 5250bd00c00ac8470320f4fae1d74425132f2083 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Sat, 14 Jan 2012 17:32:14 +0000 Subject: [PATCH] r600g: add missing r32 uint/sint fbo formats. Fixes the GL3 required formats test. Signed-off-by: Dave Airlie --- src/gallium/drivers/r600/evergreen_state.c | 4 ++++ src/gallium/drivers/r600/r600_state.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c index df6ad28681e..dd8b8300a09 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 5fe038e79e5..39ab247ce5c 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; -- 2.30.2