AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa/st: do not fall back to uncompressed for latc

Browse Source 
This logic doesn't really do what it pretends to; we don't expose the
RGTC features unless we actually have LATC support. This is about to
change, but for that logic to work, we need to be able to tell if we're
using a fallback-format or not, and we can't do that unless we keep the
format as LATC.

Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18564>
This commit is contained in:
Erik Faye-Lund
2022-08-23 14:48:39 +02:00
parent 1b72045393
commit 559d68d25c
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/state_tracker/st_format.c
+13 -6
View File
@@ -615,21 +615,28 @@ static const struct format_mapping format_map[] = {
{ PIPE_FORMAT_RGTC2_SNORM, 0 }
},
{
{ GL_COMPRESSED_LUMINANCE, GL_COMPRESSED_LUMINANCE_LATC1_EXT, 0 },
{ GL_COMPRESSED_LUMINANCE, 0 },
{ PIPE_FORMAT_LATC1_UNORM, PIPE_FORMAT_L8_UNORM, DEFAULT_RGBA_FORMATS }
},
{
{ GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT, 0 },
{ PIPE_FORMAT_LATC1_SNORM, DEFAULT_SNORM8_RGBA_FORMATS }
{ GL_COMPRESSED_LUMINANCE_LATC1_EXT, 0 },
{ PIPE_FORMAT_LATC1_UNORM, 0 }
},
{
{ GL_COMPRESSED_LUMINANCE_ALPHA, GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT,
GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI, 0 },
{ GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT, 0 },
{ PIPE_FORMAT_LATC1_SNORM, 0 }
},
{
{ GL_COMPRESSED_LUMINANCE_ALPHA, GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI, 0 },
{ PIPE_FORMAT_LATC2_UNORM, PIPE_FORMAT_L8A8_UNORM, DEFAULT_RGBA_FORMATS }
},
{
{ GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT, 0 },
{ PIPE_FORMAT_LATC2_UNORM, 0 }
},
{
{ GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT, 0 },
{ PIPE_FORMAT_LATC2_SNORM, DEFAULT_SNORM8_RGBA_FORMATS }
{ PIPE_FORMAT_LATC2_SNORM, 0 }
},
/* ETC1 */