diff --git a/src/wayland/core/buffer.rs b/src/wayland/core/buffer.rs index 5d1fe01..1521434 100644 --- a/src/wayland/core/buffer.rs +++ b/src/wayland/core/buffer.rs @@ -59,12 +59,11 @@ impl Buffer { &self, dmatexes: &ImportedDmatexs, images: &mut Assets, - buffer: Arc, ) -> Option> { tracing::debug!("Updating texture for buffer {:?}", self.id); match &self.backing { BufferBacking::Shm(backing) => backing.update_tex(images), - BufferBacking::Dmabuf(backing) => backing.update_tex(dmatexes, images, buffer), + BufferBacking::Dmabuf(backing) => backing.update_tex(dmatexes, images), } } diff --git a/src/wayland/core/surface.rs b/src/wayland/core/surface.rs index 93f7d5d..0f94552 100644 --- a/src/wayland/core/surface.rs +++ b/src/wayland/core/surface.rs @@ -141,7 +141,7 @@ impl Surface { }) }); - if let Some(new_tex) = buffer.update_tex(dmatexes, images, buffer.clone()) { + if let Some(new_tex) = buffer.update_tex(dmatexes, images) { buffer.rendered.store(true, Ordering::Relaxed); let material = materials.get_mut(material).unwrap(); material.base_color_texture.replace(new_tex); diff --git a/src/wayland/dmabuf/buffer_backing.rs b/src/wayland/dmabuf/buffer_backing.rs index ed6c5ef..5551319 100644 --- a/src/wayland/dmabuf/buffer_backing.rs +++ b/src/wayland/dmabuf/buffer_backing.rs @@ -1,5 +1,5 @@ use super::buffer_params::BufferParams; -use crate::wayland::{MessageSink, RENDER_DEVICE, core::buffer::Buffer}; +use crate::wayland::{MessageSink, RENDER_DEVICE}; use bevy::{ asset::{Assets, Handle}, image::Image, @@ -12,9 +12,7 @@ use drm_fourcc::DrmFourcc; use mint::Vector2; use parking_lot::Mutex; use std::sync::{Arc, OnceLock}; -use waynest::server::{ - Client, protocol::stable::linux_dmabuf_v1::zwp_linux_buffer_params_v1::Flags, -}; +use waynest::server::protocol::stable::linux_dmabuf_v1::zwp_linux_buffer_params_v1::Flags; /// Parameters for a shared memory buffer pub struct DmabufBacking { @@ -80,7 +78,6 @@ impl DmabufBacking { &self, dmatexes: &ImportedDmatexs, images: &mut Assets, - buffer: Arc, ) -> Option> { self.pending_imported_dmatex .lock() diff --git a/src/wayland/mod.rs b/src/wayland/mod.rs index 0a44f81..54ad7c4 100644 --- a/src/wayland/mod.rs +++ b/src/wayland/mod.rs @@ -26,7 +26,6 @@ use core::{ display::Display, surface::WL_SURFACE_REGISTRY, }; -use dmabuf::buffer_params::BufferParams; use mint::Vector2; use std::sync::atomic::Ordering; use std::{ @@ -39,7 +38,6 @@ use std::{ use tokio::{net::UnixStream, sync::mpsc, task::AbortHandle}; use tokio_stream::StreamExt; use tracing::{debug_span, instrument}; -use waynest::server::protocol::stable::linux_dmabuf_v1::zwp_linux_buffer_params_v1::ZwpLinuxBufferParamsV1; use waynest::{ server::{ self, @@ -107,8 +105,6 @@ pub fn get_free_wayland_socket_path() -> Option { pub enum Message { Frame(Arc), ReleaseBuffer(Arc), - DmabufImportSuccess(Arc, Arc), - DmabufImportFailure(Arc), CloseToplevel(Arc), ResizeToplevel { toplevel: Arc, @@ -210,13 +206,6 @@ impl WaylandClient { client.remove(callback.0); Ok(()) } - Message::DmabufImportSuccess(params, buffer) => { - params.created(client, params.id, buffer.id).await - } - Message::DmabufImportFailure(params) => { - client.remove(params.id); - params.failed(client, params.id).await - } Message::ReleaseBuffer(buffer) => buffer.release(client, buffer.id).await, Message::CloseToplevel(toplevel) => toplevel.close(client, toplevel.id).await, Message::ResizeToplevel { toplevel, size } => {