From 17082304158d194549fa0e89c34d54da08d5c566 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Fri, 1 Aug 2025 08:14:48 -0400 Subject: [PATCH] lvp: replace lower_ray_tracing_stack_base with inline_sysval MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alyssa Rosenzweig Reviewed-by: Marek Olšák Part-of: --- .../lavapipe/lvp_ray_tracing_pipeline.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/src/gallium/frontends/lavapipe/lvp_ray_tracing_pipeline.c b/src/gallium/frontends/lavapipe/lvp_ray_tracing_pipeline.c index 4d7da73f76f..45b0137e440 100644 --- a/src/gallium/frontends/lavapipe/lvp_ray_tracing_pipeline.c +++ b/src/gallium/frontends/lavapipe/lvp_ray_tracing_pipeline.c @@ -1025,19 +1025,6 @@ lvp_lower_ray_tracing_instr(nir_builder *b, nir_instr *instr, void *data) return true; } -static bool -lvp_lower_ray_tracing_stack_base(nir_builder *b, nir_intrinsic_instr *instr, void *data) -{ - if (instr->intrinsic != nir_intrinsic_load_ray_tracing_stack_base_lvp) - return false; - - b->cursor = nir_after_instr(&instr->instr); - - nir_def_replace(&instr->def, nir_imm_int(b, b->shader->scratch_size)); - - return true; -} - static void lvp_compile_ray_tracing_pipeline(struct lvp_pipeline *pipeline, const VkRayTracingPipelineCreateInfoKHR *create_info) @@ -1109,8 +1096,9 @@ lvp_compile_ray_tracing_pipeline(struct lvp_pipeline *pipeline, NIR_PASS(_, b->shader, nir_lower_explicit_io, nir_var_shader_temp, nir_address_format_32bit_offset); - NIR_PASS(_, b->shader, nir_shader_intrinsics_pass, lvp_lower_ray_tracing_stack_base, - nir_metadata_control_flow, NULL); + NIR_PASS(_, b->shader, nir_inline_sysval, + nir_intrinsic_load_ray_tracing_stack_base_lvp, + b->shader->scratch_size); /* We can not support dynamic stack sizes, assume the worst. */ b->shader->scratch_size +=