fix: svg

examples/todos/Cargo.toml

@@ -10,7 +10,15 @@ iced.workspace = true
 iced_core.workspace = true
 # iced.features = ["async-std", "debug", "winit", "a11y", "tiny-skia"]
 # TODO(POP): Fix a11y not working with new winit
-iced.features = ["tokio", "debug", "winit", "tiny-skia", "wgpu"]
+iced.features = [
+    "tokio",
+    "debug",
+    "winit",
+    "tiny-skia",
+    "wgpu",
+    "svg",
+    "web-colors",
+]
 
 once_cell.workspace = true
 serde = { version = "1.0", features = ["derive"] }

wgpu/src/image/mod.rs

@@ -153,6 +153,7 @@ impl Pipeline {
                             8 => Uint32,
                         ),
                     }],
+                    compilation_options: Default::default(),
                 },
                 fragment: Some(wgpu::FragmentState {
                     module: &shader,
@@ -173,6 +174,7 @@ impl Pipeline {
                         }),
                         write_mask: wgpu::ColorWrites::ALL,
                     })],
+                    compilation_options: Default::default(),
                 }),
                 primitive: wgpu::PrimitiveState {
                     topology: wgpu::PrimitiveTopology::TriangleList,
@@ -246,22 +248,22 @@ impl Pipeline {
                 Image::Raster { .. } => {}
 
                 #[cfg(feature = "svg")]
-                Image::Vector(svg, bounds) => {
+                Image::Vector { handle, bounds } => {
                     let size = [bounds.width, bounds.height];
 
                     if let Some(atlas_entry) = cache.upload_vector(
                         device,
                         encoder,
-                        &svg.handle,
-                        svg.color,
+                        &handle.handle,
+                        handle.color,
                         size,
                         scale,
                     ) {
                         add_instances(
                             [bounds.x, bounds.y],
                             size,
-                            f32::from(svg.rotation),
-                            svg.opacity,
+                            f32::from(handle.rotation),
+                            handle.opacity,
                             true,
                             atlas_entry,
                             nearest_instances,

wgpu/src/lib.rs

@@ -546,17 +546,9 @@ impl core::svg::Renderer for Renderer {
         self.image_cache.borrow_mut().measure_svg(handle)
     }
 
-    fn draw_svg(
-        &mut self,
-        handle: core::svg::Handle,
-        color_filter: Option<Color>,
-        bounds: Rectangle,
-        rotation: core::Radians,
-        opacity: f32,
-        border_radius: [f32; 4],
-    ) {
+    fn draw_svg(&mut self, handle: core::svg::Svg, bounds: Rectangle) {
         let (layer, transformation) = self.layers.current_mut();
-        layer.draw_svg(handle, color_filter, bounds);
+        layer.draw_svg(handle, bounds, transformation);
     }
 }