mesa/st: use plumbed value for srgb_skip_decode in sampler conversion

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17687>
This commit is contained in:
Mike Blumenkrantz
2022-07-21 11:41:55 -04:00
committed by Marge Bot
parent 1c172cdbcc
commit 1341d7aa84
+7 -3
View File
@@ -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;
}