Rerasterize SVGs when resized and refactor a bit
This commit is contained in:
Héctor Ramón Jiménez
parent
27717bc70c
commit
09707f29fc
8 changed files with 543 additions and 273 deletions
|
|
@ -1,20 +1,15 @@
|
|||
use crate::Transformation;
|
||||
use iced_native::{
|
||||
image::{Data, Handle},
|
||||
Rectangle,
|
||||
};
|
||||
mod raster;
|
||||
mod vector;
|
||||
|
||||
use std::{
|
||||
cell::RefCell,
|
||||
collections::{HashMap, HashSet},
|
||||
fmt,
|
||||
mem,
|
||||
rc::Rc,
|
||||
};
|
||||
use crate::Transformation;
|
||||
use iced_native::{image, svg, Rectangle};
|
||||
|
||||
use std::{cell::RefCell, mem};
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct Pipeline {
|
||||
cache: RefCell<Cache>,
|
||||
raster_cache: RefCell<raster::Cache>,
|
||||
vector_cache: RefCell<vector::Cache>,
|
||||
|
||||
pipeline: wgpu::RenderPipeline,
|
||||
uniforms: wgpu::Buffer,
|
||||
|
|
@ -194,7 +189,8 @@ impl Pipeline {
|
|||
});
|
||||
|
||||
Pipeline {
|
||||
cache: RefCell::new(Cache::new()),
|
||||
raster_cache: RefCell::new(raster::Cache::new()),
|
||||
vector_cache: RefCell::new(vector::Cache::new()),
|
||||
|
||||
pipeline,
|
||||
uniforms: uniforms_buffer,
|
||||
|
|
@ -206,44 +202,20 @@ impl Pipeline {
|
|||
}
|
||||
}
|
||||
|
||||
pub fn dimensions(&self, handle: &Handle) -> (u32, u32) {
|
||||
self.load(handle);
|
||||
pub fn dimensions(&self, handle: &image::Handle) -> (u32, u32) {
|
||||
let mut cache = self.raster_cache.borrow_mut();
|
||||
let memory = cache.load(&handle);
|
||||
|
||||
self.cache.borrow_mut().get(handle).unwrap().dimensions()
|
||||
memory.dimensions()
|
||||
}
|
||||
|
||||
fn load(&self, handle: &Handle) {
|
||||
if !self.cache.borrow().contains(&handle) {
|
||||
let memory = match handle.data() {
|
||||
Data::Path(path) => {
|
||||
if let Some(ext) = path.extension() {
|
||||
if ext == "svg" || ext == "svgz" || ext == "SVG" || ext == "SVGZ" {
|
||||
let opt = resvg::Options::default();
|
||||
match resvg::usvg::Tree::from_file(path, &opt.usvg) {
|
||||
Ok(tree) => Memory::Host(HostMemory::Svg(tree)),
|
||||
Err(_) => Memory::Invalid,
|
||||
}
|
||||
} else if let Ok(image) = image::open(path) {
|
||||
Memory::Host(HostMemory::Image(image.to_bgra()))
|
||||
} else {
|
||||
Memory::NotFound
|
||||
}
|
||||
} else if let Ok(image) = image::open(path) {
|
||||
Memory::Host(HostMemory::Image(image.to_bgra()))
|
||||
} else {
|
||||
Memory::NotFound
|
||||
}
|
||||
}
|
||||
Data::Bytes(bytes) => {
|
||||
if let Ok(image) = image::load_from_memory(&bytes) {
|
||||
Memory::Host(HostMemory::Image(image.to_bgra()))
|
||||
} else {
|
||||
Memory::Invalid
|
||||
}
|
||||
}
|
||||
};
|
||||
pub fn viewport_dimensions(&self, handle: &svg::Handle) -> (u32, u32) {
|
||||
let mut cache = self.vector_cache.borrow_mut();
|
||||
|
||||
let _ = self.cache.borrow_mut().insert(&handle, memory);
|
||||
if let Some(svg) = cache.load(&handle) {
|
||||
svg.viewport_dimensions()
|
||||
} else {
|
||||
(1, 1)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -255,7 +227,7 @@ impl Pipeline {
|
|||
transformation: Transformation,
|
||||
bounds: Rectangle<u32>,
|
||||
target: &wgpu::TextureView,
|
||||
dpi: f32,
|
||||
scale: f32,
|
||||
) {
|
||||
let uniforms_buffer = device
|
||||
.create_buffer_mapped(1, wgpu::BufferUsage::COPY_SRC)
|
||||
|
|
@ -276,21 +248,28 @@ impl Pipeline {
|
|||
//
|
||||
// [1]: https://github.com/nical/guillotiere
|
||||
for image in instances {
|
||||
self.load(&image.handle);
|
||||
let uploaded_texture = match &image.handle {
|
||||
Handle::Raster(handle) => {
|
||||
let mut cache = self.raster_cache.borrow_mut();
|
||||
let memory = cache.load(&handle);
|
||||
|
||||
if let Some(texture) = self
|
||||
.cache
|
||||
.borrow_mut()
|
||||
.get(&image.handle)
|
||||
.unwrap()
|
||||
.upload(
|
||||
device,
|
||||
encoder,
|
||||
&self.texture_layout,
|
||||
(image.scale[0] * dpi) as u32,
|
||||
(image.scale[1] * dpi) as u32,
|
||||
)
|
||||
{
|
||||
memory.upload(device, encoder, &self.texture_layout)
|
||||
}
|
||||
Handle::Vector(handle) => {
|
||||
let mut cache = self.vector_cache.borrow_mut();
|
||||
|
||||
cache.upload(
|
||||
handle,
|
||||
image.scale,
|
||||
scale,
|
||||
device,
|
||||
encoder,
|
||||
&self.texture_layout,
|
||||
)
|
||||
}
|
||||
};
|
||||
|
||||
if let Some(texture) = uploaded_texture {
|
||||
let instance_buffer = device
|
||||
.create_buffer_mapped(1, wgpu::BufferUsage::COPY_SRC)
|
||||
.fill_from_slice(&[Instance {
|
||||
|
|
@ -353,200 +332,8 @@ impl Pipeline {
|
|||
}
|
||||
|
||||
pub fn trim_cache(&mut self) {
|
||||
self.cache.borrow_mut().trim();
|
||||
}
|
||||
}
|
||||
|
||||
enum HostMemory {
|
||||
Image(image::ImageBuffer<image::Bgra<u8>, Vec<u8>>),
|
||||
Svg(resvg::usvg::Tree),
|
||||
}
|
||||
|
||||
impl fmt::Debug for HostMemory {
|
||||
fn fmt(
|
||||
&self,
|
||||
f: &mut fmt::Formatter<'_>,
|
||||
) -> Result<(), fmt::Error> {
|
||||
match self {
|
||||
HostMemory::Image(_) => write!(f, "HostMemory::Image"),
|
||||
HostMemory::Svg(_) => write!(f, "HostMemory::Svg"),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
enum Memory {
|
||||
Host(HostMemory),
|
||||
Device {
|
||||
bind_group: Rc<wgpu::BindGroup>,
|
||||
width: u32,
|
||||
height: u32,
|
||||
},
|
||||
NotFound,
|
||||
Invalid,
|
||||
}
|
||||
|
||||
impl Memory {
|
||||
fn dimensions(&self) -> (u32, u32) {
|
||||
match self {
|
||||
Memory::Host(host_memory) => match host_memory {
|
||||
HostMemory::Image(image) => image.dimensions(),
|
||||
HostMemory::Svg(tree) => {
|
||||
let size = tree.svg_node().size;
|
||||
(size.width() as u32, size.height() as u32)
|
||||
}
|
||||
}
|
||||
Memory::Device { width, height, .. } => (*width, *height),
|
||||
Memory::NotFound => (1, 1),
|
||||
Memory::Invalid => (1, 1),
|
||||
}
|
||||
}
|
||||
|
||||
fn upload(
|
||||
&mut self,
|
||||
device: &wgpu::Device,
|
||||
encoder: &mut wgpu::CommandEncoder,
|
||||
texture_layout: &wgpu::BindGroupLayout,
|
||||
svg_width: u32,
|
||||
svg_height: u32,
|
||||
) -> Option<Rc<wgpu::BindGroup>> {
|
||||
match self {
|
||||
Memory::Host(host_memory) => {
|
||||
let (width, height) = match host_memory {
|
||||
HostMemory::Image(image) => image.dimensions(),
|
||||
HostMemory::Svg(_) => (svg_width, svg_height),
|
||||
};
|
||||
|
||||
let extent = wgpu::Extent3d {
|
||||
width,
|
||||
height,
|
||||
depth: 1,
|
||||
};
|
||||
|
||||
let texture = device.create_texture(&wgpu::TextureDescriptor {
|
||||
size: extent,
|
||||
array_layer_count: 1,
|
||||
mip_level_count: 1,
|
||||
sample_count: 1,
|
||||
dimension: wgpu::TextureDimension::D2,
|
||||
format: wgpu::TextureFormat::Bgra8UnormSrgb,
|
||||
usage: wgpu::TextureUsage::COPY_DST
|
||||
| wgpu::TextureUsage::SAMPLED,
|
||||
});
|
||||
|
||||
let temp_buf = match host_memory {
|
||||
HostMemory::Image(image) => {
|
||||
let flat_samples = image.as_flat_samples();
|
||||
let slice = flat_samples.as_slice();
|
||||
device.create_buffer_mapped(
|
||||
slice.len(),
|
||||
wgpu::BufferUsage::COPY_SRC,
|
||||
)
|
||||
.fill_from_slice(slice)
|
||||
},
|
||||
HostMemory::Svg(tree) => {
|
||||
let mut canvas =
|
||||
resvg::raqote::DrawTarget::new(width as i32, height as i32);
|
||||
let opt = resvg::Options::default();
|
||||
let screen_size =
|
||||
resvg::ScreenSize::new(width, height).unwrap();
|
||||
resvg::backend_raqote::render_to_canvas(
|
||||
tree,
|
||||
&opt,
|
||||
screen_size,
|
||||
&mut canvas,
|
||||
);
|
||||
let slice = canvas.get_data();
|
||||
|
||||
device.create_buffer_mapped(
|
||||
slice.len(),
|
||||
wgpu::BufferUsage::COPY_SRC,
|
||||
)
|
||||
.fill_from_slice(slice)
|
||||
},
|
||||
};
|
||||
|
||||
encoder.copy_buffer_to_texture(
|
||||
wgpu::BufferCopyView {
|
||||
buffer: &temp_buf,
|
||||
offset: 0,
|
||||
row_pitch: 4 * width as u32,
|
||||
image_height: height as u32,
|
||||
},
|
||||
wgpu::TextureCopyView {
|
||||
texture: &texture,
|
||||
array_layer: 0,
|
||||
mip_level: 0,
|
||||
origin: wgpu::Origin3d {
|
||||
x: 0.0,
|
||||
y: 0.0,
|
||||
z: 0.0,
|
||||
},
|
||||
},
|
||||
extent,
|
||||
);
|
||||
|
||||
let bind_group =
|
||||
device.create_bind_group(&wgpu::BindGroupDescriptor {
|
||||
layout: texture_layout,
|
||||
bindings: &[wgpu::Binding {
|
||||
binding: 0,
|
||||
resource: wgpu::BindingResource::TextureView(
|
||||
&texture.create_default_view(),
|
||||
),
|
||||
}],
|
||||
});
|
||||
|
||||
let bind_group = Rc::new(bind_group);
|
||||
|
||||
*self = Memory::Device {
|
||||
bind_group: bind_group.clone(),
|
||||
width,
|
||||
height,
|
||||
};
|
||||
|
||||
Some(bind_group)
|
||||
}
|
||||
Memory::Device { bind_group, .. } => Some(bind_group.clone()),
|
||||
Memory::NotFound => None,
|
||||
Memory::Invalid => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[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();
|
||||
self.raster_cache.borrow_mut().trim();
|
||||
self.vector_cache.borrow_mut().trim();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -556,6 +343,11 @@ pub struct Image {
|
|||
pub scale: [f32; 2],
|
||||
}
|
||||
|
||||
pub enum Handle {
|
||||
Raster(image::Handle),
|
||||
Vector(svg::Handle),
|
||||
}
|
||||
|
||||
#[repr(C)]
|
||||
#[derive(Clone, Copy)]
|
||||
pub struct Vertex {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue