forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Force main thread for prepare_windows system (#11)

Browse Source 
Force main thread for prepare_windows system
This commit is contained in:
TheRawMeatball 2021-06-30 00:43:56 +03:00 committed by Carter Anderson
parent 61c8475069
commit 7792b29aa4
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pipelined/bevy_render2/src/view/window.rs
View File

@ -11,6 +11,10 @@ use bevy_window::{RawWindowHandleWrapper, WindowId, Windows};
use std::ops::{Deref, DerefMut}; use std::ops::{Deref, DerefMut};
use wgpu::TextureFormat; use wgpu::TextureFormat;
// Token to ensure a system runs on the main thread.
#[derive(Default)]
pub struct NonSendMarker;
pub struct WindowRenderPlugin; pub struct WindowRenderPlugin;
impl Plugin for WindowRenderPlugin { impl Plugin for WindowRenderPlugin {
@ -18,6 +22,7 @@ impl Plugin for WindowRenderPlugin {
let render_app = app.sub_app_mut(0); let render_app = app.sub_app_mut(0);
render_app render_app
.init_resource::<WindowSurfaces>() .init_resource::<WindowSurfaces>()
.init_resource::<NonSendMarker>()
.add_system_to_stage(RenderStage::Extract, extract_windows.system()) .add_system_to_stage(RenderStage::Extract, extract_windows.system())
.add_system_to_stage(RenderStage::Prepare, prepare_windows.system()); .add_system_to_stage(RenderStage::Prepare, prepare_windows.system());
} }
@ -77,6 +82,9 @@ pub struct WindowSurfaces {
} }
pub fn prepare_windows( pub fn prepare_windows(
// By accessing a NonSend resource, we tell the scheduler to put this system on the main thread,
// which is necessary for some OS s
_marker: NonSend<NonSendMarker>,
mut windows: ResMut<ExtractedWindows>, mut windows: ResMut<ExtractedWindows>,
mut window_surfaces: ResMut<WindowSurfaces>, mut window_surfaces: ResMut<WindowSurfaces>,
render_device: Res<RenderDevice>, render_device: Res<RenderDevice>,
@ -88,6 +96,7 @@ pub fn prepare_windows(
.surfaces .surfaces
.entry(window.id) .entry(window.id)
.or_insert_with(|| unsafe { .or_insert_with(|| unsafe {
// NOTE: On some OSes this MUST be called from the main thread.
render_instance.create_surface(&window.handle.get_handle()) render_instance.create_surface(&window.handle.get_handle())
}); });