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

use StagingBuffer.flush() in Buffer.unmap_inner()

Browse Source 
We should have always unmapped the staging buffer as we are using it on the GPU after this point.
This commit is contained in:
teoxoy 2024-07-11 14:03:04 +02:00 committed by Teodor Tanasoaia
parent 9a7f44bf09
commit 5e2df1406d
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wgpu-core/src/device/queue.rs
View File

@ -256,7 +256,7 @@ impl<A: HalApi> PendingWrites<A> {
self.temp_resources.push(resource);
}
fn consume(&mut self, buffer: StagingBuffer<A>) {
pub fn consume(&mut self, buffer: StagingBuffer<A>) {
self.temp_resources
.push(TempResource::StagingBuffer(buffer));
}

18
wgpu-core/src/resource.rs
View File

@ -669,12 +669,12 @@ impl<A: HalApi> Buffer<A> {
}
let _ = ptr;
if !staging_buffer.is_coherent {
unsafe {
device
.raw()
.flush_mapped_ranges(staging_buffer.raw(), iter::once(0..self.size));
}
let mut pending_writes = device.pending_writes.lock();
let pending_writes = pending_writes.as_mut().unwrap();
if let Err(e) = unsafe { staging_buffer.flush() } {
pending_writes.consume(staging_buffer);
return Err(e.into());
}
self.use_at(device.active_submission_index.load(Ordering::Relaxed) + 1);
@ -691,8 +691,6 @@ impl<A: HalApi> Buffer<A> {
buffer: raw_buf,
usage: hal::BufferUses::empty()..hal::BufferUses::COPY_DST,
};
let mut pending_writes = device.pending_writes.lock();
let pending_writes = pending_writes.as_mut().unwrap();
let encoder = pending_writes.activate();
unsafe {
encoder.transition_buffers(
@ -706,7 +704,7 @@ impl<A: HalApi> Buffer<A> {
);
}
}
pending_writes.consume_temp(queue::TempResource::StagingBuffer(staging_buffer));
pending_writes.consume(staging_buffer);
pending_writes.insert_buffer(self);
}
BufferMapState::Idle => {
@ -866,7 +864,7 @@ pub struct StagingBuffer<A: HalApi> {
raw: ManuallyDrop<A::Buffer>,
device: Arc<Device<A>>,
pub(crate) size: wgt::BufferSize,
pub(crate) is_coherent: bool,
is_coherent: bool,
}
impl<A: HalApi> StagingBuffer<A> {