diff --git a/.pick_status.json b/.pick_status.json index e728ba3fcd8..7b00be0c0ab 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3127,7 +3127,7 @@ "description": "nir/divergence_analysis: add missing desc_set_address_intel", "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 250c21713f5..69e99d1b324 100644 --- a/src/compiler/nir/nir_divergence_analysis.c +++ b/src/compiler/nir/nir_divergence_analysis.c @@ -380,7 +380,8 @@ visit_intrinsic(nir_shader *shader, nir_intrinsic_instr *instr) case nir_intrinsic_image_deref_load_param_intel: case nir_intrinsic_image_load_raw_intel: case nir_intrinsic_get_ubo_size: - case nir_intrinsic_load_ssbo_address: { + case nir_intrinsic_load_ssbo_address: + case nir_intrinsic_load_desc_set_address_intel: { unsigned num_srcs = nir_intrinsic_infos[instr->intrinsic].num_srcs; for (unsigned i = 0; i < num_srcs; i++) { if (instr->src[i].ssa->divergent) {