StardustXR/server
1
0
Fork 0
Code Issues 11 Pull Requests 3 Actions Packages Projects Releases 5 Wiki Activity

cleanup: unneeded code

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

3
src/wayland/core/buffer.rs
View File

@@ -59,12 +59,11 @@ impl Buffer {
&self, &self,
dmatexes: &ImportedDmatexs, dmatexes: &ImportedDmatexs,
images: &mut Assets<Image>, images: &mut Assets<Image>,
buffer: Arc<Buffer>,
) -> Option<Handle<Image>> { ) -> Option<Handle<Image>> {
tracing::debug!("Updating texture for buffer {:?}", self.id); tracing::debug!("Updating texture for buffer {:?}", self.id);
match &self.backing { match &self.backing {
BufferBacking::Shm(backing) => backing.update_tex(images), BufferBacking::Shm(backing) => backing.update_tex(images),
BufferBacking::Dmabuf(backing) => backing.update_tex(dmatexes, images, buffer), BufferBacking::Dmabuf(backing) => backing.update_tex(dmatexes, images),
} }
} }

2
src/wayland/core/surface.rs
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); buffer.rendered.store(true, Ordering::Relaxed);
let material = materials.get_mut(material).unwrap(); let material = materials.get_mut(material).unwrap();
material.base_color_texture.replace(new_tex); material.base_color_texture.replace(new_tex);

7
src/wayland/dmabuf/buffer_backing.rs
View File

@@ -1,5 +1,5 @@
use super::buffer_params::BufferParams; use super::buffer_params::BufferParams;
use crate::wayland::{MessageSink, RENDER_DEVICE, core::buffer::Buffer}; use crate::wayland::{MessageSink, RENDER_DEVICE};
use bevy::{ use bevy::{
asset::{Assets, Handle}, asset::{Assets, Handle},
image::Image, image::Image,
@@ -12,9 +12,7 @@ use drm_fourcc::DrmFourcc;
use mint::Vector2; use mint::Vector2;
use parking_lot::Mutex; use parking_lot::Mutex;
use std::sync::{Arc, OnceLock}; use std::sync::{Arc, OnceLock};
use waynest::server::{ use waynest::server::protocol::stable::linux_dmabuf_v1::zwp_linux_buffer_params_v1::Flags;
Client, protocol::stable::linux_dmabuf_v1::zwp_linux_buffer_params_v1::Flags,
};
/// Parameters for a shared memory buffer /// Parameters for a shared memory buffer
pub struct DmabufBacking { pub struct DmabufBacking {
@@ -80,7 +78,6 @@ impl DmabufBacking {
&self, &self,
dmatexes: &ImportedDmatexs, dmatexes: &ImportedDmatexs,
images: &mut Assets<Image>, images: &mut Assets<Image>,
buffer: Arc<Buffer>,
) -> Option<Handle<Image>> { ) -> Option<Handle<Image>> {
self.pending_imported_dmatex self.pending_imported_dmatex
.lock() .lock()

11
src/wayland/mod.rs
View File

@@ -26,7 +26,6 @@ use core::{
display::Display, display::Display,
surface::WL_SURFACE_REGISTRY, surface::WL_SURFACE_REGISTRY,
}; };
use dmabuf::buffer_params::BufferParams;
use mint::Vector2; use mint::Vector2;
use std::sync::atomic::Ordering; use std::sync::atomic::Ordering;
use std::{ use std::{
@@ -39,7 +38,6 @@ use std::{
use tokio::{net::UnixStream, sync::mpsc, task::AbortHandle}; use tokio::{net::UnixStream, sync::mpsc, task::AbortHandle};
use tokio_stream::StreamExt; use tokio_stream::StreamExt;
use tracing::{debug_span, instrument}; use tracing::{debug_span, instrument};
use waynest::server::protocol::stable::linux_dmabuf_v1::zwp_linux_buffer_params_v1::ZwpLinuxBufferParamsV1;
use waynest::{ use waynest::{
server::{ server::{
self, self,
@@ -107,8 +105,6 @@ pub fn get_free_wayland_socket_path() -> Option<PathBuf> {
pub enum Message { pub enum Message {
Frame(Arc<Callback>), Frame(Arc<Callback>),
ReleaseBuffer(Arc<Buffer>), ReleaseBuffer(Arc<Buffer>),
DmabufImportSuccess(Arc<BufferParams>, Arc<Buffer>),
DmabufImportFailure(Arc<BufferParams>),
CloseToplevel(Arc<Toplevel>), CloseToplevel(Arc<Toplevel>),
ResizeToplevel { ResizeToplevel {
toplevel: Arc<Toplevel>, toplevel: Arc<Toplevel>,
@@ -210,13 +206,6 @@ impl WaylandClient {
client.remove(callback.0); client.remove(callback.0);
Ok(()) 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::ReleaseBuffer(buffer) => buffer.release(client, buffer.id).await,
Message::CloseToplevel(toplevel) => toplevel.close(client, toplevel.id).await, Message::CloseToplevel(toplevel) => toplevel.close(client, toplevel.id).await,
Message::ResizeToplevel { toplevel, size } => { Message::ResizeToplevel { toplevel, size } => {