diff options
Diffstat (limited to '')
-rw-r--r-- | wgpu/src/renderer.rs | 30 | ||||
-rw-r--r-- | wgpu/src/renderer/widget.rs | 1 | ||||
-rw-r--r-- | wgpu/src/renderer/widget/icon.rs | 15 |
3 files changed, 1 insertions, 45 deletions
diff --git a/wgpu/src/renderer.rs b/wgpu/src/renderer.rs index 3eb8c5ca..d1d4de14 100644 --- a/wgpu/src/renderer.rs +++ b/wgpu/src/renderer.rs @@ -1,4 +1,4 @@ -use crate::{quad, text, Image, Primitive, Quad, Svg, Transformation}; +use crate::{quad, text, Image, Primitive, Quad, Transformation}; use iced_native::{ renderer::{Debugger, Windowed}, Background, Color, Layout, MouseCursor, Point, Rectangle, Vector, Widget, @@ -23,7 +23,6 @@ pub struct Renderer { queue: Queue, quad_pipeline: quad::Pipeline, image_pipeline: crate::image::Pipeline, - svg_pipeline: crate::svg::Pipeline, text_pipeline: text::Pipeline, } @@ -32,7 +31,6 @@ struct Layer<'a> { offset: Vector<u32>, quads: Vec<Quad>, images: Vec<Image>, - svgs: Vec<Svg>, text: Vec<wgpu_glyph::Section<'a>>, } @@ -43,7 +41,6 @@ impl<'a> Layer<'a> { offset, quads: Vec::new(), images: Vec::new(), - svgs: Vec::new(), text: Vec::new(), } } @@ -67,14 +64,12 @@ impl Renderer { let text_pipeline = text::Pipeline::new(&mut device); let quad_pipeline = quad::Pipeline::new(&mut device); let image_pipeline = crate::image::Pipeline::new(&mut device); - let svg_pipeline = crate::svg::Pipeline::new(&mut device); Self { device, queue, quad_pipeline, image_pipeline, - svg_pipeline, text_pipeline, } } @@ -133,7 +128,6 @@ impl Renderer { self.queue.submit(&[encoder.finish()]); self.image_pipeline.trim_cache(); - self.svg_pipeline.trim_cache(); *mouse_cursor } @@ -243,11 +237,6 @@ impl Renderer { scale: [bounds.width, bounds.height], }); } - Primitive::Svg { handle, bounds } => layer.svgs.push(Svg { - handle: handle.clone(), - position: [bounds.x, bounds.y], - scale: [bounds.width, bounds.height], - }), Primitive::Clip { bounds, offset, @@ -353,23 +342,6 @@ impl Renderer { translated_and_scaled, bounds, target, - ); - } - - if layer.svgs.len() > 0 { - let translated = transformation - * Transformation::translate( - -(layer.offset.x as f32), - -(layer.offset.y as f32), - ); - - self.svg_pipeline.draw( - &mut self.device, - encoder, - &layer.svgs, - translated, - bounds, - target, dpi, ); } diff --git a/wgpu/src/renderer/widget.rs b/wgpu/src/renderer/widget.rs index 3e1b8d92..52410bee 100644 --- a/wgpu/src/renderer/widget.rs +++ b/wgpu/src/renderer/widget.rs @@ -1,7 +1,6 @@ mod button; mod checkbox; mod column; -mod icon; mod image; mod radio; mod row; diff --git a/wgpu/src/renderer/widget/icon.rs b/wgpu/src/renderer/widget/icon.rs deleted file mode 100644 index 652e57a3..00000000 --- a/wgpu/src/renderer/widget/icon.rs +++ /dev/null @@ -1,15 +0,0 @@ -use crate::{svg::Handle, Primitive, Renderer}; -use iced_native::{icon, MouseCursor, Rectangle}; -use std::path::Path; - -impl icon::Renderer for Renderer { - fn draw(&mut self, bounds: Rectangle, path: &Path) -> Self::Output { - ( - Primitive::Svg { - handle: Handle::from_path(path), - bounds, - }, - MouseCursor::OutOfBounds, - ) - } -} |