
# Objective - Fixes #6370 - Closes #6581 ## Solution - Added the following lints to the workspace: - `std_instead_of_core` - `std_instead_of_alloc` - `alloc_instead_of_core` - Used `cargo +nightly fmt` with [item level use formatting](https://rust-lang.github.io/rustfmt/?version=v1.6.0&search=#Item%5C%3A) to split all `use` statements into single items. - Used `cargo clippy --workspace --all-targets --all-features --fix --allow-dirty` to _attempt_ to resolve the new linting issues, and intervened where the lint was unable to resolve the issue automatically (usually due to needing an `extern crate alloc;` statement in a crate root). - Manually removed certain uses of `std` where negative feature gating prevented `--all-features` from finding the offending uses. - Used `cargo +nightly fmt` with [crate level use formatting](https://rust-lang.github.io/rustfmt/?version=v1.6.0&search=#Crate%5C%3A) to re-merge all `use` statements matching Bevy's previous styling. - Manually fixed cases where the `fmt` tool could not re-merge `use` statements due to conditional compilation attributes. ## Testing - Ran CI locally ## Migration Guide The MSRV is now 1.81. Please update to this version or higher. ## Notes - This is a _massive_ change to try and push through, which is why I've outlined the semi-automatic steps I used to create this PR, in case this fails and someone else tries again in the future. - Making this change has no impact on user code, but does mean Bevy contributors will be warned to use `core` and `alloc` instead of `std` where possible. - This lint is a critical first step towards investigating `no_std` options for Bevy. --------- Co-authored-by: François Mockers <francois.mockers@vleue.com>
125 lines
5.5 KiB
Rust
125 lines
5.5 KiB
Rust
#![allow(unsafe_code)]
|
|
|
|
use alloc::sync::Arc;
|
|
use bevy_ecs::prelude::Component;
|
|
use core::{any::Any, marker::PhantomData, ops::Deref};
|
|
use raw_window_handle::{
|
|
DisplayHandle, HandleError, HasDisplayHandle, HasWindowHandle, RawDisplayHandle,
|
|
RawWindowHandle, WindowHandle,
|
|
};
|
|
use std::sync::Mutex;
|
|
|
|
/// A wrapper over a window.
|
|
///
|
|
/// This allows us to extend the lifetime of the window, so it doesn't get eagerly dropped while a
|
|
/// pipelined renderer still has frames in flight that need to draw to it.
|
|
///
|
|
/// This is achieved by storing a shared reference to the window in the [`RawHandleWrapper`],
|
|
/// which gets picked up by the renderer during extraction.
|
|
#[derive(Debug)]
|
|
pub struct WindowWrapper<W> {
|
|
reference: Arc<dyn Any + Send + Sync>,
|
|
ty: PhantomData<W>,
|
|
}
|
|
|
|
impl<W: Send + Sync + 'static> WindowWrapper<W> {
|
|
/// Creates a `WindowWrapper` from a window.
|
|
pub fn new(window: W) -> WindowWrapper<W> {
|
|
WindowWrapper {
|
|
reference: Arc::new(window),
|
|
ty: PhantomData,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<W: 'static> Deref for WindowWrapper<W> {
|
|
type Target = W;
|
|
|
|
fn deref(&self) -> &Self::Target {
|
|
self.reference.downcast_ref::<W>().unwrap()
|
|
}
|
|
}
|
|
|
|
/// A wrapper over [`RawWindowHandle`] and [`RawDisplayHandle`] that allows us to safely pass it across threads.
|
|
///
|
|
/// Depending on the platform, the underlying pointer-containing handle cannot be used on all threads,
|
|
/// and so we cannot simply make it (or any type that has a safe operation to get a [`RawWindowHandle`] or [`RawDisplayHandle`])
|
|
/// thread-safe.
|
|
#[derive(Debug, Clone, Component)]
|
|
pub struct RawHandleWrapper {
|
|
_window: Arc<dyn Any + Send + Sync>,
|
|
/// Raw handle to a window.
|
|
pub window_handle: RawWindowHandle,
|
|
/// Raw handle to the display server.
|
|
pub display_handle: RawDisplayHandle,
|
|
}
|
|
|
|
impl RawHandleWrapper {
|
|
/// Creates a `RawHandleWrapper` from a `WindowWrapper`.
|
|
pub fn new<W: HasWindowHandle + HasDisplayHandle + 'static>(
|
|
window: &WindowWrapper<W>,
|
|
) -> Result<RawHandleWrapper, HandleError> {
|
|
Ok(RawHandleWrapper {
|
|
_window: window.reference.clone(),
|
|
window_handle: window.window_handle()?.as_raw(),
|
|
display_handle: window.display_handle()?.as_raw(),
|
|
})
|
|
}
|
|
|
|
/// Returns a [`HasWindowHandle`] + [`HasDisplayHandle`] impl, which exposes [`WindowHandle`] and [`DisplayHandle`].
|
|
///
|
|
/// # Safety
|
|
///
|
|
/// Some platforms have constraints on where/how this handle can be used. For example, some platforms don't support doing window
|
|
/// operations off of the main thread. The caller must ensure the [`RawHandleWrapper`] is only used in valid contexts.
|
|
pub unsafe fn get_handle(&self) -> ThreadLockedRawWindowHandleWrapper {
|
|
ThreadLockedRawWindowHandleWrapper(self.clone())
|
|
}
|
|
}
|
|
|
|
// SAFETY: [`RawHandleWrapper`] is just a normal "raw pointer", which doesn't impl Send/Sync. However the pointer is only
|
|
// exposed via an unsafe method that forces the user to make a call for a given platform. (ex: some platforms don't
|
|
// support doing window operations off of the main thread).
|
|
// A recommendation for this pattern (and more context) is available here:
|
|
// https://github.com/rust-windowing/raw-window-handle/issues/59
|
|
unsafe impl Send for RawHandleWrapper {}
|
|
// SAFETY: This is safe for the same reasons as the Send impl above.
|
|
unsafe impl Sync for RawHandleWrapper {}
|
|
|
|
/// A [`RawHandleWrapper`] that cannot be sent across threads.
|
|
///
|
|
/// This safely exposes [`RawWindowHandle`] and [`RawDisplayHandle`], but care must be taken to ensure that the construction itself is correct.
|
|
///
|
|
/// This can only be constructed via the [`RawHandleWrapper::get_handle()`] method;
|
|
/// be sure to read the safety docs there about platform-specific limitations.
|
|
/// In many cases, this should only be constructed on the main thread.
|
|
pub struct ThreadLockedRawWindowHandleWrapper(RawHandleWrapper);
|
|
|
|
impl HasWindowHandle for ThreadLockedRawWindowHandleWrapper {
|
|
fn window_handle(&self) -> Result<WindowHandle, HandleError> {
|
|
// SAFETY: the caller has validated that this is a valid context to get [`RawHandleWrapper`]
|
|
// as otherwise an instance of this type could not have been constructed
|
|
// NOTE: we cannot simply impl HasRawWindowHandle for RawHandleWrapper,
|
|
// as the `raw_window_handle` method is safe. We cannot guarantee that all calls
|
|
// of this method are correct (as it may be off the main thread on an incompatible platform),
|
|
// and so exposing a safe method to get a [`RawWindowHandle`] directly would be UB.
|
|
Ok(unsafe { WindowHandle::borrow_raw(self.0.window_handle) })
|
|
}
|
|
}
|
|
|
|
impl HasDisplayHandle for ThreadLockedRawWindowHandleWrapper {
|
|
fn display_handle(&self) -> Result<DisplayHandle, HandleError> {
|
|
// SAFETY: the caller has validated that this is a valid context to get [`RawDisplayHandle`]
|
|
// as otherwise an instance of this type could not have been constructed
|
|
// NOTE: we cannot simply impl HasRawDisplayHandle for RawHandleWrapper,
|
|
// as the `raw_display_handle` method is safe. We cannot guarantee that all calls
|
|
// of this method are correct (as it may be off the main thread on an incompatible platform),
|
|
// and so exposing a safe method to get a [`RawDisplayHandle`] directly would be UB.
|
|
Ok(unsafe { DisplayHandle::borrow_raw(self.0.display_handle) })
|
|
}
|
|
}
|
|
|
|
/// Holder of the [`RawHandleWrapper`] with wrappers, to allow use in asynchronous context
|
|
#[derive(Debug, Clone, Component)]
|
|
pub struct RawHandleWrapperHolder(pub Arc<Mutex<Option<RawHandleWrapper>>>);
|