From 7485660d1292a4fad7f2718727200bc940d58053 Mon Sep 17 00:00:00 2001 From: Konstantin Seurer Date: Sat, 1 Oct 2022 20:15:03 +0200 Subject: [PATCH] radv: Fix incorrect build info indexing Fixes: 8666b1f ("radv: Build acceleration structures using BVH IR") Reviewed-by: Friedrich Vock Part-of: --- src/amd/vulkan/radv_acceleration_structure.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/amd/vulkan/radv_acceleration_structure.c b/src/amd/vulkan/radv_acceleration_structure.c index 1381649767e..a0cac4e7f1d 100644 --- a/src/amd/vulkan/radv_acceleration_structure.c +++ b/src/amd/vulkan/radv_acceleration_structure.c @@ -682,8 +682,8 @@ convert_leaf_nodes(VkCommandBuffer commandBuffer, uint32_t infoCount, const struct convert_leaf_args args = { .intermediate_bvh = pInfos[i].scratchData.deviceAddress + bvh_states[i].scratch.ir_offset, .output_bvh = accel_struct->va, - .geometry_type = pInfos->pGeometries ? pInfos->pGeometries[0].geometryType - : pInfos->ppGeometries[0]->geometryType, + .geometry_type = pInfos[i].pGeometries ? pInfos[i].pGeometries[0].geometryType + : pInfos[i].ppGeometries[0]->geometryType, }; radv_CmdPushConstants(commandBuffer, cmd_buffer->device->meta_state.accel_struct_build.convert_leaf_p_layout, @@ -712,8 +712,8 @@ convert_internal_nodes(VkCommandBuffer commandBuffer, uint32_t infoCount, * because it will be multiplied with 0. */ if (pInfos[i].geometryCount) - geometry_type = pInfos->pGeometries ? pInfos->pGeometries[0].geometryType - : pInfos->ppGeometries[0]->geometryType; + geometry_type = pInfos[i].pGeometries ? pInfos[i].pGeometries[0].geometryType + : pInfos[i].ppGeometries[0]->geometryType; const struct convert_internal_args args = { .intermediate_bvh = pInfos[i].scratchData.deviceAddress + bvh_states[i].scratch.ir_offset,