From f0e3fe195fffb71ebc226e8fdaf6814be26ebaa5 Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Date: Fri, 24 Jan 2025 16:48:05 -0500
Subject: [PATCH] nir/lower_robust_access: do not preserve control flow

we insert if's, which dirties control flow metadata. caught by the new metadata
validation blowing up.

Cc: mesa-stable
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Georg Lehmann <dadschoorse@gmail.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33216>
---
 src/compiler/nir/nir_lower_robust_access.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/nir/nir_lower_robust_access.c b/src/compiler/nir/nir_lower_robust_access.c
index 9ac71ad0e2a..3af74d7274d 100644
--- a/src/compiler/nir/nir_lower_robust_access.c
+++ b/src/compiler/nir/nir_lower_robust_access.c
@@ -221,5 +221,5 @@ nir_lower_robust_access(nir_shader *s, nir_intrin_filter_cb filter,
                         const void *data)
 {
    struct pass_opts opt = { .filter = filter, .data = data };
-   return nir_shader_intrinsics_pass(s, lower, nir_metadata_control_flow, &opt);
+   return nir_shader_intrinsics_pass(s, lower, nir_metadata_none, &opt);
 }