Module: Mesa Branch: master Commit: c4cdef64ad6d11e82894d24691348c38d7fad6ce URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c4cdef64ad6d11e82894d24691348c38d7fad6ce
Author: Marek Olšák <[email protected]> Date: Sat May 2 10:56:20 2020 -0400 ac/surface: fix MSAA crash with FORCE_SWIZZLE_MODE on gfx9 Fixes: 3dc2ccc14c0e035 "ac/surface: replace RADEON_SURF_OPTIMIZE_FOR_SPACE with !FORCE_SWIZZLE_MODE" Closes: #2884 Tested-by: Michel Dänzer <[email protected]> Reviewed-by: Pierre-Eric Pelloux-Prayer <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4862> --- src/amd/common/ac_surface.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c index 474be97d0b4..64bfa419839 100644 --- a/src/amd/common/ac_surface.c +++ b/src/amd/common/ac_surface.c @@ -1658,7 +1658,9 @@ static int gfx9_compute_surface(ADDR_HANDLE addrlib, case RADEON_SURF_MODE_1D: 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; break; } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
