edgevoid/armorpaint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

d3d12: multi raytrace fixes

Browse Source
This commit is contained in:
luboslenco
2026-08-13 16:47:59 +02:00
parent 74536feb4d
commit bffa9970cc
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/sources/backends/direct3d12_gpu.c
+9 -3
View File
@@ -1480,6 +1480,8 @@ void _gpu_raytrace_acceleration_structure_destroy_top(gpu_acceleration_structure
} }
void gpu_raytrace_acceleration_structure_build(gpu_acceleration_structure_t *accel, gpu_buffer_t *vb_full, gpu_buffer_t *ib_full) { void gpu_raytrace_acceleration_structure_build(gpu_acceleration_structure_t *accel, gpu_buffer_t *vb_full, gpu_buffer_t *ib_full) {
gpu_execute_and_wait();
bool build_bottom = false; bool build_bottom = false;
for (int i = 0; i < GPU_RAYTRACE_MAX_OBJECTS; ++i) { for (int i = 0; i < GPU_RAYTRACE_MAX_OBJECTS; ++i) {
if (dxr_vb_last[i] != dxr_vb[i]) { if (dxr_vb_last[i] != dxr_vb[i]) {
@@ -1512,8 +1514,6 @@ void gpu_raytrace_acceleration_structure_build(gpu_acceleration_structure_t *acc
create_srv_vb(dxr_vb[0], dxr_vb[0]->count, dxr_vb[0]->stride); create_srv_vb(dxr_vb[0], dxr_vb[0]->count, dxr_vb[0]->stride);
} }
command_list->lpVtbl->Reset(command_list, command_allocator, NULL);
D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_INPUTS top_level_inputs = { D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_INPUTS top_level_inputs = {
.DescsLayout = D3D12_ELEMENTS_LAYOUT_ARRAY, .DescsLayout = D3D12_ELEMENTS_LAYOUT_ARRAY,
.Flags = D3D12_RAYTRACING_ACCELERATION_STRUCTURE_BUILD_FLAG_PREFER_FAST_TRACE, .Flags = D3D12_RAYTRACING_ACCELERATION_STRUCTURE_BUILD_FLAG_PREFER_FAST_TRACE,
@@ -1625,6 +1625,12 @@ void gpu_raytrace_acceleration_structure_build(gpu_acceleration_structure_t *acc
.DestAccelerationStructureData = accel->impl.bottom_level_accel[i]->lpVtbl->GetGPUVirtualAddress(accel->impl.bottom_level_accel[i]), .DestAccelerationStructureData = accel->impl.bottom_level_accel[i]->lpVtbl->GetGPUVirtualAddress(accel->impl.bottom_level_accel[i]),
}; };
dxr_command_list->lpVtbl->BuildRaytracingAccelerationStructure(dxr_command_list, &bottom_level_build_desc, 0, NULL); dxr_command_list->lpVtbl->BuildRaytracingAccelerationStructure(dxr_command_list, &bottom_level_build_desc, 0, NULL);
D3D12_RESOURCE_BARRIER scratch_barrier = {
.Type = D3D12_RESOURCE_BARRIER_TYPE_UAV,
.UAV.pResource = scratch_resource,
};
command_list->lpVtbl->ResourceBarrier(command_list, 1, &scratch_barrier);
} }
} }
@@ -1713,7 +1719,7 @@ void gpu_raytrace_acceleration_structure_build(gpu_acceleration_structure_t *acc
D3D12_RESOURCE_BARRIER barrier = { D3D12_RESOURCE_BARRIER barrier = {
.Type = D3D12_RESOURCE_BARRIER_TYPE_UAV, .Type = D3D12_RESOURCE_BARRIER_TYPE_UAV,
.UAV.pResource = accel->impl.bottom_level_accel[0], .UAV.pResource = NULL,
}; };
command_list->lpVtbl->ResourceBarrier(command_list, 1, &barrier); command_list->lpVtbl->ResourceBarrier(command_list, 1, &barrier);
dxr_command_list->lpVtbl->BuildRaytracingAccelerationStructure(dxr_command_list, &top_level_build_desc, 0, NULL); dxr_command_list->lpVtbl->BuildRaytracingAccelerationStructure(dxr_command_list, &top_level_build_desc, 0, NULL);