archive-gh-me/wgpu
1
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2025-12-08 21:26:17 +00:00
Code Issues Projects Releases Wiki Activity

remove device arg from StagingBuffer.flush()

Browse Source
This commit is contained in:
teoxoy 2024-07-11 13:44:45 +02:00 committed by Teodor Tanasoaia
parent 4d285d8b61
commit a8b0f2f6a6
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -340,7 +340,8 @@ pub(crate) fn prepare_staging_buffer<A: HalApi>(
} }
impl<A: HalApi> StagingBuffer<A> { impl<A: HalApi> StagingBuffer<A> {
unsafe fn flush(&self, device: &A::Device) -> Result<(), DeviceError> { unsafe fn flush(&self) -> Result<(), DeviceError> {
let device = self.device.raw();
if !self.is_coherent { if !self.is_coherent {
unsafe { device.flush_mapped_ranges(self.raw(), iter::once(0..self.size.get())) }; unsafe { device.flush_mapped_ranges(self.raw(), iter::once(0..self.size.get())) };
} }
@ -453,7 +454,7 @@ impl Global {
staging_buffer_ptr.as_ptr(), staging_buffer_ptr.as_ptr(),
data_size.get() as usize, data_size.get() as usize,
); );
staging_buffer.flush(device.raw()) staging_buffer.flush()
} { } {
pending_writes.consume(staging_buffer); pending_writes.consume(staging_buffer);
return Err(flush_error.into()); return Err(flush_error.into());
@ -528,7 +529,7 @@ impl Global {
// user. Platform validation requires that the staging buffer always // user. Platform validation requires that the staging buffer always
// be freed, even if an error occurs. All paths from here must call // be freed, even if an error occurs. All paths from here must call
// `device.pending_writes.consume`. // `device.pending_writes.consume`.
if let Err(flush_error) = unsafe { staging_buffer.flush(device.raw()) } { if let Err(flush_error) = unsafe { staging_buffer.flush() } {
pending_writes.consume(staging_buffer); pending_writes.consume(staging_buffer);
return Err(flush_error.into()); return Err(flush_error.into());
} }
@ -859,7 +860,7 @@ impl Global {
} }
} }
if let Err(e) = unsafe { staging_buffer.flush(device.raw()) } { if let Err(e) = unsafe { staging_buffer.flush() } {
pending_writes.consume(staging_buffer); pending_writes.consume(staging_buffer);
return Err(e.into()); return Err(e.into());
} }