From f0e7ff3312fbcec388e7f52e7f8f19c2f6c04d32 Mon Sep 17 00:00:00 2001 From: Victor Brekenfeld Date: Thu, 13 May 2021 19:38:28 +0200 Subject: [PATCH] cleanup + docs --- src/backend/egl/display.rs | 1 - src/backend/egl/mod.rs | 7 ++++++- src/backend/libinput/mod.rs | 1 - src/backend/renderer/mod.rs | 2 ++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/backend/egl/display.rs b/src/backend/egl/display.rs index 1ee8ee6..5fcf076 100644 --- a/src/backend/egl/display.rs +++ b/src/backend/egl/display.rs @@ -1,7 +1,6 @@ //! Type safe native types for safe egl initialisation use std::collections::HashSet; -use std::fmt; use std::ffi::CStr; use std::mem::MaybeUninit; use std::ops::Deref; diff --git a/src/backend/egl/mod.rs b/src/backend/egl/mod.rs index 03014c6..2a68296 100644 --- a/src/backend/egl/mod.rs +++ b/src/backend/egl/mod.rs @@ -211,7 +211,7 @@ pub enum TextureCreationError { /// Texture format types #[repr(i32)] #[allow(non_camel_case_types)] -#[derive(Debug, PartialEq, Eq)] +#[derive(Debug, Clone, PartialEq, Eq)] pub enum Format { /// RGB format RGB = ffi::egl::TEXTURE_RGB as i32, @@ -269,6 +269,11 @@ impl EGLBuffer { Some(self.images[plane]) } } + + /// Returns the underlying images + pub fn into_images(mut self) -> Vec { + self.images.drain(..).collect() + } } #[cfg(feature = "wayland_frontend")] diff --git a/src/backend/libinput/mod.rs b/src/backend/libinput/mod.rs index c783158..090dc84 100644 --- a/src/backend/libinput/mod.rs +++ b/src/backend/libinput/mod.rs @@ -16,7 +16,6 @@ use input::event; use std::path::Path; use std::{ collections::hash_map::HashMap, - fmt, io::Error as IoError, os::unix::io::{AsRawFd, RawFd}, }; diff --git a/src/backend/renderer/mod.rs b/src/backend/renderer/mod.rs index f6d1989..0d872d3 100644 --- a/src/backend/renderer/mod.rs +++ b/src/backend/renderer/mod.rs @@ -246,6 +246,7 @@ 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)> { if let Some((w, h)) = egl_buffer_reader.as_ref().and_then(|x| x.egl_buffer_dimensions(&buffer)) { @@ -257,6 +258,7 @@ pub fn buffer_dimensions(buffer: &wl_buffer::WlBuffer, egl_buffer_reader: Option } } +/// Returns the dimensions of a wl_buffer #[cfg(all(feature = "wayland_frontend", not(feature = "backend_egl")))] pub fn buffer_dimensions(buffer: &wl_buffer::WlBuffer) -> Option<(i32, i32)> { use crate::backend::allocator::Buffer;