vtimofei
/
smithay
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

egl: Make EGLBufferReader clonable

This commit is contained in:
Victor Brekenfeld 2021-05-13 15:08:27 +02:00
parent 75b2a2d801
commit 0b0067a3fd
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/backend/egl/display.rs
View File

@ -609,26 +609,16 @@ fn get_dmabuf_formats(
/// ///
/// Can be created by using [`EGLGraphicsBackend::bind_wl_display`]. /// Can be created by using [`EGLGraphicsBackend::bind_wl_display`].
#[cfg(feature = "use_system_lib")] #[cfg(feature = "use_system_lib")]
#[derive(Debug, Clone)]
pub struct EGLBufferReader { pub struct EGLBufferReader {
display: Arc<EGLDisplayHandle>, display: Arc<EGLDisplayHandle>,
wayland: *mut wl_display, wayland: Option<Arc<*mut wl_display>>,
}
// Gles2 does not implement debug, so we have to impl Debug manually
#[cfg(feature = "use_system_lib")]
impl fmt::Debug for EGLBufferReader {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_struct("EGLBufferReader")
.field("display", &self.display)
.field("wayland", &self.wayland)
.finish()
}
} }
#[cfg(feature = "use_system_lib")] #[cfg(feature = "use_system_lib")]
impl EGLBufferReader { impl EGLBufferReader {
fn new(display: Arc<EGLDisplayHandle>, wayland: *mut wl_display) -> Self { fn new(display: Arc<EGLDisplayHandle>, wayland: *mut wl_display) -> Self {
Self { display, wayland } Self { display, wayland: Some(Arc::new(wayland)) }
} }
/// Try to receive [`EGLImages`] from a given [`WlBuffer`]. /// Try to receive [`EGLImages`] from a given [`WlBuffer`].
@ -767,10 +757,12 @@ impl EGLBufferReader {
#[cfg(feature = "use_system_lib")] #[cfg(feature = "use_system_lib")]
impl Drop for EGLBufferReader { impl Drop for EGLBufferReader {
fn drop(&mut self) { fn drop(&mut self) {
if !self.wayland.is_null() { if let Ok(wayland) = Arc::try_unwrap(self.wayland.take().unwrap()) {
if !wayland.is_null() {
unsafe { unsafe {
// ignore errors on drop // ignore errors on drop
ffi::egl::UnbindWaylandDisplayWL(**self.display, self.wayland as _); ffi::egl::UnbindWaylandDisplayWL(**self.display, wayland as _);
}
} }
} }
} }