radeonsi: report 10_10_10_2 scaled formats as unsupported on gfx6-9 as well

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16386>
This commit is contained in:
Marek Olšák 2022-05-07 15:30:44 -04:00 committed by Marge Bot
parent 9775da1196
commit e4283708f0
1 changed files with 10 additions and 10 deletions

View File

@ -1973,6 +1973,16 @@ static uint32_t si_translate_texformat(struct pipe_screen *screen, enum pipe_for
if (desc->is_mixed && desc->colorspace != UTIL_FORMAT_COLORSPACE_ZS)
goto out_unknown;
if (first_non_void < 0 || first_non_void > 3)
goto out_unknown;
/* Reject SCALED formats because we don't implement them for CB and do the same for texturing. */
if ((desc->channel[first_non_void].type == UTIL_FORMAT_TYPE_UNSIGNED ||
desc->channel[first_non_void].type == UTIL_FORMAT_TYPE_SIGNED) &&
!desc->channel[first_non_void].normalized &&
!desc->channel[first_non_void].pure_integer)
goto out_unknown;
/* See whether the components are of the same size. */
for (i = 1; i < desc->nr_channels; i++) {
uniform = uniform && desc->channel[0].size == desc->channel[i].size;
@ -2005,16 +2015,6 @@ static uint32_t si_translate_texformat(struct pipe_screen *screen, enum pipe_for
goto out_unknown;
}
if (first_non_void < 0 || first_non_void > 3)
goto out_unknown;
/* Reject SCALED formats because we don't implement them for CB and do the same for texturing. */
if ((desc->channel[first_non_void].type == UTIL_FORMAT_TYPE_UNSIGNED ||
desc->channel[first_non_void].type == UTIL_FORMAT_TYPE_SIGNED) &&
!desc->channel[first_non_void].normalized &&
!desc->channel[first_non_void].pure_integer)
goto out_unknown;
/* uniform formats */
switch (desc->channel[first_non_void].size) {
case 4: