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

fix(wayland): lock contention (theoretically)

Browse Source
This commit is contained in:
Nova
2025-07-28 17:01:28 -07:00
parent c6754bd689
commit 2acb75a3fc
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,6 @@ 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>>,
clean_lock: OnceLock<()>,
} }
impl Default for SurfaceState { impl Default for SurfaceState {
fn default() -> Self { fn default() -> Self {
@@ -58,7 +57,6 @@ impl Default for SurfaceState {
geometry: None, geometry: None,
min_size: None, min_size: None,
max_size: None, max_size: None,
clean_lock: Default::default(),
} }
} }
} }
@@ -127,8 +125,7 @@ impl Surface {
materials: &mut Assets<BevyMaterial>, materials: &mut Assets<BevyMaterial>,
images: &mut Assets<Image>, images: &mut Assets<Image>,
) { ) {
let state_lock = self.state.lock(); let Some(buffer) = self.state.lock().current().buffer.clone() else {
let Some(buffer) = state_lock.current().buffer.clone() else {
return; return;
}; };
@@ -159,7 +156,6 @@ impl Surface {
} }
self.apply_surface_materials(); self.apply_surface_materials();
let _ = state_lock.current().clean_lock.set(());
} }
#[tracing::instrument(level = "debug", skip_all)] #[tracing::instrument(level = "debug", skip_all)]