From 04bc00cf2c6846106f27c235b4c803549cbc36e9 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Wed, 18 Jan 2023 10:37:45 +0200 Subject: [PATCH] nir/divergence: add missing RT intrinsinc handling Signed-off-by: Lionel Landwerlin Cc: mesa-stable Reviewed-by: Konstantin Seurer Part-of: (cherry picked from commit b82d9b1a3d0f74fc73acc5ae77a6f51ce9ed8fc1) --- .pick_status.json | 2 +- src/compiler/nir/nir_divergence_analysis.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 410e7d8f4cc..a4c9183dfc5 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3325,7 +3325,7 @@ "description": "nir/divergence: add missing RT intrinsinc handling", "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 a5142222e8c..0bee0d76d3c 100644 --- a/src/compiler/nir/nir_divergence_analysis.c +++ b/src/compiler/nir/nir_divergence_analysis.c @@ -670,6 +670,9 @@ visit_intrinsic(nir_shader *shader, nir_intrinsic_instr *instr) case nir_intrinsic_load_ray_hit_kind: case nir_intrinsic_load_ray_flags: case nir_intrinsic_load_cull_mask: + case nir_intrinsic_report_ray_intersection: + case nir_intrinsic_rq_proceed: + case nir_intrinsic_rq_load: is_divergent = true; break;