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 <friedrich.vock@gmx.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31186>
This commit is contained in:
Konstantin Seurer 2024-09-16 12:48:54 +02:00 committed by Marge Bot
parent bf41cf2eef
commit 4824bcdd5d

View file

@ -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);