From d17b36653a004c8124ba9c7c12d6975b9fa3bff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Thu, 9 Oct 2025 20:09:11 +0200 Subject: [PATCH] nir/divergence: don't assume that load_sample_positions_amd is always uniform Sample positions aren't uniform when the sample id is divergent. This was a regression when we started lowering fragment shader barycentrics in NIR. Fixes: 7f444fc72c76 ("nir: add nir_intrinsic_load_sample_positions_amd") Cc: mesa-stable Part-of: (cherry picked from commit fad10b91a6c0707d13f1b6fea882baffaa1ca2ef) --- .pick_status.json | 2 +- src/compiler/nir/nir_divergence_analysis.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index bb242ab57fc..85b118087a8 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -884,7 +884,7 @@ "description": "nir/divergence: don't assume that load_sample_positions_amd is always uniform", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "7f444fc72c7695b60d4743c79ee4dab55d8ebd5c", "notes": null diff --git a/src/compiler/nir/nir_divergence_analysis.c b/src/compiler/nir/nir_divergence_analysis.c index 7d3b3ca9e73..fcf70cdb660 100644 --- a/src/compiler/nir/nir_divergence_analysis.c +++ b/src/compiler/nir/nir_divergence_analysis.c @@ -274,7 +274,6 @@ visit_intrinsic(nir_intrinsic_instr *instr, struct divergence_state *state) case nir_intrinsic_load_ring_es2gs_offset_amd: case nir_intrinsic_load_ring_task_draw_amd: case nir_intrinsic_load_ring_task_payload_amd: - case nir_intrinsic_load_sample_positions_amd: case nir_intrinsic_load_rasterization_samples_amd: case nir_intrinsic_load_ring_gsvs_amd: case nir_intrinsic_load_ring_gs2vs_offset_amd: @@ -719,6 +718,7 @@ visit_intrinsic(nir_intrinsic_instr *instr, struct divergence_state *state) case nir_intrinsic_sparse_residency_code_and: case nir_intrinsic_bvh64_intersect_ray_amd: case nir_intrinsic_bvh8_intersect_ray_amd: + case nir_intrinsic_load_sample_positions_amd: case nir_intrinsic_image_deref_load_param_intel: case nir_intrinsic_image_load_raw_intel: case nir_intrinsic_get_ubo_size: