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

ac/surface: fix MSAA crash with FORCE_SWIZZLE_MODE on gfx9

Browse Source 
Fixes: 3dc2ccc14c "ac/surface: replace RADEON_SURF_OPTIMIZE_FOR_SPACE with !FORCE_SWIZZLE_MODE"

Closes: #2884

Tested-by: Michel Dänzer <mdaenzer@redhat.com>
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4862>
This commit is contained in:
Marek Olšák
2020-05-02 10:56:20 -04:00
committed by Marge Bot
parent 1dcf291e3b
commit c4cdef64ad
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/amd/common/ac_surface.c
View File

@@ -1658,7 +1658,9 @@ static int gfx9_compute_surface(ADDR_HANDLE addrlib,
case RADEON_SURF_MODE_1D: case RADEON_SURF_MODE_1D:
case RADEON_SURF_MODE_2D: case RADEON_SURF_MODE_2D:
if (surf->flags & (RADEON_SURF_IMPORTED | RADEON_SURF_FORCE_SWIZZLE_MODE)) { if (surf->flags & RADEON_SURF_IMPORTED ||
(info->chip_class >= GFX10 &&
surf->flags & RADEON_SURF_FORCE_SWIZZLE_MODE)) {
AddrSurfInfoIn.swizzleMode = surf->u.gfx9.surf.swizzle_mode; AddrSurfInfoIn.swizzleMode = surf->u.gfx9.surf.swizzle_mode;
break; break;
} }