Merge pull request #2672 from ids1024/screenshot

Remove `surface` argument of `Compositor::screenshot`

graphics/src/compositor.rs

@@ -90,7 +90,6 @@ pub trait Compositor: Sized {
     fn screenshot<T: AsRef<str>>(
         &mut self,
         renderer: &mut Self::Renderer,
-        surface: &mut Self::Surface,
         viewport: &Viewport,
         background_color: Color,
         overlay: &[T],
@@ -201,7 +200,6 @@ impl Compositor for () {
     fn screenshot<T: AsRef<str>>(
         &mut self,
         _renderer: &mut Self::Renderer,
-        _surface: &mut Self::Surface,
         _viewport: &Viewport,
         _background_color: Color,
         _overlay: &[T],

renderer/src/fallback.rs

@@ -353,34 +353,27 @@ where
     fn screenshot<T: AsRef<str>>(
         &mut self,
         renderer: &mut Self::Renderer,
-        surface: &mut Self::Surface,
         viewport: &graphics::Viewport,
         background_color: Color,
         overlay: &[T],
     ) -> Vec<u8> {
-        match (self, renderer, surface) {
+        match (self, renderer) {
-            (
+            (Self::Primary(compositor), Renderer::Primary(renderer)) => {
-                Self::Primary(compositor),
+                compositor.screenshot(
-                Renderer::Primary(renderer),
-                Surface::Primary(surface),
-            ) => compositor.screenshot(
                     renderer,
-                surface,
                     viewport,
                     background_color,
                     overlay,
-            ),
+                )
-            (
+            }
-                Self::Secondary(compositor),
+            (Self::Secondary(compositor), Renderer::Secondary(renderer)) => {
-                Renderer::Secondary(renderer),
+                compositor.screenshot(
-                Surface::Secondary(surface),
-            ) => compositor.screenshot(
                     renderer,
-                surface,
                     viewport,
                     background_color,
                     overlay,
-            ),
+                )
+            }
             _ => unreachable!(),
         }
     }

tiny_skia/src/window/compositor.rs

@@ -121,12 +121,11 @@ impl crate::graphics::Compositor for Compositor {
     fn screenshot<T: AsRef<str>>(
         &mut self,
         renderer: &mut Self::Renderer,
-        surface: &mut Self::Surface,
         viewport: &Viewport,
         background_color: Color,
         overlay: &[T],
     ) -> Vec<u8> {
-        screenshot(renderer, surface, viewport, background_color, overlay)
+        screenshot(renderer, viewport, background_color, overlay)
     }
 }
 
@@ -212,7 +211,6 @@ pub fn present<T: AsRef<str>>(
 
 pub fn screenshot<T: AsRef<str>>(
     renderer: &mut Renderer,
-    surface: &mut Surface,
     viewport: &Viewport,
     background_color: Color,
     overlay: &[T],
@@ -222,6 +220,9 @@ pub fn screenshot<T: AsRef<str>>(
     let mut offscreen_buffer: Vec<u32> =
         vec![0; size.width as usize * size.height as usize];
 
+    let mut clip_mask = tiny_skia::Mask::new(size.width, size.height)
+        .expect("Create clip mask");
+
     renderer.draw(
         &mut tiny_skia::PixmapMut::from_bytes(
             bytemuck::cast_slice_mut(&mut offscreen_buffer),
@@ -229,7 +230,7 @@ pub fn screenshot<T: AsRef<str>>(
             size.height,
         )
         .expect("Create offscreen pixel map"),
-        &mut surface.clip_mask,
+        &mut clip_mask,
         viewport,
         &[Rectangle::with_size(Size::new(
             size.width as f32,

wgpu/src/window/compositor.rs

@@ -370,7 +370,6 @@ impl graphics::Compositor for Compositor {
     fn screenshot<T: AsRef<str>>(
         &mut self,
         renderer: &mut Self::Renderer,
-        _surface: &mut Self::Surface,
         viewport: &Viewport,
         background_color: Color,
         overlay: &[T],

winit/src/program.rs

@@ -1456,7 +1456,6 @@ fn run_action<P, C>(
                 if let Some(window) = window_manager.get_mut(id) {
                     let bytes = compositor.screenshot(
                         &mut window.renderer,
-                        &mut window.surface,
                         window.state.viewport(),
                         window.state.background_color(),
                         &debug.overlay(),