cargo fmt

anvil/src/drawing.rs

@@ -9,7 +9,10 @@ use smithay::{
         renderer::{Renderer, Texture, Transform},
         SwapBuffersError,
     },
-    reexports::{calloop::LoopHandle, wayland_server::protocol::{wl_buffer,wl_surface}},
+    reexports::{
+        calloop::LoopHandle,
+        wayland_server::protocol::{wl_buffer, wl_surface},
+    },
     utils::Rectangle,
     wayland::{
         compositor::{roles::Role, SubsurfaceRole, TraversalAction},
@@ -54,14 +57,7 @@ where
             (0, 0)
         }
     };
-    draw_surface_tree(
+    draw_surface_tree(renderer, surface, egl_buffer_reader, (x - dx, y - dy), token, log)
-        renderer,
-        surface,
-        egl_buffer_reader,
-        (x - dx, y - dy),
-        token,
-        log,
-    )
 }
 
 fn draw_surface_tree<R, E, T>(
@@ -89,7 +85,10 @@ where
                 if data.texture.is_none() {
                     if let Some(buffer) = data.current_state.buffer.take() {
                         match renderer.import_buffer(&buffer, egl_buffer_reader) {
-                            Ok(m) => data.texture = Some(Box::new(BufferTextures { buffer, texture: m }) as Box<dyn std::any::Any + 'static>),
+                            Ok(m) => {
+                                data.texture = Some(Box::new(BufferTextures { buffer, texture: m })
+                                    as Box<dyn std::any::Any + 'static>)
+                            }
                             // there was an error reading the buffer, release it, we
                             // already logged the error
                             Err(err) => {
@@ -154,9 +153,12 @@ where
                         x += sub_x;
                         y += sub_y;
                     }
-                    if let Err(err) =
+                    if let Err(err) = renderer.render_texture_at(
-                        renderer.render_texture_at(&texture.texture, (x, y), Transform::Normal /* TODO */, 1.0)
+                        &texture.texture,
-                    {
+                        (x, y),
+                        Transform::Normal, /* TODO */
+                        1.0,
+                    ) {
                         result = Err(err.into());
                     }
                 }
@@ -229,14 +231,7 @@ where
             "Trying to display as a dnd icon a surface that does not have the DndIcon role."
         );
     }
-    draw_surface_tree(
+    draw_surface_tree(renderer, surface, egl_buffer_reader, (x, y), token, log)
-        renderer,
-        surface,
-        egl_buffer_reader,
-        (x, y),
-        token,
-        log,
-    )
 }
 
 pub fn schedule_initial_render<R: Renderer + 'static, Data: 'static>(

anvil/src/shell.rs

@@ -4,6 +4,8 @@ use std::{
     sync::{Arc, Mutex},
 };
 
+#[cfg(feature = "egl")]
+use smithay::backend::egl::display::EGLBufferReader;
 use smithay::{
     backend::renderer::buffer_dimensions,
     reexports::{
@@ -33,8 +35,6 @@ use smithay::{
         Serial,
     },
 };
-#[cfg(feature = "egl")]
-use smithay::backend::egl::display::EGLBufferReader;
 
 use crate::window_map::{Kind as SurfaceKind, WindowMap};
 
@@ -310,9 +310,8 @@ pub struct ShellHandles {
 
 pub fn init_shell(
     display: &mut Display,
-    #[cfg(feature = "egl")]
+    #[cfg(feature = "egl")] egl_reader: Rc<RefCell<Option<EGLBufferReader>>>,
-    egl_reader: Rc<RefCell<Option<EGLBufferReader>>>,
+    log: ::slog::Logger,
-    log: ::slog::Logger
 ) -> ShellHandles {
     // TODO: this is awkward...
     let almost_window_map = Rc::new(RefCell::new(None::<Rc<RefCell<MyWindowMap>>>));
@@ -794,8 +793,7 @@ impl SurfaceData {
 fn surface_commit(
     surface: &wl_surface::WlSurface,
     token: CompositorToken<Roles>,
-    #[cfg(feature = "egl")]
+    #[cfg(feature = "egl")] egl_reader: Option<&EGLBufferReader>,
-    egl_reader: Option<&EGLBufferReader>,
     window_map: &RefCell<MyWindowMap>,
 ) {
     #[cfg(feature = "xwayland")]

anvil/src/state.rs

@@ -23,18 +23,18 @@ use smithay::{
     },
 };
 
+#[cfg(feature = "egl")]
+use smithay::backend::egl::display::EGLBufferReader;
 #[cfg(feature = "udev")]
 use smithay::backend::session::{auto::AutoSession, Session};
 #[cfg(feature = "xwayland")]
 use smithay::xwayland::XWayland;
-#[cfg(feature = "egl")]
-use smithay::backend::egl::display::EGLBufferReader;
 
+use crate::shell::init_shell;
 #[cfg(feature = "udev")]
 use crate::udev::MyOutput;
 #[cfg(feature = "xwayland")]
 use crate::xwayland::XWm;
-use crate::shell::init_shell;
 
 pub struct AnvilState {
     pub socket_name: String,

anvil/src/udev.rs

@@ -12,6 +12,8 @@ use std::{
 use image::{ImageBuffer, Rgba};
 use slog::Logger;
 
+#[cfg(feature = "egl")]
+use smithay::backend::{drm::DevPath, egl::display::EGLBufferReader, udev::primary_gpu};
 use smithay::{
     backend::{
         drm::{device_bind, DeviceHandler, DrmDevice, DrmError, DrmRenderSurface},
@@ -56,10 +58,6 @@ use smithay::{
         seat::CursorImageStatus,
     },
 };
-#[cfg(feature = "egl")]
-use smithay::{
-    backend::{drm::DevPath, egl::display::EGLBufferReader, udev::primary_gpu},
-};
 
 use crate::drawing::*;
 use crate::shell::{MyWindowMap, Roles};
@@ -501,7 +499,11 @@ impl<Data: 'static> UdevHandlerImpl<Data> {
             let renderer = Rc::new(DrmRenderer {
                 device_id,
                 #[cfg(feature = "egl")]
-                egl_buffer_reader: if is_primary { self.egl_buffer_reader.borrow().clone() } else { None },
+                egl_buffer_reader: if is_primary {
+                    self.egl_buffer_reader.borrow().clone()
+                } else {
+                    None
+                },
                 compositor_token: self.compositor_token,
                 backends: backends.clone(),
                 window_map: self.window_map.clone(),
@@ -741,8 +743,7 @@ impl DrmRenderer {
     #[allow(clippy::too_many_arguments)]
     fn render_surface(
         surface: &mut RenderSurface,
-        #[cfg(feature = "egl")]
+        #[cfg(feature = "egl")] egl_buffer_reader: Option<&EGLBufferReader>,
-        egl_buffer_reader: Option<&EGLBufferReader>,
         device_id: dev_t,
         crtc: crtc::Handle,
         window_map: &mut MyWindowMap,

examples/raw_drm.rs

@@ -132,8 +132,7 @@ fn main() {
 }
 
 pub struct DrmHandlerImpl {
-    swapchain:
+    swapchain: Swapchain<DrmDevice<FdWrapper>, DumbBuffer<FdWrapper>, framebuffer::Handle>,
-        Swapchain<DrmDevice<FdWrapper>, DumbBuffer<FdWrapper>, framebuffer::Handle>,
     current: Slot<DumbBuffer<FdWrapper>, framebuffer::Handle>,
     surface: Rc<DrmSurface<FdWrapper>>,
 }

src/backend/allocator/gbm.rs

@@ -1,6 +1,9 @@
 //! Module for Buffers created using [libgbm](reexports::gbm)
 
-use super::{dmabuf::{AsDmabuf, Dmabuf}, Allocator, Buffer, Format, Fourcc, Modifier};
+use super::{
+    dmabuf::{AsDmabuf, Dmabuf},
+    Allocator, Buffer, Format, Fourcc, Modifier,
+};
 use gbm::{BufferObject as GbmBuffer, BufferObjectFlags, Device as GbmDevice};
 use std::os::unix::io::AsRawFd;
 

src/backend/allocator/swapchain.rs

@@ -132,10 +132,11 @@ where
     pub fn acquire(&mut self) -> Result<Option<Slot<B, U>>, A::Error> {
         if let Some(free_slot) = self.slots.iter_mut().find(|s| !s.acquired.load(Ordering::SeqCst)) {
             if free_slot.buffer.is_none() {
-                free_slot.buffer = Arc::new(Some(
+                free_slot.buffer = Arc::new(Some(self.allocator.create_buffer(
-                    self.allocator
+                    self.width,
-                        .create_buffer(self.width, self.height, self.format)?
+                    self.height,
-                ));
+                    self.format,
+                )?));
             }
             assert!(free_slot.buffer.is_some());
 

src/backend/drm/render.rs

@@ -10,12 +10,15 @@ use gbm::{BufferObject, BufferObjectFlags, Device as GbmDevice};
 use wayland_server::protocol::{wl_buffer, wl_shm};
 
 use super::{device::DevPath, surface::DrmSurfaceInternal, DrmError, DrmSurface};
-use crate::backend::{
-    allocator::{dmabuf::{AsDmabuf, Dmabuf}, Allocator, Buffer, Format, Fourcc, Modifier, Slot, Swapchain},
-    egl::display::EGLBufferReader,
-};
 use crate::backend::renderer::{Bind, Renderer, Texture, Transform};
 use crate::backend::SwapBuffersError;
+use crate::backend::{
+    allocator::{
+        dmabuf::{AsDmabuf, Dmabuf},
+        Allocator, Buffer, Format, Fourcc, Modifier, Slot, Swapchain,
+    },
+    egl::display::EGLBufferReader,
+};
 
 /// Simplified by limited abstraction to link single [`DrmSurface`]s to renderers.
 ///
@@ -24,12 +27,7 @@ use crate::backend::SwapBuffersError;
 /// In some scenarios it might be enough to use of a drm-surface as the one and only target
 /// of a single renderer. In these cases `DrmRenderSurface` provides a way to quickly
 /// get up and running without manually handling and binding buffers.
-pub struct DrmRenderSurface<
+pub struct DrmRenderSurface<D: AsRawFd + 'static, A: Allocator<B>, R: Bind<Dmabuf>, B: Buffer> {
-    D: AsRawFd + 'static,
-    A: Allocator<B>,
-    R: Bind<Dmabuf>,
-    B: Buffer,
-> {
     _format: Format,
     buffers: Buffers<D, B>,
     current_buffer: Option<(Slot<B, (Dmabuf, BufferObject<FbHandle<D>>)>, Dmabuf)>,
@@ -352,8 +350,14 @@ where
     }
 
     #[cfg(feature = "wayland_frontend")]
-    fn import_buffer(&mut self, buffer: &wl_buffer::WlBuffer, egl: Option<&EGLBufferReader>) -> Result<Self::TextureId, Self::Error> {
+    fn import_buffer(
-        self.renderer.import_buffer(buffer, egl).map_err(Error::RenderError)
+        &mut self,
+        buffer: &wl_buffer::WlBuffer,
+        egl: Option<&EGLBufferReader>,
+    ) -> Result<Self::TextureId, Self::Error> {
+        self.renderer
+            .import_buffer(buffer, egl)
+            .map_err(Error::RenderError)
     }
 
     fn begin(&mut self, width: u32, height: u32, _transform: Transform) -> Result<(), Error<E1, E2, E3>> {
@@ -361,7 +365,11 @@ where
             return Ok(());
         }
 
-        let slot = self.swapchain.acquire().map_err(Error::SwapchainError)?.ok_or(Error::NoFreeSlotsError)?;
+        let slot = self
+            .swapchain
+            .acquire()
+            .map_err(Error::SwapchainError)?
+            .ok_or(Error::NoFreeSlotsError)?;
         let dmabuf = match &*slot.userdata() {
             Some((buf, _)) => buf.clone(),
             None => (*slot).export().map_err(Error::AsDmabufError)?,
@@ -396,10 +404,7 @@ where
         let result = self.renderer.finish();
         if result.is_ok() {
             let (slot, dmabuf) = self.current_buffer.take().unwrap();
-            match self
+            match self.buffers.queue::<E1, E2, E3>(slot, dmabuf) {
-                .buffers
-                .queue::<E1, E2, E3>(slot, dmabuf)
-            {
                 Ok(()) => {}
                 Err(Error::DrmError(drm)) => return Err(drm.into()),
                 Err(Error::GbmError(err)) => return Err(SwapBuffersError::ContextLost(Box::new(err))),
@@ -497,7 +502,15 @@ where
     {
         // yes it does not look like it, but both of these lines should be safe in all cases.
         let slot = self.queued_fb.take().unwrap();
-        let fb = slot.userdata().as_ref().unwrap().1.userdata().unwrap().unwrap().fb;
+        let fb = slot
+            .userdata()
+            .as_ref()
+            .unwrap()
+            .1
+            .userdata()
+            .unwrap()
+            .unwrap()
+            .fb;
 
         let flip = if self.drm.commit_pending() {
             self.drm.commit(fb, true)

src/backend/egl/display.rs

@@ -617,7 +617,10 @@ pub struct EGLBufferReader {
 #[cfg(feature = "use_system_lib")]
 impl EGLBufferReader {
     fn new(display: Arc<EGLDisplayHandle>, wayland: *mut wl_display) -> Self {
-        Self { display, wayland: Some(Arc::new(wayland)) }
+        Self {
+            display,
+            wayland: Some(Arc::new(wayland)),
+        }
     }
 
     /// Try to receive [`EGLImages`] from a given [`WlBuffer`].

src/backend/renderer/gles2/mod.rs

@@ -1,15 +1,15 @@
 //! Implementation of the rendering traits using OpenGL ES 2
 
-use std::{collections::HashSet, os::raw::c_char};
 use std::cell::RefCell;
-use std::fmt;
 use std::ffi::CStr;
+use std::fmt;
 use std::ptr;
 use std::rc::Rc;
 use std::sync::{
-    atomic::{Ordering, AtomicUsize},
+    atomic::{AtomicUsize, Ordering},
-    mpsc::{Sender, Receiver, channel}
+    mpsc::{channel, Receiver, Sender},
 };
+use std::{collections::HashSet, os::raw::c_char};
 
 use cgmath::{prelude::*, Matrix3};
 
@@ -20,7 +20,8 @@ use crate::backend::allocator::{
     Format,
 };
 use crate::backend::egl::{
-    ffi::egl::types::EGLImage, EGLBuffer, EGLContext, EGLSurface, Format as EGLFormat, MakeCurrentError, display::EGLBufferReader,
+    display::EGLBufferReader, ffi::egl::types::EGLImage, EGLBuffer, EGLContext, EGLSurface,
+    Format as EGLFormat, MakeCurrentError,
 };
 use crate::backend::SwapBuffersError;
 
@@ -424,7 +425,11 @@ struct ShmCache {
 
 impl Gles2Renderer {
     #[cfg(feature = "wayland_frontend")]
-    fn import_shm(&mut self, buffer: &wl_buffer::WlBuffer, cache: &mut Option<ShmCache>) -> Result<Gles2Texture, Gles2Error> {
+    fn import_shm(
+        &mut self,
+        buffer: &wl_buffer::WlBuffer,
+        cache: &mut Option<ShmCache>,
+    ) -> Result<Gles2Texture, Gles2Error> {
         use crate::wayland::shm::with_buffer_contents;
 
         with_buffer_contents(&buffer, |slice, data| {
@@ -500,22 +505,34 @@ impl Gles2Renderer {
     }
 
     #[cfg(feature = "wayland_frontend")]
-    fn import_egl(&mut self, buffer: &wl_buffer::WlBuffer, reader: &EGLBufferReader, cache: &mut Option<EglCache>) -> Result<Gles2Texture, Gles2Error> {
+    fn import_egl(
+        &mut self,
+        buffer: &wl_buffer::WlBuffer,
+        reader: &EGLBufferReader,
+        cache: &mut Option<EglCache>,
+    ) -> Result<Gles2Texture, Gles2Error> {
         if !self.extensions.iter().any(|ext| ext == "GL_OES_EGL_image") {
             return Err(Gles2Error::GLExtensionNotSupported(&["GL_OES_EGL_image"]));
         }
 
         self.make_current()?;
-        let egl_buffer = cache.as_mut().and_then(|x| x.buf.take()).map(Ok).unwrap_or_else(|| {
+        let egl_buffer = cache
-            reader.egl_buffer_contents(&buffer)
+            .as_mut()
-        }).map_err(Gles2Error::EGLBufferAccessError)?;
+            .and_then(|x| x.buf.take())
+            .map(Ok)
+            .unwrap_or_else(|| reader.egl_buffer_contents(&buffer))
+            .map_err(Gles2Error::EGLBufferAccessError)?;
 
         // we do not need to re-import external textures
         if egl_buffer.format == EGLFormat::External && cache.is_some() {
             return Ok(cache.as_ref().map(|x| x.texture.clone()).unwrap());
         }
 
-        let tex = self.import_egl_image(egl_buffer.image(0).unwrap(), egl_buffer.format == EGLFormat::External, cache.as_ref().map(|x| x.texture.0.texture))?;
+        let tex = self.import_egl_image(
+            egl_buffer.image(0).unwrap(),
+            egl_buffer.format == EGLFormat::External,
+            cache.as_ref().map(|x| x.texture.0.texture),
+        )?;
         let texture = cache.as_ref().map(|x| x.texture.clone()).unwrap_or_else(|| {
             Gles2Texture(Rc::new(Gles2TextureInternal {
                 texture: tex,
@@ -542,7 +559,12 @@ impl Gles2Renderer {
         Ok(texture)
     }
 
-    fn import_egl_image(&self, image: EGLImage, is_external: bool, tex: Option<u32>) -> Result<u32, Gles2Error> {
+    fn import_egl_image(
+        &self,
+        image: EGLImage,
+        is_external: bool,
+        tex: Option<u32>,
+    ) -> Result<u32, Gles2Error> {
         let tex = tex.unwrap_or_else(|| unsafe {
             let mut tex = 0;
             self.gl.GenTextures(1, &mut tex);
@@ -556,8 +578,7 @@ impl Gles2Renderer {
         unsafe {
             self.gl.BindTexture(target, tex);
 
-            self.gl
+            self.gl.EGLImageTargetTexture2DOES(target, image);
-                .EGLImageTargetTexture2DOES(target, image);
         }
 
         Ok(tex)
@@ -593,7 +614,13 @@ impl Bind<Dmabuf> for Gles2Renderer {
         let buffer = self
             .buffers
             .iter()
-            .find(|buffer| if let Some(dma) = buffer.dmabuf.upgrade() { dma == dmabuf } else { false })
+            .find(|buffer| {
+                if let Some(dma) = buffer.dmabuf.upgrade() {
+                    dma == dmabuf
+                } else {
+                    false
+                }
+            })
             .map(|buf| {
                 let dmabuf = buf
                     .dmabuf
@@ -773,9 +800,12 @@ impl Renderer for Gles2Renderer {
         Ok(texture)
     }
 
-
     #[cfg(feature = "wayland_frontend")]
-    fn import_buffer(&mut self, buffer: &wl_buffer::WlBuffer, egl: Option<&EGLBufferReader>) -> Result<Self::TextureId, Self::Error> {
+    fn import_buffer(
+        &mut self,
+        buffer: &wl_buffer::WlBuffer,
+        egl: Option<&EGLBufferReader>,
+    ) -> Result<Self::TextureId, Self::Error> {
         // init cache if not existing
         let cache_cell = match buffer.as_ref().user_data().get::<Rc<RefCell<BufferCache>>>() {
             Some(cache) => cache.clone(),
@@ -805,7 +835,7 @@ impl Renderer for Gles2Renderer {
                     BufferCacheVariant::Shm(None)
                 } else {
                     unreachable!("Completely unknown buffer format. How did we got here?");
-                }
+                },
             ));
         }
 
@@ -889,7 +919,8 @@ impl Renderer for Gles2Renderer {
                 .TexParameteri(target, ffi::TEXTURE_MIN_FILTER, ffi::LINEAR as i32);
             self.gl.UseProgram(self.programs[tex.0.texture_kind].program);
 
-            self.gl.Uniform1i(self.programs[tex.0.texture_kind].uniform_tex, 0);
+            self.gl
+                .Uniform1i(self.programs[tex.0.texture_kind].uniform_tex, 0);
             self.gl.UniformMatrix3fv(
                 self.programs[tex.0.texture_kind].uniform_matrix,
                 1,

src/backend/renderer/mod.rs

@@ -164,7 +164,6 @@ pub trait Renderer {
         &[wl_shm::Format::Argb8888, wl_shm::Format::Xrgb8888]
     }
 
-
     /// Import a given buffer into the renderer.
     ///
     /// Returns a texture_id, which can be used with `render_texture(_at)` or implementation-specific functions.
@@ -176,7 +175,11 @@ pub trait Renderer {
     /// The implementation defines, if the id keeps being valid, if the buffer is released,
     /// to avoid relying on implementation details, keep the buffer alive, until you destroyed this texture again.
     #[cfg(feature = "wayland_frontend")]
-    fn import_buffer(&mut self, buffer: &wl_buffer::WlBuffer, egl: Option<&EGLBufferReader>) -> Result<Self::TextureId, Self::Error>;
+    fn import_buffer(
+        &mut self,
+        buffer: &wl_buffer::WlBuffer,
+        egl: Option<&EGLBufferReader>,
+    ) -> Result<Self::TextureId, Self::Error>;
 
     /// Initialize a rendering context on the current rendering target with given dimensions and transformation.
     ///
@@ -248,10 +251,18 @@ pub trait Renderer {
 
 /// Returns the dimensions of a wl_buffer
 #[cfg(all(feature = "wayland_frontend", feature = "backend_egl"))]
-pub fn buffer_dimensions(buffer: &wl_buffer::WlBuffer, egl_buffer_reader: Option<&EGLBufferReader>) -> Option<(i32, i32)> {
+pub fn buffer_dimensions(
-    if let Some((w, h)) = egl_buffer_reader.as_ref().and_then(|x| x.egl_buffer_dimensions(&buffer)) {
+    buffer: &wl_buffer::WlBuffer,
+    egl_buffer_reader: Option<&EGLBufferReader>,
+) -> Option<(i32, i32)> {
+    if let Some((w, h)) = egl_buffer_reader
+        .as_ref()
+        .and_then(|x| x.egl_buffer_dimensions(&buffer))
+    {
         Some((w, h))
-    } else if let Ok((w, h)) = crate::wayland::shm::with_buffer_contents(&buffer, |_, data| (data.width, data.height)) {
+    } else if let Ok((w, h)) =
+        crate::wayland::shm::with_buffer_contents(&buffer, |_, data| (data.width, data.height))
+    {
         Some((w, h))
     } else {
         None
@@ -263,7 +274,9 @@ pub fn buffer_dimensions(buffer: &wl_buffer::WlBuffer, egl_buffer_reader: Option
 pub fn buffer_dimensions(buffer: &wl_buffer::WlBuffer) -> Option<(i32, i32)> {
     use crate::backend::allocator::Buffer;
 
-    if let Ok((w, h)) = crate::wayland::shm::with_buffer_contents(&buffer, |_, data| (data.width, data.height)) {
+    if let Ok((w, h)) =
+        crate::wayland::shm::with_buffer_contents(&buffer, |_, data| (data.width, data.height))
+    {
         Some((w, h))
     } else {
         None

src/backend/winit.rs

@@ -291,7 +291,11 @@ impl Renderer for WinitGraphicsBackend {
     }
 
     #[cfg(feature = "wayland_frontend")]
-    fn import_buffer(&mut self, buffer: &wl_buffer::WlBuffer, egl: Option<&EGLBufferReader>) -> Result<Self::TextureId, Self::Error> {
+    fn import_buffer(
+        &mut self,
+        buffer: &wl_buffer::WlBuffer,
+        egl: Option<&EGLBufferReader>,
+    ) -> Result<Self::TextureId, Self::Error> {
         self.renderer.import_buffer(buffer, egl)
     }