nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-11-22 14:55:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure to copy all of the buffers into the resource array for dx12. (#5091)

Browse Source 
* Make sure to copy all of the buffers into the resource array for dx12.

Fixes #5088. Even though we're telling DX12 that the maximum frame latency should be our non-padded value, the swap chain may request any of the buffers allocated to it.

* Up the maximum frame latency on the DX12 backend to allow a larger range.
This commit is contained in:
Nick 2024-01-19 12:32:10 -05:00 committed by GitHub
parent d678c7a9cf
commit 101e9a574d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wgpu-hal/src/dx12/mod.rs
View File

@ -660,10 +660,14 @@ impl crate::Surface<Api> for Surface {
let non_srgb_format = auxil::dxgi::conv::map_texture_format_nosrgb(config.format); let non_srgb_format = auxil::dxgi::conv::map_texture_format_nosrgb(config.format);
// The range for `SetMaximumFrameLatency` is 1-16 so the maximum latency requested should be 15 because we add 1.
// https://learn.microsoft.com/en-us/windows/win32/api/dxgi/nf-dxgi-idxgidevice1-setmaximumframelatency
debug_assert!(config.maximum_frame_latency <= 15);
// Nvidia recommends to use 1-2 more buffers than the maximum latency // Nvidia recommends to use 1-2 more buffers than the maximum latency
// https://developer.nvidia.com/blog/advanced-api-performance-swap-chains/ // https://developer.nvidia.com/blog/advanced-api-performance-swap-chains/
// For high latency extra buffers seems excessive, so go with a minimum of 3 and beyond that add 1. // For high latency extra buffers seems excessive, so go with a minimum of 3 and beyond that add 1.
let swap_chain_buffer = (config.maximum_frame_latency + 1).min(3); let swap_chain_buffer = (config.maximum_frame_latency + 1).min(16);
let swap_chain = match self.swap_chain.write().take() { let swap_chain = match self.swap_chain.write().take() {
//Note: this path doesn't properly re-initialize all of the things //Note: this path doesn't properly re-initialize all of the things
@ -805,8 +809,8 @@ impl crate::Surface<Api> for Surface {
unsafe { swap_chain.SetMaximumFrameLatency(config.maximum_frame_latency) }; unsafe { swap_chain.SetMaximumFrameLatency(config.maximum_frame_latency) };
let waitable = unsafe { swap_chain.GetFrameLatencyWaitableObject() }; let waitable = unsafe { swap_chain.GetFrameLatencyWaitableObject() };
let mut resources = Vec::with_capacity(config.maximum_frame_latency as usize); let mut resources = Vec::with_capacity(swap_chain_buffer as usize);
for i in 0..config.maximum_frame_latency { for i in 0..swap_chain_buffer {
let mut resource = d3d12::Resource::null(); let mut resource = d3d12::Resource::null();
unsafe { unsafe {
swap_chain.GetBuffer(i, &d3d12_ty::ID3D12Resource::uuidof(), resource.mut_void()) swap_chain.GetBuffer(i, &d3d12_ty::ID3D12Resource::uuidof(), resource.mut_void())