cleanup: unneeded code

This commit is contained in:
Nova
2025-07-12 21:35:43 -07:00
parent 00fdaf5b9f
commit 58328cd63b
4 changed files with 4 additions and 19 deletions

View File

@@ -59,12 +59,11 @@ impl Buffer {
&self,
dmatexes: &ImportedDmatexs,
images: &mut Assets<Image>,
buffer: Arc<Buffer>,
) -> Option<Handle<Image>> {
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),
}
}

View File

@@ -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);

View File

@@ -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<Image>,
buffer: Arc<Buffer>,
) -> Option<Handle<Image>> {
self.pending_imported_dmatex
.lock()

View File

@@ -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<PathBuf> {
pub enum Message {
Frame(Arc<Callback>),
ReleaseBuffer(Arc<Buffer>),
DmabufImportSuccess(Arc<BufferParams>, Arc<Buffer>),
DmabufImportFailure(Arc<BufferParams>),
CloseToplevel(Arc<Toplevel>),
ResizeToplevel {
toplevel: Arc<Toplevel>,
@@ -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 } => {