nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-11-25 08:13:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

pass BufferId to unmap for tracing

Browse Source
This commit is contained in:
teoxoy 2024-06-20 18:41:32 +02:00 committed by Teodor Tanasoaia
parent 1a4f6aca6f
commit eeb57e1cee
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wgpu-core/src/device/global.rs
View File

@ -496,7 +496,10 @@ impl Global {
trace.add(trace::Action::FreeBuffer(buffer_id));
}
let _ = buffer.unmap();
let _ = buffer.unmap(
#[cfg(feature = "trace")]
buffer_id,
);
buffer.destroy()
}
@ -519,7 +522,10 @@ impl Global {
t.add(trace::Action::DestroyBuffer(buffer_id));
}
let _ = buffer.unmap();
let _ = buffer.unmap(
#[cfg(feature = "trace")]
buffer_id,
);
let last_submit_index = buffer.info.submission_index();
@ -2634,7 +2640,10 @@ impl Global {
drop(snatch_guard);
buffer.device.check_is_valid()?;
buffer.unmap()
buffer.unmap(
#[cfg(feature = "trace")]
buffer_id,
)
}
}

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

@ -623,8 +623,14 @@ impl<A: HalApi> Buffer<A> {
}
// Note: This must not be called while holding a lock.
pub(crate) fn unmap(self: &Arc<Self>) -> Result<(), BufferAccessError> {
if let Some((mut operation, status)) = self.unmap_inner()? {
pub(crate) fn unmap(
self: &Arc<Self>,
#[cfg(feature = "trace")] buffer_id: BufferId,
) -> Result<(), BufferAccessError> {
if let Some((mut operation, status)) = self.unmap_inner(
#[cfg(feature = "trace")]
buffer_id,
)? {
if let Some(callback) = operation.callback.take() {
callback.call(status);
}
@ -633,7 +639,10 @@ impl<A: HalApi> Buffer<A> {
Ok(())
}
fn unmap_inner(self: &Arc<Self>) -> Result<Option<BufferMapPendingClosure>, BufferAccessError> {
fn unmap_inner(
self: &Arc<Self>,
#[cfg(feature = "trace")] buffer_id: BufferId,
) -> Result<Option<BufferMapPendingClosure>, BufferAccessError> {
use hal::Device;
let device = &self.device;
@ -652,7 +661,7 @@ impl<A: HalApi> Buffer<A> {
std::slice::from_raw_parts(ptr.as_ptr(), self.size as usize)
});
trace.add(trace::Action::WriteBuffer {
id: self.info.id(),
id: buffer_id,
data,
range: 0..self.size,
queued: true,
@ -716,7 +725,7 @@ impl<A: HalApi> Buffer<A> {
std::slice::from_raw_parts(ptr.as_ptr(), size as usize)
});
trace.add(trace::Action::WriteBuffer {
id: self.info.id(),
id: buffer_id,
data,
range: range.clone(),
queued: false,