Update for Smithay MultiGpu shadow copies

4 files changed, 16 insertions, 21 deletions

diff --git a/src/render_helpers/offscreen.rs b/src/render_helpers/offscreen.rs
index a28c4e9a..69b0be84 100644
--- a/src/render_helpers/offscreen.rs
+++ b/src/render_helpers/offscreen.rs
@@ -188,14 +188,14 @@ impl RenderElement<GlesRenderer> for OffscreenRenderElement {
     }
 }
 
-impl<'render, 'alloc> RenderElement<TtyRenderer<'render, 'alloc>> for OffscreenRenderElement {
+impl<'render> RenderElement<TtyRenderer<'render>> for OffscreenRenderElement {
     fn draw(
         &self,
-        frame: &mut TtyFrame<'_, '_, '_>,
+        frame: &mut TtyFrame<'_, '_>,
         src: Rectangle<f64, Buffer>,
         dst: Rectangle<i32, Physical>,
         damage: &[Rectangle<i32, Physical>],
-    ) -> Result<(), TtyRendererError<'render, 'alloc>> {
+    ) -> Result<(), TtyRendererError<'render>> {
         let gles_frame = frame.as_gles_frame();
         if let Some(texture) = &self.texture {
             RenderElement::<GlesRenderer>::draw(texture, gles_frame, src, dst, damage)?;
@@ -205,10 +205,7 @@ impl<'render, 'alloc> RenderElement<TtyRenderer<'render, 'alloc>> for OffscreenR
         Ok(())
     }
 
-    fn underlying_storage(
-        &self,
-        renderer: &mut TtyRenderer<'render, 'alloc>,
-    ) -> Option<UnderlyingStorage> {
+    fn underlying_storage(&self, renderer: &mut TtyRenderer<'render>) -> Option<UnderlyingStorage> {
         if let Some(texture) = &self.texture {
             texture.underlying_storage(renderer)
         } else {
diff --git a/src/render_helpers/primary_gpu_texture.rs b/src/render_helpers/primary_gpu_texture.rs
index a3835c49..5ec50a6e 100644
--- a/src/render_helpers/primary_gpu_texture.rs
+++ b/src/render_helpers/primary_gpu_texture.rs
@@ -73,16 +73,14 @@ impl RenderElement<GlesRenderer> for PrimaryGpuTextureRenderElement {
     }
 }
 
-impl<'render, 'alloc> RenderElement<TtyRenderer<'render, 'alloc>>
-    for PrimaryGpuTextureRenderElement
-{
+impl<'render> RenderElement<TtyRenderer<'render>> for PrimaryGpuTextureRenderElement {
     fn draw(
         &self,
-        frame: &mut TtyFrame<'_, '_, '_>,
+        frame: &mut TtyFrame<'_, '_>,
         src: Rectangle<f64, Buffer>,
         dst: Rectangle<i32, Physical>,
         damage: &[Rectangle<i32, Physical>],
-    ) -> Result<(), TtyRendererError<'render, 'alloc>> {
+    ) -> Result<(), TtyRendererError<'render>> {
         let gles_frame = frame.as_gles_frame();
         RenderElement::<GlesRenderer>::draw(&self.0, gles_frame, src, dst, damage)?;
         Ok(())
@@ -90,7 +88,7 @@ impl<'render, 'alloc> RenderElement<TtyRenderer<'render, 'alloc>>
 
     fn underlying_storage(
         &self,
-        _renderer: &mut TtyRenderer<'render, 'alloc>,
+        _renderer: &mut TtyRenderer<'render>,
     ) -> Option<UnderlyingStorage> {
         // If scanout for things other than Wayland buffers is implemented, this will need to take
         // the target GPU into account.
diff --git a/src/render_helpers/render_elements.rs b/src/render_helpers/render_elements.rs
index d6423bff..1f100536 100644
--- a/src/render_helpers/render_elements.rs
+++ b/src/render_helpers/render_elements.rs
@@ -90,26 +90,26 @@ macro_rules! niri_render_elements {
             }
         }
 
-        impl<'render, 'alloc> smithay::backend::renderer::element::RenderElement<$crate::backend::tty::TtyRenderer<'render, 'alloc>>
-            for $name<$crate::backend::tty::TtyRenderer<'render, 'alloc>>
+        impl<'render> smithay::backend::renderer::element::RenderElement<$crate::backend::tty::TtyRenderer<'render>>
+            for $name<$crate::backend::tty::TtyRenderer<'render>>
         {
             fn draw(
                 &self,
-                frame: &mut $crate::backend::tty::TtyFrame<'render, 'alloc, '_>,
+                frame: &mut $crate::backend::tty::TtyFrame<'render, '_>,
                 src: smithay::utils::Rectangle<f64, smithay::utils::Buffer>,
                 dst: smithay::utils::Rectangle<i32, smithay::utils::Physical>,
                 damage: &[smithay::utils::Rectangle<i32, smithay::utils::Physical>],
-            ) -> Result<(), $crate::backend::tty::TtyRendererError<'render, 'alloc>> {
+            ) -> Result<(), $crate::backend::tty::TtyRendererError<'render>> {
                 match self {
                     $($name::$variant(elem) => {
-                        smithay::backend::renderer::element::RenderElement::<$crate::backend::tty::TtyRenderer<'render, 'alloc>>::draw(elem, frame, src, dst, damage)
+                        smithay::backend::renderer::element::RenderElement::<$crate::backend::tty::TtyRenderer<'render>>::draw(elem, frame, src, dst, damage)
                     })+
                 }
             }
 
             fn underlying_storage(
                 &self,
-                renderer: &mut $crate::backend::tty::TtyRenderer<'render, 'alloc>,
+                renderer: &mut $crate::backend::tty::TtyRenderer<'render>,
             ) -> Option<smithay::backend::renderer::element::UnderlyingStorage> {
                 match self {
                     $($name::$variant(elem) => elem.underlying_storage(renderer)),+
diff --git a/src/render_helpers/renderer.rs b/src/render_helpers/renderer.rs
index 7f85b66d..5c483182 100644
--- a/src/render_helpers/renderer.rs
+++ b/src/render_helpers/renderer.rs
@@ -46,7 +46,7 @@ impl AsGlesRenderer for GlesRenderer {
     }
 }
 
-impl<'render, 'alloc> AsGlesRenderer for TtyRenderer<'render, 'alloc> {
+impl<'render> AsGlesRenderer for TtyRenderer<'render> {
     fn as_gles_renderer(&mut self) -> &mut GlesRenderer {
         self.as_mut()
     }
@@ -66,7 +66,7 @@ impl<'frame> AsGlesFrame<'frame> for GlesFrame<'frame> {
     }
 }
 
-impl<'render, 'alloc, 'frame> AsGlesFrame<'frame> for TtyFrame<'render, 'alloc, 'frame> {
+impl<'render, 'frame> AsGlesFrame<'frame> for TtyFrame<'render, 'frame> {
     fn as_gles_frame(&mut self) -> &mut GlesFrame<'frame> {
         self.as_mut()
     }