From 2dcd4f916e0ea71f925212c8277498c6f995155b Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Sat, 27 Apr 2024 14:16:12 +0200
Subject: Retain caches in `iced_wgpu` as long as `Rc` values are alive

This allows reusing a `canvas::Cache` at no cost even if it
is not presented every frame.
---
 wgpu/src/triangle.rs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'wgpu/src/triangle.rs')

diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index 8470ea39..53a5502a 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -6,9 +6,9 @@ use crate::graphics::mesh::{self, Mesh};
 use crate::graphics::Antialiasing;
 use crate::Buffer;
 
-use rustc_hash::{FxHashMap, FxHashSet};
+use rustc_hash::FxHashMap;
 use std::collections::hash_map;
-use std::rc::Rc;
+use std::rc::{self, Rc};
 use std::sync::atomic::{self, AtomicU64};
 
 const INITIAL_INDEX_COUNT: usize = 1_000;
@@ -64,12 +64,12 @@ struct Upload {
     layer: Layer,
     transformation: Transformation,
     version: usize,
+    batch: rc::Weak<[Mesh]>,
 }
 
 #[derive(Debug, Default)]
 pub struct Storage {
     uploads: FxHashMap<Id, Upload>,
-    recently_used: FxHashSet<Id>,
 }
 
 impl Storage {
@@ -134,6 +134,7 @@ impl Storage {
                     layer,
                     transformation: new_transformation,
                     version: 0,
+                    batch: Rc::downgrade(&cache.batch),
                 });
 
                 log::info!(
@@ -143,13 +144,11 @@ impl Storage {
                 );
             }
         }
-
-        let _ = self.recently_used.insert(cache.id);
     }
 
     pub fn trim(&mut self) {
-        self.uploads.retain(|id, _| self.recently_used.contains(id));
-        self.recently_used.clear();
+        self.uploads
+            .retain(|_id, upload| upload.batch.strong_count() > 0);
     }
 }
 
-- 
cgit 


From 24501fd73b5ae884367a2d112ff44625058b876b Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 30 Apr 2024 05:13:24 +0200
Subject: Fix `text` and `triangle` uploads being dropped on `canvas` cache
 clears

---
 wgpu/src/triangle.rs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'wgpu/src/triangle.rs')

diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index 53a5502a..ca36de82 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -113,6 +113,7 @@ impl Storage {
                         new_transformation,
                     );
 
+                    upload.batch = Rc::downgrade(&cache.batch);
                     upload.version = cache.version;
                     upload.transformation = new_transformation;
                 }
-- 
cgit 


From c51b85e7ab067f5e7411eccd10a5ae192e6ee0a8 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 30 Apr 2024 21:59:46 +0200
Subject: Invalidate text uploads after atlas trimming

---
 wgpu/src/triangle.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'wgpu/src/triangle.rs')

diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index ca36de82..b0551f55 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -138,7 +138,7 @@ impl Storage {
                     batch: Rc::downgrade(&cache.batch),
                 });
 
-                log::info!(
+                log::debug!(
                     "New mesh upload: {} (total: {})",
                     cache.id.0,
                     self.uploads.len()
-- 
cgit