From f6a36190a1c2b723f107c29df3b87e4edd400696 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Mon, 13 Mar 2023 16:59:16 +0100 Subject: [PATCH] radv/rt: Fix any_hit scratch variables. We have to make sure not to change call_data locations as well. Fixes: 481f78ab93e2f2169c53a7c8494b488d45b60def ('radv/rt: place any-hit scratch vars after intersection scratch vars') Part-of: --- src/amd/vulkan/radv_rt_shader.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/amd/vulkan/radv_rt_shader.c b/src/amd/vulkan/radv_rt_shader.c index 0ad3833f30c..9edaa6cac71 100644 --- a/src/amd/vulkan/radv_rt_shader.c +++ b/src/amd/vulkan/radv_rt_shader.c @@ -960,15 +960,25 @@ lower_any_hit_for_intersection(nir_shader *any_hit) nir_instr_remove(&intrin->instr); break; + /* We place all any_hit scratch variables after intersection scratch variables. + * For that reason, we increment the scratch offset by the intersection scratch + * size. For call_data, we have to subtract the offset again. + */ case nir_intrinsic_load_scratch: + b->cursor = nir_before_instr(instr); nir_instr_rewrite_src_ssa(instr, &intrin->src[0], nir_iadd_nuw(b, scratch_offset, intrin->src[0].ssa)); break; - case nir_intrinsic_store_scratch: + b->cursor = nir_before_instr(instr); nir_instr_rewrite_src_ssa(instr, &intrin->src[1], nir_iadd_nuw(b, scratch_offset, intrin->src[1].ssa)); break; + case nir_intrinsic_load_rt_arg_scratch_offset_amd: + b->cursor = nir_after_instr(instr); + nir_ssa_def *arg_offset = nir_isub(b, &intrin->dest.ssa, scratch_offset); + nir_ssa_def_rewrite_uses_after(&intrin->dest.ssa, arg_offset, arg_offset->parent_instr); + break; default: break;