From eac0e52cdb80d957341c9fafe95630c3b8c7698c Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Fri, 19 Apr 2024 10:48:52 +0300 Subject: [PATCH] nir/divergence: add missing load_printf_buffer_address Signed-off-by: Lionel Landwerlin Cc: mesa-stable Reviewed-by: Karol Herbst Reviewed-by: Ivan Briano Part-of: (cherry picked from commit 8d336f069e8a354e8fb0b7c69968d0e5d86af460) --- .pick_status.json | 2 +- src/compiler/nir/nir_divergence_analysis.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 01d77af1f57..f6ae23f6778 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1524,7 +1524,7 @@ "description": "nir/divergence: add missing load_printf_buffer_address", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/compiler/nir/nir_divergence_analysis.c b/src/compiler/nir/nir_divergence_analysis.c index 51c20baf0fb..216c092d281 100644 --- a/src/compiler/nir/nir_divergence_analysis.c +++ b/src/compiler/nir/nir_divergence_analysis.c @@ -216,6 +216,7 @@ visit_intrinsic(nir_shader *shader, nir_intrinsic_instr *instr) case nir_intrinsic_load_rasterization_primitive_amd: case nir_intrinsic_load_global_constant_uniform_block_intel: case nir_intrinsic_cmat_length: + case nir_intrinsic_load_printf_buffer_address: is_divergent = false; break;