ac/surface: fix MSAA corruption on Vega due to FMASK tile swizzle

a needle in the haystack?

Cc: 18.1 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>

diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c
index afdae1971e907dda4419eecc0dac832721047785..2f4f0f8884f3749b8bd4049b2828e14c4fab134c 100644 (file)
--- a/src/amd/common/ac_surface.c
+++ b/src/amd/common/ac_surface.c
@@ -1302,7 +1302,7 @@ static int gfx9_compute_miptree(ADDR_HANDLE addrlib,
                                /* This counter starts from 1 instead of 0. */
                                xin.surfIndex = p_atomic_inc_return(config->info.fmask_surf_index);
                                xin.flags = in->flags;
-                               xin.swizzleMode = in->swizzleMode;
+                               xin.swizzleMode = fin.swizzleMode;
                                xin.resourceType = in->resourceType;
                                xin.format = in->format;
                                xin.numSamples = in->numSamples;