ac/surface: don't compute single-sample CMASK if it's unaligned

Displayable DCC can cause this and fail the assertion later.

Fixes: cf61f635ff6a38aad344ebe30551eaaac6fec038
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5095>

diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c
index 1c2c0d8dad286def6ac440272099b7b7ab440df5..0a7d9e0d9b26b7e23cf303cc02e691be9b0d1fae 100644 (file)
--- a/src/amd/common/ac_surface.c
+++ b/src/amd/common/ac_surface.c
@@ -1471,7 +1471,10 @@ static int gfx9_compute_miptree(ADDR_HANDLE addrlib,
                /* CMASK -- on GFX10 only for FMASK */
                if (in->swizzleMode != ADDR_SW_LINEAR &&
                    in->resourceType == ADDR_RSRC_TEX_2D &&
-                   ((info->chip_class <= GFX9 && in->numSamples == 1) ||
+                   ((info->chip_class <= GFX9 &&
+                     in->numSamples == 1 &&
+                     in->flags.metaPipeUnaligned == 0 &&
+                     in->flags.metaRbUnaligned == 0) ||
                     (surf->fmask_size && in->numSamples >= 2))) {
                        ADDR2_COMPUTE_CMASK_INFO_INPUT cin = {0};
                        ADDR2_COMPUTE_CMASK_INFO_OUTPUT cout = {0};