izzy/xenia-edge
0
0
Fork 0
mirror of https://github.com/izzy2lost/xenia-edge.git synced 2026-07-06 00:20:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

[D3D12] Fix bindful shared-memory descriptor layout

Browse Source 
view_count_full_update was sized for one of the two descriptor groups
UpdateBindings_BindfulPath writes, letting the overflow clobber later
draws. Also null the live UAV in the SRV-first group to match master.

Original issue inherited from canary due to master merge (26415cb8b1)
that took master's two-block layout but not its reservation and null-UAV
fixes (4add1f67b).
This commit is contained in:
Herman S.
2026-04-14 18:06:32 +09:00
parent 5c2eeb9162
commit 1e27f0b83b
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/xenia/gpu/d3d12/d3d12_command_processor.cc
+9 -5
View File
@@ -5576,12 +5576,14 @@ bool D3D12CommandProcessor::UpdateBindings_BindfulPath(
if (write_textures_pixel) {
view_count_partial_update += texture_count_pixel;
}
// All the constants + shared memory SRV and UAV + textures.
// Shared memory SRV and null UAV + null SRV and shared memory UAV +
// textures.
size_t view_count_full_update =
2 + texture_count_vertex + texture_count_pixel;
4 + texture_count_vertex + texture_count_pixel;
if (edram_rov_used) {
// + EDRAM UAV and the ZPD counter UAV.
view_count_full_update += 2;
// + EDRAM UAV and ZPD counter UAV in two tables (with the shared memory
// SRV and with the shared memory UAV).
view_count_full_update += 4;
}
D3D12_CPU_DESCRIPTOR_HANDLE view_cpu_handle;
D3D12_GPU_DESCRIPTOR_HANDLE view_gpu_handle;
@@ -5626,11 +5628,13 @@ bool D3D12CommandProcessor::UpdateBindings_BindfulPath(
bindful_textures_written_pixel_ = false;
// If updating fully, write the shared memory SRV and UAV descriptors and,
// if needed, the EDRAM and ZPD counter descriptors.
// SRV + null UAV + EDRAM + ZPD counter.
gpu_handle_shared_memory_srv_and_edram_ = view_gpu_handle;
shared_memory_->WriteRawSRVDescriptor(view_cpu_handle);
view_cpu_handle.ptr += descriptor_size_view;
view_gpu_handle.ptr += descriptor_size_view;
shared_memory_->WriteRawUAVDescriptor(view_cpu_handle);
ui::d3d12::util::CreateBufferRawUAV(provider.GetDevice(), view_cpu_handle,
nullptr, 0);
view_cpu_handle.ptr += descriptor_size_view;
view_gpu_handle.ptr += descriptor_size_view;
if (edram_rov_used) {