From 3fc57b7d95f2cd1d8c7bef06547c55195d4e032a Mon Sep 17 00:00:00 2001
From: Ian Douglas Scott <idscott@system76.com>
Date: Thu, 21 Nov 2024 16:26:17 -0800
Subject: Remove `surface` argument of `Compositor::screenshot`

This argument was completely ignored by the wgpu renderer, and used only
for the `clip_mask` by the `tiny_skia` renderer. I believe creating a
new clip mask is correct.

This way it's possible to render offscreen without needing a surface.
---
 renderer/src/fallback.rs | 41 +++++++++++++++++------------------------
 1 file changed, 17 insertions(+), 24 deletions(-)

(limited to 'renderer/src/fallback.rs')

diff --git a/renderer/src/fallback.rs b/renderer/src/fallback.rs
index 8cb18bde..52b8317f 100644
--- a/renderer/src/fallback.rs
+++ b/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) {
-            (
-                Self::Primary(compositor),
-                Renderer::Primary(renderer),
-                Surface::Primary(surface),
-            ) => compositor.screenshot(
-                renderer,
-                surface,
-                viewport,
-                background_color,
-                overlay,
-            ),
-            (
-                Self::Secondary(compositor),
-                Renderer::Secondary(renderer),
-                Surface::Secondary(surface),
-            ) => compositor.screenshot(
-                renderer,
-                surface,
-                viewport,
-                background_color,
-                overlay,
-            ),
+        match (self, renderer) {
+            (Self::Primary(compositor), Renderer::Primary(renderer)) => {
+                compositor.screenshot(
+                    renderer,
+                    viewport,
+                    background_color,
+                    overlay,
+                )
+            }
+            (Self::Secondary(compositor), Renderer::Secondary(renderer)) => {
+                compositor.screenshot(
+                    renderer,
+                    viewport,
+                    background_color,
+                    overlay,
+                )
+            }
             _ => unreachable!(),
         }
     }
-- 
cgit