From 1341d7aa84ef188f537954682ce0c45068a3dd8f Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 21 Jul 2022 11:41:55 -0400 Subject: [PATCH] mesa/st: use plumbed value for srgb_skip_decode in sampler conversion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák Part-of: --- src/mesa/state_tracker/st_atom_sampler.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/mesa/state_tracker/st_atom_sampler.c b/src/mesa/state_tracker/st_atom_sampler.c index 97c370c5d51..a690eca4e22 100644 --- a/src/mesa/state_tracker/st_atom_sampler.c +++ b/src/mesa/state_tracker/st_atom_sampler.c @@ -130,9 +130,13 @@ st_convert_sampler(const struct st_context *st, } else { st_translate_color(&sampler->border_color, texBaseFormat, is_integer); - if (st->use_format_with_border_color) - sampler->border_color_format = st_get_sampler_view_format(st, texobj, - msamp->Attrib.sRGBDecode == GL_SKIP_DECODE_EXT); + if (st->use_format_with_border_color) { + bool srgb_skip_decode = false; + + if (!ignore_srgb_decode && msamp->Attrib.sRGBDecode == GL_SKIP_DECODE_EXT) + srgb_skip_decode = true; + sampler->border_color_format = st_get_sampler_view_format(st, texobj, srgb_skip_decode); + } } sampler->border_color_is_integer = is_integer; }