From 4f215952760b2e5a92b25ddfa89469c1ec110160 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sat, 4 Aug 2012 14:29:25 +0200 Subject: [PATCH] r600g: remove support for 3-channel colorbuffers We have no sampler support for them. --- src/gallium/drivers/r600/evergreen_state.c | 7 ------- src/gallium/drivers/r600/r600_state.c | 8 -------- 2 files changed, 15 deletions(-) diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c index 67ae7d3c04c..6e338ae23f6 100644 --- a/src/gallium/drivers/r600/evergreen_state.c +++ b/src/gallium/drivers/r600/evergreen_state.c @@ -338,8 +338,6 @@ static uint32_t r600_translate_colorswap(enum pipe_format format) case PIPE_FORMAT_R16G16_SNORM: case PIPE_FORMAT_R16G16_UINT: case PIPE_FORMAT_R16G16_SINT: - case PIPE_FORMAT_R16G16B16_FLOAT: - case PIPE_FORMAT_R32G32B32_FLOAT: return V_028C70_SWAP_STD; /* 64-bit buffers. */ @@ -517,7 +515,6 @@ static uint32_t r600_translate_colorformat(enum pipe_format format) case PIPE_FORMAT_R16G16B16A16_SNORM: return V_028C70_COLOR_16_16_16_16; - case PIPE_FORMAT_R16G16B16_FLOAT: case PIPE_FORMAT_R16G16B16A16_FLOAT: return V_028C70_COLOR_16_16_16_16_FLOAT; @@ -531,10 +528,6 @@ static uint32_t r600_translate_colorformat(enum pipe_format format) case PIPE_FORMAT_L32A32_SINT: return V_028C70_COLOR_32_32; - /* 96-bit buffers. */ - case PIPE_FORMAT_R32G32B32_FLOAT: - return V_028C70_COLOR_32_32_32_FLOAT; - /* 128-bit buffers. */ case PIPE_FORMAT_R32G32B32A32_SNORM: case PIPE_FORMAT_R32G32B32A32_UNORM: diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c index 9c7ff7febb5..c1061ddbe0c 100644 --- a/src/gallium/drivers/r600/r600_state.c +++ b/src/gallium/drivers/r600/r600_state.c @@ -281,8 +281,6 @@ static uint32_t r600_translate_colorswap(enum pipe_format format) case PIPE_FORMAT_R16G16_FLOAT: case PIPE_FORMAT_R16G16_UINT: case PIPE_FORMAT_R16G16_SINT: - case PIPE_FORMAT_R16G16B16_FLOAT: - case PIPE_FORMAT_R32G32B32_FLOAT: case PIPE_FORMAT_R32_UINT: case PIPE_FORMAT_R32_SINT: case PIPE_FORMAT_R32_FLOAT: @@ -405,7 +403,6 @@ static 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: case PIPE_FORMAT_R8G8B8A8_SINT: case PIPE_FORMAT_R8G8B8A8_UINT: return V_0280A0_COLOR_8_8_8_8; @@ -469,7 +466,6 @@ static uint32_t r600_translate_colorformat(enum pipe_format format) case PIPE_FORMAT_R16G16B16A16_SNORM: return V_0280A0_COLOR_16_16_16_16; - case PIPE_FORMAT_R16G16B16_FLOAT: case PIPE_FORMAT_R16G16B16A16_FLOAT: return V_0280A0_COLOR_16_16_16_16_FLOAT; @@ -483,10 +479,6 @@ static uint32_t r600_translate_colorformat(enum pipe_format format) case PIPE_FORMAT_L32A32_SINT: return V_0280A0_COLOR_32_32; - /* 96-bit buffers. */ - case PIPE_FORMAT_R32G32B32_FLOAT: - return V_0280A0_COLOR_32_32_32_FLOAT; - /* 128-bit buffers. */ case PIPE_FORMAT_R32G32B32A32_FLOAT: return V_0280A0_COLOR_32_32_32_32_FLOAT; -- 2.30.2