mesa/st: do not fallback to srgba formats for dxt

We don't do this for the non-sRGB DXT formats, and it doesn't really
make any sense when we're about to add fallback elsewhere.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Acked-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18180>
This commit is contained in:
Erik Faye-Lund 2022-08-22 16:59:19 +02:00 committed by Marge Bot
parent b6f6b43c76
commit 060596f1d8

View file

@ -413,19 +413,26 @@ static const struct format_mapping format_map[] = {
{ PIPE_FORMAT_R8G8B8A8_SRGB, DEFAULT_SRGBA_FORMATS }
},
{
{ GL_COMPRESSED_SRGB_EXT, GL_COMPRESSED_SRGB_S3TC_DXT1_EXT, 0 },
{ GL_COMPRESSED_SRGB_EXT, 0 },
{ PIPE_FORMAT_DXT1_SRGB, PIPE_FORMAT_R8G8B8X8_SRGB,
PIPE_FORMAT_B8G8R8X8_SRGB, DEFAULT_SRGBA_FORMATS }
},
{
{ GL_COMPRESSED_SRGB_S3TC_DXT1_EXT, 0 },
{ PIPE_FORMAT_DXT1_SRGB }
},
{
{ GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT, 0 },
{ PIPE_FORMAT_DXT1_SRGBA, 0 }
},
{
{ GL_COMPRESSED_SRGB_ALPHA_EXT,
GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT, 0 },
{ GL_COMPRESSED_SRGB_ALPHA_EXT },
{ PIPE_FORMAT_DXT3_SRGBA, DEFAULT_SRGBA_FORMATS }
},
{
{ GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT, 0 },
{ PIPE_FORMAT_DXT3_SRGBA, 0 }
},
{
{ GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT, 0 },
{ PIPE_FORMAT_DXT5_SRGBA, 0 }