From 895eaef99b52c24e6f3d804897ad850c1f1de960 Mon Sep 17 00:00:00 2001 From: Malte Veerman Date: Thu, 12 Dec 2019 01:14:54 +0100 Subject: Merged svg pipeline into image --- wgpu/src/image.rs | 107 +++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 86 insertions(+), 21 deletions(-) (limited to 'wgpu/src/image.rs') diff --git a/wgpu/src/image.rs b/wgpu/src/image.rs index 7e4e2670..e0e093e0 100644 --- a/wgpu/src/image.rs +++ b/wgpu/src/image.rs @@ -7,6 +7,7 @@ use iced_native::{ use std::{ cell::RefCell, collections::{HashMap, HashSet}, + fmt, mem, rc::Rc, }; @@ -215,19 +216,27 @@ impl Pipeline { if !self.cache.borrow().contains(&handle) { let memory = match handle.data() { Data::Path(path) => { - if let Ok(image) = image::open(path) { - Memory::Host { - image: image.to_bgra(), + 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 { - image: image.to_bgra(), - } + Memory::Host(HostMemory::Image(image.to_bgra())) } else { Memory::Invalid } @@ -246,6 +255,7 @@ impl Pipeline { transformation: Transformation, bounds: Rectangle, target: &wgpu::TextureView, + dpi: f32, ) { let uniforms_buffer = device .create_buffer_mapped(1, wgpu::BufferUsage::COPY_SRC) @@ -273,7 +283,13 @@ impl Pipeline { .borrow_mut() .get(&image.handle) .unwrap() - .upload(device, encoder, &self.texture_layout) + .upload( + device, + encoder, + &self.texture_layout, + (image.scale[0] * dpi) as u32, + (image.scale[1] * dpi) as u32, + ) { let instance_buffer = device .create_buffer_mapped(1, wgpu::BufferUsage::COPY_SRC) @@ -341,11 +357,26 @@ impl Pipeline { } } +enum HostMemory { + Image(image::ImageBuffer, Vec>), + 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 { - image: image::ImageBuffer, Vec>, - }, + Host(HostMemory), Device { bind_group: Rc, width: u32, @@ -358,7 +389,13 @@ enum Memory { impl Memory { fn dimensions(&self) -> (u32, u32) { match self { - Memory::Host { image } => image.dimensions(), + 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), @@ -370,10 +407,15 @@ impl Memory { device: &wgpu::Device, encoder: &mut wgpu::CommandEncoder, texture_layout: &wgpu::BindGroupLayout, + svg_width: u32, + svg_height: u32, ) -> Option> { match self { - Memory::Host { image } => { - let (width, height) = image.dimensions(); + 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, @@ -392,14 +434,37 @@ impl Memory { | wgpu::TextureUsage::SAMPLED, }); - let slice = image.clone().into_raw(); - - let temp_buf = device - .create_buffer_mapped( - slice.len(), - wgpu::BufferUsage::COPY_SRC, - ) - .fill_from_slice(&slice[..]); + 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 { -- cgit From 09707f29fcf7fbd71570a43db214921043427c3f Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sun, 15 Dec 2019 06:19:07 +0100 Subject: Rerasterize SVGs when resized and refactor a bit --- wgpu/src/image.rs | 308 +++++++++--------------------------------------------- 1 file changed, 50 insertions(+), 258 deletions(-) (limited to 'wgpu/src/image.rs') diff --git a/wgpu/src/image.rs b/wgpu/src/image.rs index e0e093e0..01059d2d 100644 --- a/wgpu/src/image.rs +++ b/wgpu/src/image.rs @@ -1,20 +1,15 @@ +mod raster; +mod vector; + use crate::Transformation; -use iced_native::{ - image::{Data, Handle}, - Rectangle, -}; - -use std::{ - cell::RefCell, - collections::{HashMap, HashSet}, - fmt, - mem, - rc::Rc, -}; +use iced_native::{image, svg, Rectangle}; + +use std::{cell::RefCell, mem}; #[derive(Debug)] pub struct Pipeline { - cache: RefCell, + raster_cache: RefCell, + vector_cache: RefCell, 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, 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); - - 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, - ) - { + let uploaded_texture = match &image.handle { + Handle::Raster(handle) => { + let mut cache = self.raster_cache.borrow_mut(); + let memory = cache.load(&handle); + + 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, Vec>), - 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, - 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> { - 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, - hits: HashSet, -} - -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 { -- cgit From 232d4873ba0fb9b87d08c8d70b117e81aa7489b5 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sun, 15 Dec 2019 06:45:20 +0100 Subject: Put `svg` rendering behind a feature gate This reduces binary size when SVG supoprt is not needed. --- wgpu/src/image.rs | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) (limited to 'wgpu/src/image.rs') diff --git a/wgpu/src/image.rs b/wgpu/src/image.rs index 01059d2d..e30f70a7 100644 --- a/wgpu/src/image.rs +++ b/wgpu/src/image.rs @@ -1,4 +1,5 @@ mod raster; +#[cfg(feature = "svg")] mod vector; use crate::Transformation; @@ -9,6 +10,7 @@ use std::{cell::RefCell, mem}; #[derive(Debug)] pub struct Pipeline { raster_cache: RefCell, + #[cfg(feature = "svg")] vector_cache: RefCell, pipeline: wgpu::RenderPipeline, @@ -190,6 +192,7 @@ impl Pipeline { Pipeline { raster_cache: RefCell::new(raster::Cache::new()), + #[cfg(feature = "svg")] vector_cache: RefCell::new(vector::Cache::new()), pipeline, @@ -209,6 +212,7 @@ impl Pipeline { memory.dimensions() } + #[cfg(feature = "svg")] pub fn viewport_dimensions(&self, handle: &svg::Handle) -> (u32, u32) { let mut cache = self.vector_cache.borrow_mut(); @@ -227,7 +231,7 @@ impl Pipeline { transformation: Transformation, bounds: Rectangle, target: &wgpu::TextureView, - scale: f32, + _scale: f32, ) { let uniforms_buffer = device .create_buffer_mapped(1, wgpu::BufferUsage::COPY_SRC) @@ -255,17 +259,23 @@ impl Pipeline { 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, - ) + Handle::Vector(_handle) => { + #[cfg(feature = "svg")] + { + let mut cache = self.vector_cache.borrow_mut(); + + cache.upload( + _handle, + image.scale, + _scale, + device, + encoder, + &self.texture_layout, + ) + } + + #[cfg(not(feature = "svg"))] + None } }; @@ -333,6 +343,8 @@ impl Pipeline { pub fn trim_cache(&mut self) { self.raster_cache.borrow_mut().trim(); + + #[cfg(feature = "svg")] self.vector_cache.borrow_mut().trim(); } } -- cgit From 514ccf8a72d660d77f26e085b545e5104389c138 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sun, 15 Dec 2019 07:03:54 +0100 Subject: Cache `Svg` load result properly This avoids trying to reload the file constantly on every frame. --- wgpu/src/image.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'wgpu/src/image.rs') diff --git a/wgpu/src/image.rs b/wgpu/src/image.rs index e30f70a7..4558ffb0 100644 --- a/wgpu/src/image.rs +++ b/wgpu/src/image.rs @@ -215,12 +215,9 @@ impl Pipeline { #[cfg(feature = "svg")] pub fn viewport_dimensions(&self, handle: &svg::Handle) -> (u32, u32) { let mut cache = self.vector_cache.borrow_mut(); + let svg = cache.load(&handle); - if let Some(svg) = cache.load(&handle) { - svg.viewport_dimensions() - } else { - (1, 1) - } + svg.viewport_dimensions() } pub fn draw( -- cgit