Module: Mesa Branch: staging/22.0 Commit: c4d038e3ac071d59abece3df86a57b8500c106fe URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c4d038e3ac071d59abece3df86a57b8500c106fe
Author: Konstantin Seurer <[email protected]> Date: Wed Apr 20 14:39:14 2022 +0200 radv: Fix lowering ignore_ray_intersection Fixes dEQP-VK.ray_tracing_pipeline.misc.report_intersection_result Fixes: c3d82a9 ("radv: Add pass to lower anyhit shader into an intersection shader.") Signed-off-by: Konstantin Seurer <[email protected]> Reviewed-by: Bas Nieuwenhuizen <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16056> (cherry picked from commit 4080f18163f4ea8cd9a7be7905752f609d6a9b77) --- .pick_status.json | 2 +- src/amd/vulkan/radv_pipeline_rt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 2989b1d91ac..7db4452e16f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -524,7 +524,7 @@ "description": "radv: Fix lowering ignore_ray_intersection", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "because_sha": "c3d82a962217def9b9f7e1f4c5ce0a450b97e9c7" }, { diff --git a/src/amd/vulkan/radv_pipeline_rt.c b/src/amd/vulkan/radv_pipeline_rt.c index 98662e5cd49..4e42734df50 100644 --- a/src/amd/vulkan/radv_pipeline_rt.c +++ b/src/amd/vulkan/radv_pipeline_rt.c @@ -940,7 +940,7 @@ lower_any_hit_for_intersection(nir_shader *any_hit) */ nir_store_deref(b, commit, nir_imm_false(b), 0x1); nir_push_if(b, nir_imm_true(b)); - nir_jump(b, nir_jump_halt); + nir_jump(b, nir_jump_return); nir_pop_if(b, NULL); break;
