me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reuse entries in text::Cache in iced_tiny_skia

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-06-28 00:44:23 +02:00
parent 78ad365db2
commit 73dca5e323
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
2 changed files with 72 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

17
wgpu/src/text.rs
View file

@ -348,7 +348,7 @@ fn to_shaping(shaping: Shaping) -> glyphon::Shaping {
struct Cache {
entries: FxHashMap<KeyHash, Entry>,
bound_entries: FxHashMap<KeyHash, KeyHash>,
measurements: FxHashMap<KeyHash, KeyHash>,
recently_used: FxHashSet<KeyHash>,
hasher: HashBuilder,
}
@ -368,7 +368,7 @@ impl Cache {
fn new() -> Self {
Self {
entries: FxHashMap::default(),
bound_entries: FxHashMap::default(),
measurements: FxHashMap::default(),
recently_used: FxHashSet::default(),
hasher: HashBuilder::default(),
}
@ -385,11 +385,14 @@ impl Cache {
) -> (KeyHash, &mut Entry) {
let hash = key.hash(self.hasher.build_hasher());
if let Some(bound_hash) = self.bound_entries.get(&hash) {
if let Some(measured_hash) = self.measurements.get(&hash) {
let _ = self.recently_used.insert(hash);
let _ = self.recently_used.insert(*bound_hash);
let _ = self.recently_used.insert(*measured_hash);
return (*bound_hash, self.entries.get_mut(&bound_hash).unwrap());
return (
*measured_hash,
self.entries.get_mut(&measured_hash).unwrap(),
);
}
if let hash_map::Entry::Vacant(entry) = self.entries.entry(hash) {
@ -416,7 +419,7 @@ impl Cache {
let _ = entry.insert(Entry { buffer, bounds });
if key.bounds != bounds {
let _ = self.bound_entries.insert(
let _ = self.measurements.insert(
Key { bounds, ..key }.hash(self.hasher.build_hasher()),
hash,
);
@ -431,7 +434,7 @@ impl Cache {
fn trim(&mut self) {
self.entries
.retain(|key, _| self.recently_used.contains(key));
self.bound_entries
self.measurements
.retain(|key, _| self.recently_used.contains(key));
self.recently_used.clear();