github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Prevent panic in buffer mapping logic if the buffer is already destroyed.

Browse Source
This commit is contained in:
Nicolas Silva
2023-11-15 12:41:52 +01:00
committed by Teodor Tanasoaia
parent f5665f73bd
commit b47fe3b413
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
wgpu-core/src/device/life.rs
View File

@@ -840,21 +840,22 @@ impl<A: HalApi> LifetimeTracker<A> {
for stored in self.mapped.drain(..) {
let resource_id = stored.value;
let buf = &buffer_guard[resource_id];
// The buffer may have been destroyed since the map request.
if let Ok(buf) = buffer_guard.get(resource_id.0) {
let submit_index = buf.life_guard.life_count();
log::trace!(
"Mapping of {:?} at submission {:?} gets assigned to active {:?}",
resource_id,
submit_index,
self.active.iter().position(|a| a.index == submit_index)
);
let submit_index = buf.life_guard.life_count();
log::trace!(
"Mapping of {:?} at submission {:?} gets assigned to active {:?}",
resource_id,
submit_index,
self.active.iter().position(|a| a.index == submit_index)
);
self.active
.iter_mut()
.find(|a| a.index == submit_index)
.map_or(&mut self.ready_to_map, |a| &mut a.mapped)
.push(resource_id);
self.active
.iter_mut()
.find(|a| a.index == submit_index)
.map_or(&mut self.ready_to_map, |a| &mut a.mapped)
.push(resource_id);
}
}
}
@@ -879,7 +880,13 @@ impl<A: HalApi> LifetimeTracker<A> {
Vec::with_capacity(self.ready_to_map.len());
let mut trackers = trackers.lock();
for buffer_id in self.ready_to_map.drain(..) {
let buffer = &mut buffer_guard[buffer_id];
let buffer = match buffer_guard.get_occupied_or_destroyed_mut(buffer_id.0) {
Ok(buf) => buf,
Err(..) => {
// The buffer may have been destroyed since the map request.
continue;
}
};
if buffer.life_guard.ref_count.is_none() && trackers.buffers.remove_abandoned(buffer_id)
{
buffer.map_state = resource::BufferMapState::Idle;