From 559d68d25c1f014fdece2afd50df28e5d2b04dab Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Tue, 23 Aug 2022 14:48:39 +0200 Subject: [PATCH] mesa/st: do not fall back to uncompressed for latc 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 Part-of: --- src/mesa/state_tracker/st_format.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c index a03efaafe99..b28d36140f5 100644 --- a/src/mesa/state_tracker/st_format.c +++ b/src/mesa/state_tracker/st_format.c @@ -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 */