From 6e4154b7ef5decb760994c19a78556d4ea782ce5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
Date: Fri, 11 Apr 2025 17:33:59 -0400
Subject: [PATCH] ac/nir: fix export_ps_outputs not preserving divergence
 metadata

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34492>
---
 src/amd/common/nir/ac_nir_lower_ps_late.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/amd/common/nir/ac_nir_lower_ps_late.c b/src/amd/common/nir/ac_nir_lower_ps_late.c
index b28707c7d6c..19d20f98afe 100644
--- a/src/amd/common/nir/ac_nir_lower_ps_late.c
+++ b/src/amd/common/nir/ac_nir_lower_ps_late.c
@@ -690,7 +690,7 @@ export_ps_outputs(nir_builder *b, lower_ps_state *s)
       emit_ps_null_export(b, s);
    }
 
-   return true;
+   return nir_progress(true, b->impl, nir_metadata_control_flow);
 }
 
 bool