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

fix(wayland): frame callbacks in order

Browse Source
This commit is contained in:
Nova
2025-08-04 22:59:46 -07:00
parent e1e773befb
commit 8e143f97d4
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +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>, frame_callbacks: Vec<Arc<Callback>>,
} }
impl Default for SurfaceState { impl Default for SurfaceState {
fn default() -> Self { fn default() -> Self {
@@ -58,7 +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(), frame_callbacks: Vec::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.current_state().frame_callbacks.take_valid_contents() { for callback in self.state.lock().current.frame_callbacks.drain(..) {
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.state.lock().pending.frame_callbacks.add_raw(&callback); self.state.lock().pending.frame_callbacks.push(callback);
Ok(()) Ok(())
} }

2
src/wayland/util.rs
View File

@@ -48,7 +48,7 @@ impl ClientExt for Client {
#[derive(Debug, Default)] #[derive(Debug, Default)]
pub struct DoubleBuffer<State: Debug + Clone> { pub struct DoubleBuffer<State: Debug + Clone> {
current: State, pub current: State,
pub pending: State, pub pending: State,
} }
impl<State: Debug + Clone> DoubleBuffer<State> { impl<State: Debug + Clone> DoubleBuffer<State> {