fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 11:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

lavapipe: Fix report_ray_intersection affecting terminated rays

Browse source 
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>
(cherry picked from commit 4824bcdd5d)
This commit is contained in:
Konstantin Seurer 2024-09-16 12:48:54 +02:00 • committed by Eric Engestrom
parent f83427260c
commit 5e9a09b6b7
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

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

4
src/gallium/frontends/lavapipe/lvp_ray_tracing_pipeline.c
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);