From 3a9a3356d358de356f8fc664e2ae2d7b7ba0de7b Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Fri, 21 Apr 2023 12:28:21 +0300 Subject: [PATCH] nir/divergence: add missing load_global_constant_* intrinsics Signed-off-by: Lionel Landwerlin Cc: mesa-stable Reviewed-by: Emma Anholt Part-of: (cherry picked from commit d6e9479d4b3be15c37acebfc0930d9e06de78d9b) --- .pick_status.json | 2 +- src/compiler/nir/nir_divergence_analysis.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 0de98f1d7f1..de7086d3ab4 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1282,7 +1282,7 @@ "description": "nir/divergence: add missing load_global_constant_* intrinsics", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/compiler/nir/nir_divergence_analysis.c b/src/compiler/nir/nir_divergence_analysis.c index 639432e6771..304b7b86c80 100644 --- a/src/compiler/nir/nir_divergence_analysis.c +++ b/src/compiler/nir/nir_divergence_analysis.c @@ -433,7 +433,9 @@ visit_intrinsic(nir_shader *shader, nir_intrinsic_instr *instr) case nir_intrinsic_image_load_raw_intel: case nir_intrinsic_get_ubo_size: case nir_intrinsic_load_ssbo_address: - case nir_intrinsic_load_desc_set_address_intel: { + case nir_intrinsic_load_desc_set_address_intel: + case nir_intrinsic_load_global_constant_bounded: + case nir_intrinsic_load_global_constant_offset: { unsigned num_srcs = nir_intrinsic_infos[instr->intrinsic].num_srcs; for (unsigned i = 0; i < num_srcs; i++) { if (instr->src[i].ssa->divergent) {