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

fix(wayland): double buffer frame callbacks

Browse Source
This commit is contained in:
Nova
2025-08-04 22:02:06 -07:00
parent c5b1869f42
commit e1e773befb
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/wayland/core/surface.rs
View File

@@ -48,6 +48,7 @@ pub struct SurfaceState {
pub geometry: Option<Geometry>, pub geometry: Option<Geometry>,
pub min_size: Option<Vector2<u32>>, pub min_size: Option<Vector2<u32>>,
pub max_size: Option<Vector2<u32>>, pub max_size: Option<Vector2<u32>>,
frame_callbacks: Registry<Callback>,
} }
impl Default for SurfaceState { impl Default for SurfaceState {
fn default() -> Self { fn default() -> Self {
@@ -57,6 +58,7 @@ impl Default for SurfaceState {
geometry: None, geometry: None,
min_size: None, min_size: None,
max_size: None, max_size: None,
frame_callbacks: Registry::new(),
} }
} }
} }
@@ -70,7 +72,6 @@ pub struct Surface {
state: Mutex<DoubleBuffer<SurfaceState>>, state: Mutex<DoubleBuffer<SurfaceState>>,
pub message_sink: MessageSink, pub message_sink: MessageSink,
pub role: Mutex<Option<SurfaceRole>>, pub role: Mutex<Option<SurfaceRole>>,
frame_callbacks: Registry<Callback>,
on_commit_handlers: Mutex<Vec<OnCommitCallback>>, on_commit_handlers: Mutex<Vec<OnCommitCallback>>,
material: OnceLock<Handle<BevyMaterial>>, material: OnceLock<Handle<BevyMaterial>>,
pending_material_applications: Registry<ModelPart>, pending_material_applications: Registry<ModelPart>,
@@ -96,7 +97,6 @@ impl Surface {
state: Default::default(), state: Default::default(),
message_sink: client.message_sink(), message_sink: client.message_sink(),
role: Mutex::new(None), role: Mutex::new(None),
frame_callbacks: Registry::new(),
on_commit_handlers: Mutex::new(Vec::new()), on_commit_handlers: Mutex::new(Vec::new()),
material: OnceLock::new(), material: OnceLock::new(),
pending_material_applications: Registry::new(), pending_material_applications: Registry::new(),
@@ -180,7 +180,7 @@ impl Surface {
} }
#[tracing::instrument(level = "debug", skip_all)] #[tracing::instrument(level = "debug", skip_all)]
pub fn frame_event(&self) { pub fn frame_event(&self) {
for callback in self.frame_callbacks.take_valid_contents() { for callback in self.current_state().frame_callbacks.take_valid_contents() {
let _ = self.message_sink.send(Message::Frame(callback)); let _ = self.message_sink.send(Message::Frame(callback));
} }
} }
@@ -258,7 +258,7 @@ impl WlSurface for Surface {
callback_id: ObjectId, callback_id: ObjectId,
) -> Result<()> { ) -> Result<()> {
let callback = client.insert(callback_id, Callback(callback_id)); let callback = client.insert(callback_id, Callback(callback_id));
self.frame_callbacks.add_raw(&callback); self.state.lock().pending.frame_callbacks.add_raw(&callback);
Ok(()) Ok(())
} }
@@ -290,6 +290,7 @@ impl WlSurface for Surface {
#[tracing::instrument(level = "debug", skip_all)] #[tracing::instrument(level = "debug", skip_all)]
async fn commit(&self, _client: &mut Client, _sender_id: ObjectId) -> Result<()> { async fn commit(&self, _client: &mut Client, _sender_id: ObjectId) -> Result<()> {
self.state.lock().apply(); self.state.lock().apply();
self.state.lock().pending.frame_callbacks.clear();
let current_state = self.current_state(); let current_state = self.current_state();
let mut handlers = self.on_commit_handlers.lock(); let mut handlers = self.on_commit_handlers.lock();
handlers.retain(|f| (f)(self, &current_state)); handlers.retain(|f| (f)(self, &current_state));