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

fix: wayland buffer handling improvements

Browse Source
This commit is contained in:
Nova
2025-07-26 01:45:03 -07:00
parent 38ea600846
commit 3fbc659904
1 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/wayland/mod.rs
View File

@@ -4,6 +4,7 @@ pub mod util;
pub mod vulkano_data; pub mod vulkano_data;
pub mod xdg; pub mod xdg;
use crate::core::registry::OwnedRegistry;
use crate::wayland::core::seat::SeatMessage; use crate::wayland::core::seat::SeatMessage;
use crate::{ use crate::{
BevyMaterial, BevyMaterial,
@@ -25,7 +26,6 @@ use cluFlock::{FlockLock, ToFlock};
use core::buffer::BufferUsage; use core::buffer::BufferUsage;
use core::{buffer::Buffer, callback::Callback, display::Display, surface::WL_SURFACE_REGISTRY}; use core::{buffer::Buffer, callback::Callback, display::Display, surface::WL_SURFACE_REGISTRY};
use mint::Vector2; use mint::Vector2;
use rustc_hash::FxHashMap;
use std::fs::File; use std::fs::File;
use std::{ use std::{
fs::{self, OpenOptions}, fs::{self, OpenOptions},
@@ -287,6 +287,7 @@ pub struct WaylandPlugin;
impl Plugin for WaylandPlugin { impl Plugin for WaylandPlugin {
fn build(&self, app: &mut App) { fn build(&self, app: &mut App) {
app.add_systems(Update, update_graphics); app.add_systems(Update, update_graphics);
app.init_resource::<UsedBuffers>();
app.sub_app_mut(RenderApp) app.sub_app_mut(RenderApp)
.init_resource::<UsedBuffers>() .init_resource::<UsedBuffers>()
.add_systems( .add_systems(
@@ -302,23 +303,31 @@ impl Plugin for WaylandPlugin {
} }
} }
#[derive(Resource, Default, Deref, DerefMut)]
struct UsedBuffers(FxHashMap<ObjectId, Arc<BufferUsage>>);
fn push_used_buffers(mut buffers: ResMut<UsedBuffers>) {
for surface in WL_SURFACE_REGISTRY.get_valid_contents() {
if let Some(buffer) = surface.current_state().buffer.and_then(|b| b.usage).clone() {
buffers.insert(buffer.buffer.id, buffer);
}
}
}
fn init_render_device(dev: Res<RenderDevice>) { fn init_render_device(dev: Res<RenderDevice>) {
_ = RENDER_DEVICE.set(dev.clone()); _ = RENDER_DEVICE.set(dev.clone());
} }
fn after_render(mut buffers: ResMut<UsedBuffers>) { #[derive(Resource, Deref, DerefMut)]
buffers.retain(|_, v| Arc::downgrade(v).strong_count() > 1); struct UsedBuffers(OwnedRegistry<BufferUsage>);
impl Default for UsedBuffers {
fn default() -> Self {
Self(OwnedRegistry::new())
}
}
fn push_used_buffers(buffers: Res<UsedBuffers>) {
for buf in WL_SURFACE_REGISTRY
.get_valid_contents()
.into_iter()
.filter_map(|surface| surface.current_state().buffer)
.filter_map(|buffer| buffer.usage)
{
buffers.add_raw(buf);
}
}
fn after_render(buffers: Res<UsedBuffers>) {
buffers.clear();
for surface in WL_SURFACE_REGISTRY.get_valid_contents() { for surface in WL_SURFACE_REGISTRY.get_valid_contents() {
surface.frame_event(); surface.frame_event();
} }