OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radeonsi: reject some texture formats but only on GFX8/CARRIZO

Browse Source 
Not sure why this check was missing.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29288>
This commit is contained in:
Samuel Pitoiset
2024-05-20 14:52:26 +02:00
committed by Marge Bot
parent 95122a1cf7
commit e384b28805
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gallium/drivers/radeonsi/si_state.c
View File

@@ -2157,7 +2157,7 @@ static uint32_t si_translate_texformat(struct pipe_screen *screen, enum pipe_for
goto out_unknown;
/* This format fails on Gfx8/Carrizo´. */
if (format == PIPE_FORMAT_A8R8_UNORM)
if (sscreen->info.family == CHIP_CARRIZO && format == PIPE_FORMAT_A8R8_UNORM)
goto out_unknown;
/* See whether the components are of the same size. */
@@ -2176,7 +2176,8 @@ static uint32_t si_translate_texformat(struct pipe_screen *screen, enum pipe_for
goto out_unknown;
case 4:
/* 5551 and 1555 UINT formats fail on Gfx8/Carrizo´. */
if (desc->channel[1].size == 5 &&
if (sscreen->info.family == CHIP_CARRIZO &&
desc->channel[1].size == 5 &&
desc->channel[2].size == 5 &&
desc->channel[first_non_void].type == UTIL_FORMAT_TYPE_UNSIGNED &&
desc->channel[first_non_void].pure_integer)
@@ -2205,7 +2206,8 @@ static uint32_t si_translate_texformat(struct pipe_screen *screen, enum pipe_for
switch (desc->nr_channels) {
case 4:
/* 4444 UINT formats fail on Gfx8/Carrizo´. */
if (desc->channel[first_non_void].type == UTIL_FORMAT_TYPE_UNSIGNED &&
if (sscreen->info.family == CHIP_CARRIZO &&
desc->channel[first_non_void].type == UTIL_FORMAT_TYPE_UNSIGNED &&
desc->channel[first_non_void].pure_integer)
goto out_unknown;