From eb620334d7cfe02423fb7a0da01a0082fef37506 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Sat, 8 Nov 2025 17:08:32 -0500 Subject: [PATCH] nir: Add a couple panfrost sysvals to divergence analysis Fixes: 2af6e4beeb39 ("pan: Don't pretend we support load_{vertex_id_zero_base,first_vertex}") Reviewed-by: Lars-Ivar Hesselberg Simonsen Reviewed-by: Christoph Pillmayer Part-of: (cherry picked from commit 0e9fcb33c33e01d5ec06cad101148c956d27ae3e) --- .pick_status.json | 2 +- src/compiler/nir/nir_divergence_analysis.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 1a9991e83de..0f014fbf64d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -234,7 +234,7 @@ "description": "nir: Add a couple panfrost sysvals to divergence analysis", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "2af6e4beeb394a3f8ac22b890a428b63826fd9a1", "notes": null diff --git a/src/compiler/nir/nir_divergence_analysis.c b/src/compiler/nir/nir_divergence_analysis.c index fcf70cdb660..fad2da69f14 100644 --- a/src/compiler/nir/nir_divergence_analysis.c +++ b/src/compiler/nir/nir_divergence_analysis.c @@ -232,6 +232,7 @@ visit_intrinsic(nir_intrinsic_instr *instr, struct divergence_state *state) case nir_intrinsic_load_subgroup_id_shift_ir3: case nir_intrinsic_load_base_instance: case nir_intrinsic_load_base_vertex: + case nir_intrinsic_load_raw_vertex_offset_pan: case nir_intrinsic_load_first_vertex: case nir_intrinsic_load_draw_id: case nir_intrinsic_load_is_indexed_draw: @@ -816,6 +817,7 @@ visit_intrinsic(nir_intrinsic_instr *instr, struct divergence_state *state) case nir_intrinsic_load_sample_pos_or_center: case nir_intrinsic_load_vertex_id_zero_base: case nir_intrinsic_load_vertex_id: + case nir_intrinsic_load_raw_vertex_id_pan: case nir_intrinsic_load_invocation_id: case nir_intrinsic_load_local_invocation_id: case nir_intrinsic_load_local_invocation_index: