From 35d2ed39b5da8de83e3fc91fdba3b850cd4389ed Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Wed, 2 Sep 2020 15:52:18 -0400 Subject: [PATCH] Flush staging init buffers --- wgpu-core/src/device/mod.rs | 22 ++++++++++++++++++---- wgpu-core/src/resource.rs | 1 + 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/wgpu-core/src/device/mod.rs b/wgpu-core/src/device/mod.rs index bc8aa18e5..d0c8d0f39 100644 --- a/wgpu-core/src/device/mod.rs +++ b/wgpu-core/src/device/mod.rs @@ -1032,13 +1032,13 @@ impl Global { }, gfx_memory::Kind::Linear, )?; - let ptr = stage + let mapped = stage .memory .map(&device.raw, hal::memory::Segment::ALL) - .map_err(resource::BufferAccessError::from)? - .ptr(); + .map_err(resource::BufferAccessError::from)?; buffer.map_state = resource::BufferMapState::Init { - ptr, + ptr: mapped.ptr(), + needs_flush: !mapped.is_coherent(), stage_buffer: stage.raw, stage_memory: stage.memory, }; @@ -3681,6 +3681,7 @@ impl Global { ptr, stage_buffer, stage_memory, + needs_flush, } => { #[cfg(feature = "trace")] match device.trace { @@ -3700,6 +3701,19 @@ impl Global { }; let _ = ptr; + if needs_flush { + let segment = hal::memory::Segment::default(); + unsafe { + device + .raw + .flush_mapped_memory_ranges(iter::once(( + stage_memory.memory(), + segment, + ))) + .unwrap() + }; + } + buffer.life_guard.use_at(device.active_submission_index + 1); let region = hal::command::BufferCopy { src: 0, diff --git a/wgpu-core/src/resource.rs b/wgpu-core/src/resource.rs index 9776d0ec2..322570bab 100644 --- a/wgpu-core/src/resource.rs +++ b/wgpu-core/src/resource.rs @@ -85,6 +85,7 @@ pub(crate) enum BufferMapState { ptr: NonNull, stage_buffer: B::Buffer, stage_memory: MemoryBlock, + needs_flush: bool, }, /// Waiting for GPU to be done before mapping Waiting(BufferPendingMapping),