From 83945e2247ba67c43896b3805c4aa8511fa63fd9 Mon Sep 17 00:00:00 2001
From: Georg Lehmann <dadschoorse@gmail.com>
Date: Wed, 23 Jul 2025 13:04:04 +0200
Subject: [PATCH] pvr/rogue: return progress in rogue_nir_pfo

Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36312>
---
 src/imagination/rogue/nir/rogue_nir_pfo.c | 10 +++++++---
 src/imagination/rogue/rogue.h             |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/imagination/rogue/nir/rogue_nir_pfo.c b/src/imagination/rogue/nir/rogue_nir_pfo.c
index 2de9ad4361f..a0c63a00f73 100644
--- a/src/imagination/rogue/nir/rogue_nir_pfo.c
+++ b/src/imagination/rogue/nir/rogue_nir_pfo.c
@@ -51,17 +51,17 @@ static void insert_pfo(nir_builder *b,
 }
 
 PUBLIC
-void rogue_nir_pfo(nir_shader *shader)
+bool rogue_nir_pfo(nir_shader *shader)
 {
    nir_function_impl *impl = nir_shader_get_entrypoint(shader);
    nir_builder b;
 
    /* Only apply to fragment shaders. */
-   if (shader->info.stage != MESA_SHADER_FRAGMENT)
-      return;
+   assert(shader->info.stage == MESA_SHADER_FRAGMENT);
 
    b = nir_builder_create(impl);
 
+   bool progress = false;
    nir_foreach_block (block, impl) {
       nir_foreach_instr_safe (instr, block) {
          if (instr->type == nir_instr_type_intrinsic) {
@@ -73,6 +73,7 @@ void rogue_nir_pfo(nir_shader *shader)
 
             b.cursor = nir_before_instr(&intr->instr);
             insert_pfo(&b, intr, &intr->src[0]);
+            progress = true;
          } else if (instr->type == nir_instr_type_deref) {
             /* Find variable derefs and update their type. */
             nir_deref_instr *deref = nir_instr_as_deref(instr);
@@ -87,7 +88,10 @@ void rogue_nir_pfo(nir_shader *shader)
 
             deref->type = glsl_uintN_t_type(32);
             out->type = glsl_uintN_t_type(32);
+            progress = true;
          }
       }
    }
+
+   return nir_progress(progress, impl, nir_metadata_control_flow);
 }
diff --git a/src/imagination/rogue/rogue.h b/src/imagination/rogue/rogue.h
index f67deba4ad5..0cdf6e455ae 100644
--- a/src/imagination/rogue/rogue.h
+++ b/src/imagination/rogue/rogue.h
@@ -2941,7 +2941,7 @@ nir_shader *rogue_spirv_to_nir(rogue_build_ctx *ctx,
                                struct nir_spirv_specialization *spec);
 
 /* Custom NIR passes. */
-void rogue_nir_pfo(nir_shader *shader);
+bool rogue_nir_pfo(nir_shader *shader);
 
 bool rogue_nir_lower_io(nir_shader *shader);