From 2d5aae032b97de7c25b97514c08f9b642a1d2ddf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timur=20Krist=C3=B3f?= <timur.kristof@gmail.com>
Date: Sun, 27 Feb 2022 18:41:10 +0100
Subject: [PATCH] ac/nir: Properly invalidate mesh shader metadata.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15199>
---
 src/amd/common/ac_nir_lower_ngg.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/amd/common/ac_nir_lower_ngg.c b/src/amd/common/ac_nir_lower_ngg.c
index 0fc463cdbef..2ec9d60eda3 100644
--- a/src/amd/common/ac_nir_lower_ngg.c
+++ b/src/amd/common/ac_nir_lower_ngg.c
@@ -2763,11 +2763,13 @@ ac_nir_lower_ngg_ms(nir_shader *shader,
 
    handle_smaller_ms_api_workgroup(b, &state);
    emit_ms_prelude(b, &state);
+   nir_metadata_preserve(impl, nir_metadata_none);
 
    lower_ms_intrinsics(shader, &state);
+
    emit_ms_finale(b, &state);
+   nir_metadata_preserve(impl, nir_metadata_none);
 
    /* Cleanup */
    nir_validate_shader(shader, "after emitting NGG MS");
-   nir_metadata_preserve(impl, nir_metadata_none);
 }