fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-31 17:50:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert "lavapipe: Do not return in report_ray_intersection"

Browse source 
This reverts commit 466bbaf40f.

Acked-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31405>
This commit is contained in:
Konstantin Seurer 2024-09-26 19:34:54 +02:00 • committed by Marge Bot
parent 1c119b1d95
commit 4cb8ecd47c
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gallium/frontends/lavapipe/ci/lvp-fails.txt
View file

@ -694,6 +694,3 @@ dEQP-VK.dynamic_rendering.primary_cmd_buff.suballocation.formats.r32g32_uint.inp
dEQP-VK.glsl.texture_functions.query.texturequerylod.isampler1d_fragment,Fail
dEQP-VK.glsl.texture_functions.query.texturequerylod.sampler1d_float_fragment,Fail
dEQP-VK.glsl.texture_functions.query.texturequerylod.usampler1d_fragment,Fail
# Regression from a commit in 878ae970...e0efab52
dEQP-VK.ray_tracing_pipeline.misc.OpTerminateRayKHR_IntersectionDynamically,Fail

4
src/gallium/frontends/lavapipe/lvp_ray_tracing_pipeline.c
View file

@ -523,6 +523,10 @@ lvp_lower_isec_intrinsic(nir_builder *b, nir_intrinsic_instr *instr, void *data)
nir_def *terminate = nir_load_var(b, state->terminate);
nir_store_var(b, state->terminate, nir_ior(b, terminate, prev_terminate), 0x1);
nir_push_if(b, terminate);
nir_jump(b, nir_jump_return);
nir_pop_if(b, NULL);
}
nir_push_if(b, nir_load_var(b, state->accept));