alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-23 13:51:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

Disallow cleanup for TLS in examples

Browse source 
Fixes issue on Wayland due to drop order, since TLS is being dropped
after the event loop, while it shouldn't. In particular it fixes the
crash in the window_run_return example.
This commit is contained in:
Kirill Chibisov 2023-06-26 01:04:38 +04:00 committed by GitHub
parent 059abb06fc
commit e23186db8e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
examples/util/fill.rs
View file

@ -14,6 +14,7 @@ pub(super) fn fill_window(window: &Window) {
use softbuffer::{Context, Surface}; use softbuffer::{Context, Surface};
use std::cell::RefCell; use std::cell::RefCell;
use std::collections::HashMap; use std::collections::HashMap;
use std::mem::ManuallyDrop;
use std::num::NonZeroU32; use std::num::NonZeroU32;
use winit::window::WindowId; use winit::window::WindowId;
@ -43,8 +44,12 @@ pub(super) fn fill_window(window: &Window) {
} }
thread_local! { thread_local! {
/// A static, thread-local map of graphics contexts to open windows. // NOTE: You should never do things like that, create context and drop it before
static GC: RefCell<Option<GraphicsContext>> = RefCell::new(None); // you drop the event loop. We do this for brevity to not blow up examples. We use
// ManuallyDrop to prevent destructors from running.
//
// A static, thread-local map of graphics contexts to open windows.
static GC: ManuallyDrop<RefCell<Option<GraphicsContext>>> = ManuallyDrop::new(RefCell::new(None));
} }
GC.with(|gc| { GC.with(|gc| {