Implement basic image cache trimming in iced_wgpu

2 files changed, 53 insertions, 7 deletions

diff --git a/wgpu/src/image.rs b/wgpu/src/image.rs
index 479eb841..4e814468 100644
--- a/wgpu/src/image.rs
+++ b/wgpu/src/image.rs
@@ -4,11 +4,16 @@ use iced_native::{
     Rectangle,
 };
 
-use std::{cell::RefCell, collections::HashMap, mem, rc::Rc};
+use std::{
+    cell::RefCell,
+    collections::{HashMap, HashSet},
+    mem,
+    rc::Rc,
+};
 
 #[derive(Debug)]
 pub struct Pipeline {
-    cache: RefCell<HashMap<u64, Memory>>,
+    cache: RefCell<Cache>,
 
     pipeline: wgpu::RenderPipeline,
     uniforms: wgpu::Buffer,
@@ -188,7 +193,7 @@ impl Pipeline {
         });
 
         Pipeline {
-            cache: RefCell::new(HashMap::new()),
+            cache: RefCell::new(Cache::new()),
 
             pipeline,
             uniforms: uniforms_buffer,
@@ -203,11 +208,11 @@ impl Pipeline {
     pub fn dimensions(&self, handle: &Handle) -> (u32, u32) {
         self.load(handle);
 
-        self.cache.borrow().get(&handle.id()).unwrap().dimensions()
+        self.cache.borrow_mut().get(handle).unwrap().dimensions()
     }
 
     fn load(&self, handle: &Handle) {
-        if !self.cache.borrow().contains_key(&handle.id()) {
+        if !self.cache.borrow().contains(&handle) {
             let memory = match handle.data() {
                 Data::Path(path) => {
                     if let Ok(image) = image::open(path) {
@@ -229,7 +234,7 @@ impl Pipeline {
                 }
             };
 
-            let _ = self.cache.borrow_mut().insert(handle.id(), memory);
+            let _ = self.cache.borrow_mut().insert(&handle, memory);
         }
     }
 
@@ -266,7 +271,7 @@ impl Pipeline {
             if let Some(texture) = self
                 .cache
                 .borrow_mut()
-                .get_mut(&image.handle.id())
+                .get(&image.handle)
                 .unwrap()
                 .upload(device, encoder, &self.texture_layout)
             {
@@ -330,6 +335,10 @@ impl Pipeline {
             }
         }
     }
+
+    pub fn trim_cache(&mut self) {
+        self.cache.borrow_mut().trim();
+    }
 }
 
 #[derive(Debug)]
@@ -440,6 +449,42 @@ impl Memory {
     }
 }
 
+#[derive(Debug)]
+struct Cache {
+    map: HashMap<u64, Memory>,
+    hits: HashSet<u64>,
+}
+
+impl Cache {
+    fn new() -> Self {
+        Self {
+            map: HashMap::new(),
+            hits: HashSet::new(),
+        }
+    }
+
+    fn contains(&self, handle: &Handle) -> bool {
+        self.map.contains_key(&handle.id())
+    }
+
+    fn get(&mut self, handle: &Handle) -> Option<&mut Memory> {
+        let _ = self.hits.insert(handle.id());
+
+        self.map.get_mut(&handle.id())
+    }
+
+    fn insert(&mut self, handle: &Handle, memory: Memory) {
+        let _ = self.map.insert(handle.id(), memory);
+    }
+
+    fn trim(&mut self) {
+        let hits = &self.hits;
+
+        self.map.retain(|k, _| hits.contains(k));
+        self.hits.clear();
+    }
+}
+
 pub struct Image {
     pub handle: Handle,
     pub position: [f32; 2],
diff --git a/wgpu/src/renderer.rs b/wgpu/src/renderer.rs
index ad081383..8f0f7432 100644
--- a/wgpu/src/renderer.rs
+++ b/wgpu/src/renderer.rs
@@ -127,6 +127,7 @@ impl Renderer {
         }
 
         self.queue.submit(&[encoder.finish()]);
+        self.image_pipeline.trim_cache();
 
         *mouse_cursor
     }