Module: Mesa Branch: 9.1 Commit: fc0445553322866b903e4695c36aae6681f933b9 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fc0445553322866b903e4695c36aae6681f933b9
Author: Michel Dänzer <[email protected]> Date: Tue Feb 5 17:30:56 2013 +0100 radeonsi: Don't advertise PIPE_FORMAT_L8A8_SRGB support. The hardware can't do it. (cherry picked from commit f6e9430da2d3510f84baefa0fdf26ec5c457f146) --- src/gallium/drivers/radeonsi/si_state.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 6e50832..a58a347 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -720,7 +720,6 @@ static uint32_t si_translate_colorformat(enum pipe_format format) case PIPE_FORMAT_L8A8_SNORM: case PIPE_FORMAT_L8A8_UINT: case PIPE_FORMAT_L8A8_SINT: - case PIPE_FORMAT_L8A8_SRGB: case PIPE_FORMAT_R8G8_SNORM: case PIPE_FORMAT_R8G8_UNORM: case PIPE_FORMAT_R8G8_UINT: @@ -895,7 +894,6 @@ static uint32_t si_translate_colorswap(enum pipe_format format) case PIPE_FORMAT_L8A8_SNORM: case PIPE_FORMAT_L8A8_UINT: case PIPE_FORMAT_L8A8_SINT: - case PIPE_FORMAT_L8A8_SRGB: return V_028C70_SWAP_ALT; case PIPE_FORMAT_R8G8_SNORM: case PIPE_FORMAT_R8G8_UNORM: @@ -1169,6 +1167,8 @@ static uint32_t si_translate_texformat(struct pipe_screen *screen, goto out_unknown; /* TODO */ case UTIL_FORMAT_COLORSPACE_SRGB: + if (desc->nr_channels != 4 && desc->nr_channels != 1) + goto out_unknown; break; default: _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
