summaryrefslogtreecommitdiffstats
path: root/graphics/src/image
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2022-11-05 03:39:59 +0100
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2022-11-05 03:39:59 +0100
commit7a24b4ba69e19459646648634c96d6426eaed462 (patch)
treef11c231cd4f67b047a35411315cdab626c9439cd /graphics/src/image
parent0a23f518c70d27f2e44af38e5d3be2a0ab1a9bc1 (diff)
downloadiced-7a24b4ba69e19459646648634c96d6426eaed462.tar.gz
iced-7a24b4ba69e19459646648634c96d6426eaed462.tar.bz2
iced-7a24b4ba69e19459646648634c96d6426eaed462.zip
Replace `texture_store` and `store` with `storage`
Diffstat (limited to 'graphics/src/image')
-rw-r--r--graphics/src/image/raster.rs10
-rw-r--r--graphics/src/image/vector.rs8
2 files changed, 9 insertions, 9 deletions
diff --git a/graphics/src/image/raster.rs b/graphics/src/image/raster.rs
index bad017a9..da46c30f 100644
--- a/graphics/src/image/raster.rs
+++ b/graphics/src/image/raster.rs
@@ -12,7 +12,7 @@ use std::collections::{HashMap, HashSet};
pub enum Memory<T: Storage> {
/// Image data on host
Host(::image_rs::ImageBuffer<::image_rs::Rgba<u8>, Vec<u8>>),
- /// Texture store entry
+ /// Storage entry
Device(T::Entry),
/// Image not found
NotFound,
@@ -106,14 +106,14 @@ impl<T: Storage> Cache<T> {
&mut self,
handle: &image::Handle,
state: &mut T::State<'_>,
- store: &mut T,
+ storage: &mut T,
) -> Option<&T::Entry> {
let memory = self.load(handle);
if let Memory::Host(image) = memory {
let (width, height) = image.dimensions();
- let entry = store.upload(width, height, image, state)?;
+ let entry = storage.upload(width, height, image, state)?;
*memory = Memory::Device(entry);
}
@@ -126,7 +126,7 @@ impl<T: Storage> Cache<T> {
}
/// Trim cache misses from cache
- pub fn trim(&mut self, store: &mut T, state: &mut T::State<'_>) {
+ pub fn trim(&mut self, storage: &mut T, state: &mut T::State<'_>) {
let hits = &self.hits;
self.map.retain(|k, memory| {
@@ -134,7 +134,7 @@ impl<T: Storage> Cache<T> {
if !retain {
if let Memory::Device(entry) = memory {
- store.remove(entry, state);
+ storage.remove(entry, state);
}
}
diff --git a/graphics/src/image/vector.rs b/graphics/src/image/vector.rs
index 818fdd20..dc271c9e 100644
--- a/graphics/src/image/vector.rs
+++ b/graphics/src/image/vector.rs
@@ -79,7 +79,7 @@ impl<T: Storage> Cache<T> {
[width, height]: [f32; 2],
scale: f32,
state: &mut T::State<'_>,
- texture_store: &mut T,
+ storage: &mut T,
) -> Option<&T::Entry> {
let id = handle.id();
@@ -124,7 +124,7 @@ impl<T: Storage> Cache<T> {
let mut rgba = img.take();
rgba.chunks_exact_mut(4).for_each(|rgba| rgba.swap(0, 2));
- let allocation = texture_store.upload(
+ let allocation = storage.upload(
width,
height,
bytemuck::cast_slice(rgba.as_slice()),
@@ -143,7 +143,7 @@ impl<T: Storage> Cache<T> {
}
/// Load svg and upload raster data
- pub fn trim(&mut self, texture_store: &mut T, state: &mut T::State<'_>) {
+ pub fn trim(&mut self, storage: &mut T, state: &mut T::State<'_>) {
let svg_hits = &self.svg_hits;
let rasterized_hits = &self.rasterized_hits;
@@ -152,7 +152,7 @@ impl<T: Storage> Cache<T> {
let retain = rasterized_hits.contains(k);
if !retain {
- texture_store.remove(entry, state);
+ storage.remove(entry, state);
}
retain