From 49224ad6b5721b3a1a98991c6e7cfd3fb748caef Mon Sep 17 00:00:00 2001 From: Schmarni Date: Thu, 10 Jul 2025 21:01:05 +0200 Subject: [PATCH] refactor: move WaylandPlugin init Signed-off-by: Schmarni --- src/main.rs | 5 +++-- src/wayland/mod.rs | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main.rs b/src/main.rs index 533a0e1..be657ce 100644 --- a/src/main.rs +++ b/src/main.rs @@ -290,8 +290,7 @@ fn bevy_loop( .add(AudioPlugin::default()) .add(GizmoPlugin) .add(WindowPlugin::default()) - .add(DmabufImportPlugin) - .add(WaylandPlugin); + .add(DmabufImportPlugin); let mut task_pool_plugin = TaskPoolPlugin::default(); // make tokio work let handle = tokio::runtime::Handle::current(); @@ -395,6 +394,8 @@ fn bevy_loop( )); // object plugins app.add_plugins((PlaySpacePlugin, HandPlugin, ControllerPlugin)); + // feature plugins + app.add_plugins(WaylandPlugin); app.add_systems(PostStartup, move || { ready_notifier.notify_waiters(); }); diff --git a/src/wayland/mod.rs b/src/wayland/mod.rs index 5d68cb7..6e1e3c4 100644 --- a/src/wayland/mod.rs +++ b/src/wayland/mod.rs @@ -35,7 +35,7 @@ use std::{ }; use tokio::{net::UnixStream, sync::mpsc, task::AbortHandle}; use tokio_stream::StreamExt; -use tracing::{debug_span, instrument}; +use tracing::{debug_span, info, instrument}; use waynest::server::protocol::stable::linux_dmabuf_v1::zwp_linux_buffer_params_v1::ZwpLinuxBufferParamsV1; use waynest::{ server::{ @@ -295,6 +295,7 @@ impl Plugin for WaylandPlugin { } fn early_frame() { + info!("test"); for buffer in WL_BUFFER_REGISTRY.get_valid_contents() { if buffer.rendered.load(Ordering::Relaxed) { let _ = buffer