Merge branch 'master' into beacon

renderer/src/fallback.rs

@@ -3,7 +3,8 @@ use crate::core::image;
 use crate::core::renderer;
 use crate::core::svg;
 use crate::core::{
-    self, Background, Color, Image, Point, Rectangle, Size, Svg, Transformation,
+    self, Background, Color, Font, Image, Pixels, Point, Rectangle, Size, Svg,
+    Transformation,
 };
 use crate::graphics;
 use crate::graphics::compositor;
@@ -321,6 +322,7 @@ where
         surface: &mut Self::Surface,
         viewport: &graphics::Viewport,
         background_color: Color,
+        on_pre_present: impl FnOnce(),
     ) -> Result<(), compositor::SurfaceError> {
         match (self, renderer, surface) {
             (
@@ -332,6 +334,7 @@ where
                 surface,
                 viewport,
                 background_color,
+                on_pre_present,
             ),
             (
                 Self::Secondary(compositor),
@@ -342,6 +345,7 @@ where
                 surface,
                 viewport,
                 background_color,
+                on_pre_present,
             ),
             _ => unreachable!(),
         }
@@ -600,6 +604,48 @@ mod geometry {
     }
 }
 
+impl<A, B> renderer::Headless for Renderer<A, B>
+where
+    A: renderer::Headless,
+    B: renderer::Headless,
+{
+    async fn new(
+        default_font: Font,
+        default_text_size: Pixels,
+        backend: Option<&str>,
+    ) -> Option<Self> {
+        if let Some(renderer) =
+            A::new(default_font, default_text_size, backend).await
+        {
+            return Some(Self::Primary(renderer));
+        }
+
+        B::new(default_font, default_text_size, backend)
+            .await
+            .map(Self::Secondary)
+    }
+
+    fn name(&self) -> String {
+        delegate!(self, renderer, renderer.name())
+    }
+
+    fn screenshot(
+        &mut self,
+        size: Size<u32>,
+        scale_factor: f32,
+        background_color: Color,
+    ) -> Vec<u8> {
+        match self {
+            crate::fallback::Renderer::Primary(renderer) => {
+                renderer.screenshot(size, scale_factor, background_color)
+            }
+            crate::fallback::Renderer::Secondary(renderer) => {
+                renderer.screenshot(size, scale_factor, background_color)
+            }
+        }
+    }
+}
+
 impl<A, B> compositor::Default for Renderer<A, B>
 where
     A: compositor::Default,

renderer/src/lib.rs

@@ -23,9 +23,6 @@ pub type Compositor = renderer::Compositor;
 
 #[cfg(all(feature = "wgpu", feature = "tiny-skia"))]
 mod renderer {
-    use crate::core::renderer;
-    use crate::core::{Color, Font, Pixels, Size};
-
     pub type Renderer = crate::fallback::Renderer<
         iced_wgpu::Renderer,
         iced_tiny_skia::Renderer,
@@ -35,31 +32,6 @@ mod renderer {
         iced_wgpu::window::Compositor,
         iced_tiny_skia::window::Compositor,
     >;
-
-    impl renderer::Headless for Renderer {
-        fn new(default_font: Font, default_text_size: Pixels) -> Self {
-            Self::Secondary(iced_tiny_skia::Renderer::new(
-                default_font,
-                default_text_size,
-            ))
-        }
-
-        fn screenshot(
-            &mut self,
-            size: Size<u32>,
-            scale_factor: f32,
-            background_color: Color,
-        ) -> Vec<u8> {
-            match self {
-                crate::fallback::Renderer::Primary(_) => unreachable!(
-                    "iced_wgpu does not support headless mode yet!"
-                ),
-                crate::fallback::Renderer::Secondary(renderer) => {
-                    renderer.screenshot(size, scale_factor, background_color)
-                }
-            }
-        }
-    }
 }
 
 #[cfg(all(feature = "wgpu", not(feature = "tiny-skia")))]