From 5e9a09b6b7d6b538940c6a2302faf3d324b441c7 Mon Sep 17 00:00:00 2001 From: Konstantin Seurer Date: Mon, 16 Sep 2024 12:48:54 +0200 Subject: [PATCH] lavapipe: Fix report_ray_intersection affecting terminated rays Fixes dEQP-VK.ray_tracing_pipeline.amber.flags-accept-first. Fixes: d99e95e ("lavapipe: Implement VK_KHR_ray_tracing_pipeline") Reviewed-by: Friedrich Vock Part-of: (cherry picked from commit 4824bcdd5dc85eecf0f80dab9dbc09e1a26198ae) --- .pick_status.json | 2 +- src/gallium/frontends/lavapipe/lvp_ray_tracing_pipeline.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index d21a4e46f58..771e6ecce6f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -434,7 +434,7 @@ "description": "lavapipe: Fix report_ray_intersection affecting terminated rays", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "d99e95e033eccfece156e8715a1e33daca10160e", "notes": null diff --git a/src/gallium/frontends/lavapipe/lvp_ray_tracing_pipeline.c b/src/gallium/frontends/lavapipe/lvp_ray_tracing_pipeline.c index c4f563bee01..b6b06b8c755 100644 --- a/src/gallium/frontends/lavapipe/lvp_ray_tracing_pipeline.c +++ b/src/gallium/frontends/lavapipe/lvp_ray_tracing_pipeline.c @@ -502,7 +502,9 @@ lvp_lower_isec_intrinsic(nir_builder *b, nir_intrinsic_instr *instr, void *data) nir_variable *commit = nir_local_variable_create(b->impl, glsl_bool_type(), "commit"); nir_store_var(b, commit, nir_imm_false(b), 0x1); - nir_push_if(b, nir_iand(b, nir_fge(b, t, nir_load_var(b, state->tmin)), nir_fge(b, nir_load_var(b, state->tmax), t))); + nir_def *in_range = nir_iand(b, nir_fge(b, t, nir_load_var(b, state->tmin)), nir_fge(b, nir_load_var(b, state->tmax), t)); + nir_def *terminated = nir_iand(b, nir_load_var(b, state->terminate), nir_load_var(b, state->accept)); + nir_push_if(b, nir_iand(b, in_range, nir_inot(b, terminated))); { nir_store_var(b, state->accept, nir_imm_true(b), 0x1);