From 32aa33606e21b885caa187962ba260cd9fdbf233 Mon Sep 17 00:00:00 2001 From: Christian Gmeiner Date: Sat, 7 Feb 2026 23:41:54 +0100 Subject: [PATCH] pan/compiler: Fix progress reporting in pan_nir_lower_store_component lower_store_component() always returns false even though it modifies NIR instructions (rewrites sources, creates new SSA defs, removes previous stores). This triggers the "NIR changed but no progress reported" assertion in nir_shader_intrinsics_pass. Return true when a store_output or store_per_view_output intrinsic is processed, since the function always modifies the shader in that case. Closes: https://gitlab.freedesktop.org/panfrost/mesa/-/issues/274 Cc: mesa-stable Signed-off-by: Christian Gmeiner Reviewed-by: Daniel Stone (cherry picked from commit 4938ad435e1b480f6a1b9b81cb8db7de5039ec8d) Part-of: --- .pick_status.json | 2 +- src/panfrost/util/pan_lower_store_component.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index e646517ca83..285507cbd48 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1254,7 +1254,7 @@ "description": "pan/compiler: Fix progress reporting in pan_nir_lower_store_component", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/panfrost/util/pan_lower_store_component.c b/src/panfrost/util/pan_lower_store_component.c index c0f19f86f5e..a5aa3443896 100644 --- a/src/panfrost/util/pan_lower_store_component.c +++ b/src/panfrost/util/pan_lower_store_component.c @@ -90,7 +90,7 @@ lower_store_component(nir_builder *b, nir_intrinsic_instr *intr, void *data) } _mesa_hash_table_u64_insert(slots, slot, intr); - return false; + return true; } bool