Module: Mesa Branch: staging/22.3 Commit: e818a3ce718f90425d0f015ed2b0f448ca60803e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e818a3ce718f90425d0f015ed2b0f448ca60803e
Author: Lionel Landwerlin <[email protected]> Date: Wed Jan 18 10:37:45 2023 +0200 nir/divergence: add missing RT intrinsinc handling Signed-off-by: Lionel Landwerlin <[email protected]> Cc: mesa-stable Reviewed-by: Konstantin Seurer <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20763> (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 0b29ce4332c..785e71eb85c 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -409,7 +409,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;
