From f0e245e4dc3afba886cead26bc2a6219f7467b5e Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Tue, 26 Feb 2019 11:18:31 -0500 Subject: [PATCH] Cleanup unused framebuffers --- Makefile | 2 +- wgpu-native/src/device.rs | 104 ++++++++++++++++++++++++++------------ wgpu-native/src/hub.rs | 11 +++- 3 files changed, 82 insertions(+), 35 deletions(-) diff --git a/Makefile b/Makefile index 84183036e..a94b8be88 100644 --- a/Makefile +++ b/Makefile @@ -48,7 +48,7 @@ clear: rm wgpu-bindings/wgpu.h lib-native: Cargo.lock wgpu-native/Cargo.toml $(wildcard wgpu-native/**/*.rs) - cargo build --manifest-path wgpu-native/Cargo.toml --features $(FEATURE_NATIVE) + cargo build --manifest-path wgpu-native/Cargo.toml --features "local,$(FEATURE_NATIVE)" lib-rust: Cargo.lock wgpu-rs/Cargo.toml $(wildcard wgpu-rs/**/*.rs) cargo build --manifest-path wgpu-rs/Cargo.toml --features $(FEATURE_RUST) diff --git a/wgpu-native/src/device.rs b/wgpu-native/src/device.rs index d90352b04..066421580 100644 --- a/wgpu-native/src/device.rs +++ b/wgpu-native/src/device.rs @@ -64,7 +64,7 @@ pub(crate) struct RenderPassKey { } impl Eq for RenderPassKey {} -#[derive(Hash, PartialEq)] +#[derive(Clone, Hash, PartialEq)] pub(crate) struct FramebufferKey { pub attachments: AttachmentVec, } @@ -77,16 +77,19 @@ enum ResourceId { TextureView(TextureViewId), } -enum Resource { - Buffer(resource::Buffer), - Texture(resource::Texture), - TextureView(resource::TextureView), +enum NativeResource { + Buffer(B::Buffer), + Image(B::Image), + ImageView(B::ImageView), + Framebuffer(B::Framebuffer), } struct ActiveSubmission { index: SubmissionIndex, fence: B::Fence, - resources: Vec>, + // Note: we keep the associated ID here in order to be able to check + // at any point what resources are used in a submission. + resources: Vec<(Option, NativeResource)>, mapped: Vec, } @@ -101,7 +104,7 @@ struct DestroyedResources { active: Vec>, /// Resources that are neither referenced or used, just pending /// actual deletion. - free: Vec>, + free: Vec>, ready_to_map: Vec, } @@ -119,32 +122,35 @@ impl DestroyedResources { } /// Returns the last submission index that is done. - fn cleanup(&mut self, raw: &B::Device) -> SubmissionIndex { + fn cleanup(&mut self, device: &B::Device) -> SubmissionIndex { let mut last_done = 0; for i in (0..self.active.len()).rev() { if unsafe { - raw.get_fence_status(&self.active[i].fence).unwrap() + device.get_fence_status(&self.active[i].fence).unwrap() } { let a = self.active.swap_remove(i); last_done = last_done.max(a.index); - self.free.extend(a.resources); + self.free.extend(a.resources.into_iter().map(|(_, r)| r)); unsafe { - raw.destroy_fence(a.fence); + device.destroy_fence(a.fence); } } } for resource in self.free.drain(..) { match resource { - Resource::Buffer(buf) => unsafe { - raw.destroy_buffer(buf.raw) + NativeResource::Buffer(raw) => unsafe { + device.destroy_buffer(raw) }, - Resource::Texture(tex) => unsafe { - raw.destroy_image(tex.raw) + NativeResource::Image(raw) => unsafe { + device.destroy_image(raw) }, - Resource::TextureView(view) => unsafe { - raw.destroy_image_view(view.raw) + NativeResource::ImageView(raw) => unsafe { + device.destroy_image_view(raw) + }, + NativeResource::Framebuffer(raw) => unsafe { + device.destroy_framebuffer(raw) }, } } @@ -167,32 +173,30 @@ impl DestroyedResources { if num_refs <= 3 { let resource_id = self.referenced.swap_remove(i).0; assert_eq!(num_refs, 3, "Resource {:?} misses some references", resource_id); - let (submit_index, resource) = match resource_id { + let (life_guard, resource) = match resource_id { ResourceId::Buffer(id) => { trackers.buffers.remove(id); let buf = HUB.buffers.unregister(id); - let si = buf.life_guard.submission_index.load(Ordering::Acquire); - (si, Resource::Buffer(buf)) + (buf.life_guard, NativeResource::Buffer(buf.raw)) } ResourceId::Texture(id) => { trackers.textures.remove(id); let tex = HUB.textures.unregister(id); - let si = tex.life_guard.submission_index.load(Ordering::Acquire); - (si, Resource::Texture(tex)) + (tex.life_guard, NativeResource::Image(tex.raw)) } ResourceId::TextureView(id) => { trackers.views.remove(id); let view = HUB.texture_views.unregister(id); - let si = view.life_guard.submission_index.load(Ordering::Acquire); - (si, Resource::TextureView(view)) + (view.life_guard, NativeResource::ImageView(view.raw)) } }; - match self - .active + + let submit_index = life_guard.submission_index.load(Ordering::Acquire); + match self.active .iter_mut() .find(|a| a.index == submit_index) { - Some(a) => a.resources.push(resource), + Some(a) => a.resources.push((Some(resource_id), resource)), None => self.free.push(resource), } } @@ -209,14 +213,49 @@ impl DestroyedResources { let resource_id = self.mapped.swap_remove(i).value; let buf = &buffer_guard[resource_id]; let submit_index = buf.life_guard.submission_index.load(Ordering::Acquire); - match self - .active + self.active .iter_mut() .find(|a| a.index == submit_index) - { - Some(a) => a.mapped.push(resource_id), - None => self.ready_to_map.push(resource_id), + .map_or(&mut self.ready_to_map, |a| &mut a.mapped) + .push(resource_id); + } + } + } + + fn triage_framebuffers( + &mut self, + framebuffers: &mut FastHashMap::Framebuffer>, + ) { + let texture_view_guard = HUB.texture_views.read(); + let remove_list = framebuffers + .keys() + .filter_map(|key| { + let mut last_submit: SubmissionIndex = 0; + for &at in &key.attachments { + if texture_view_guard.contains(at) { + return None + } + // This attachment is no longer registered. + // Let's see if it's used by any of the active submissions. + let res_id = &Some(ResourceId::TextureView(at)); + for a in &self.active { + if a.resources.iter().any(|&(ref id, _)| id == res_id) { + last_submit = last_submit.max(a.index); + } + } } + Some((key.clone(), last_submit)) + }) + .collect::>(); + + for (ref key, submit_index) in remove_list { + let resource = NativeResource::Framebuffer(framebuffers.remove(key).unwrap()); + match self.active + .iter_mut() + .find(|a| a.index == submit_index) + { + Some(a) => a.resources.push((None, resource)), + None => self.free.push(resource), } } } @@ -1073,6 +1112,7 @@ pub extern "C" fn wgpu_queue_submit( let last_done = { let mut destroyed = device.destroyed.lock(); destroyed.triage_referenced(&mut *trackers); + destroyed.triage_framebuffers(&mut *device.framebuffers.lock()); let last_done = destroyed.cleanup(&device.raw); destroyed.handle_mapping(&device.raw); diff --git a/wgpu-native/src/hub.rs b/wgpu-native/src/hub.rs index 856b6db0b..9e70a49b5 100644 --- a/wgpu-native/src/hub.rs +++ b/wgpu-native/src/hub.rs @@ -100,6 +100,15 @@ impl ops::IndexMut for Storage { } } +impl Storage { + pub fn contains(&self, id: Id) -> bool { + match self.map.get(id.0 as usize) { + Some(&(_, epoch)) if epoch == id.1 => true, + _ => false + } + } +} + pub struct Registry { #[cfg(feature = "local")] identity: Mutex, @@ -136,9 +145,7 @@ impl Registry { let old = self.data.write().map.insert(id.0 as usize, (value, id.1)); assert!(old.is_none()); } -} -impl Registry { #[cfg(feature = "local")] pub fn register_local(&self, value: T) -> Id { let id = self.identity.lock().alloc();