Arc WinitWindow and extract to render world

crates/bevy_internal/Cargo.toml

@@ -78,6 +78,7 @@ multi-threaded = [
  "bevy_asset?/multi-threaded",
  "bevy_ecs/multi-threaded",
  "bevy_render?/multi-threaded",
+ "bevy_winit?/multi-threaded",
  "bevy_tasks/multi-threaded",
 ]
 async-io = ["bevy_tasks/async-io"]

crates/bevy_winit/Cargo.toml

@@ -14,6 +14,7 @@ wayland = ["winit/wayland", "winit/wayland-csd-adwaita"]
 x11 = ["winit/x11"]
 accesskit_unix = ["accesskit_winit/accesskit_unix", "accesskit_winit/async-io"]
 serialize = ["serde"]
+multi-threaded = []
 
 [dependencies]
 # bevy

crates/bevy_winit/src/system.rs

@@ -11,6 +11,8 @@ use bevy_window::{
  RawHandleWrapper, Window, WindowClosed, WindowCreated, WindowMode, WindowResized,
 };
 
+#[cfg(all(not(target_arch = "wasm32"), feature = "multi-threaded"))]
+use bevy_ecs::system::Local;
 use raw_window_handle::{HasDisplayHandle, HasWindowHandle};
 use winit::{
  dpi::{LogicalPosition, LogicalSize, PhysicalPosition, PhysicalSize},
@@ -98,6 +100,7 @@ pub(crate) fn create_windows<F: QueryFilter + 'static>(
  }
 }
 
+#[cfg(any(target_arch = "wasm32", not(feature = "multi-threaded")))]
 pub(crate) fn despawn_windows(
  mut closed: RemovedComponents<Window>,
  window_entities: Query<&Window>,
@@ -115,6 +118,31 @@ pub(crate) fn despawn_windows(
  }
 }
 
+#[cfg(all(not(target_arch = "wasm32"), feature = "multi-threaded"))]
+pub(crate) fn despawn_windows(
+ mut closed: RemovedComponents<Window>,
+ window_entities: Query<&Window>,
+ mut close_events: EventWriter<WindowClosed>,
+ mut winit_windows: NonSendMut<WinitWindows>,
+ // Winit windows are preserved for an extra frame in this vector.
+ // This is due to the window still being active on render world when using pipelined rendering.
+ mut pending_window_removal: Local<Vec<Entity>>,
+) {
+ for window in pending_window_removal.drain(..) {
+ winit_windows.remove_window(window);
+ }
+ for window in closed.read() {
+ info!("Closing window {:?}", window);
+ // Guard to verify that the window is in fact actually gone,
+ // rather than having the component added and removed in the same frame.
+ if !window_entities.contains(window) {
+ // Delay winit window removal by a frame.
+ pending_window_removal.push(window);
+ close_events.send(WindowClosed { window });
+ }
+ }
+}
+
 /// The cached state of the window so we can check which properties were changed from within the app.
 #[derive(Debug, Clone, Component)]
 pub struct CachedWindow {