From 4617da2818eb3ecc17b1da9571b7baa15056c026 Mon Sep 17 00:00:00 2001
From: Malte Veerman <malte.veerman@gmail.com>
Date: Sun, 19 Jan 2020 18:06:46 +0100
Subject: Implemented automatic deallocation of texture space for dropped
 allocations

---
 wgpu/src/image/raster.rs | 10 +---------
 wgpu/src/image/vector.rs |  8 +-------
 2 files changed, 2 insertions(+), 16 deletions(-)

(limited to 'wgpu/src/image')

diff --git a/wgpu/src/image/raster.rs b/wgpu/src/image/raster.rs
index 648df0ff..884dd65a 100644
--- a/wgpu/src/image/raster.rs
+++ b/wgpu/src/image/raster.rs
@@ -91,17 +91,9 @@ impl Cache {
         memory
     }
 
-    pub fn trim(&mut self, texture_array: &mut TextureArray) {
+    pub fn trim(&mut self) {
         let hits = &self.hits;
 
-        for (id, mem) in &self.map {
-            if let Memory::Device(allocation) = mem {
-                if !hits.contains(&id) {
-                    texture_array.deallocate(allocation);
-                }
-            }
-        }
-
         self.map.retain(|k, _| hits.contains(k));
         self.hits.clear();
     }
diff --git a/wgpu/src/image/vector.rs b/wgpu/src/image/vector.rs
index a8746566..98588e5c 100644
--- a/wgpu/src/image/vector.rs
+++ b/wgpu/src/image/vector.rs
@@ -130,16 +130,10 @@ impl Cache {
         }
     }
 
-    pub fn trim(&mut self, texture_array: &mut TextureArray) {
+    pub fn trim(&mut self) {
         let svg_hits = &self.svg_hits;
         let rasterized_hits = &self.rasterized_hits;
 
-        for (k, allocation) in &self.rasterized {
-            if !rasterized_hits.contains(k) {
-                texture_array.deallocate(allocation);
-            }
-        }
-
         self.svgs.retain(|k, _| svg_hits.contains(k));
         self.rasterized.retain(|k, _| rasterized_hits.contains(k));
         self.svg_hits.clear();
-- 
cgit