tyiu/notedeck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix render resume on android

Browse Source
This commit is contained in:
William Casarin
2022-11-30 11:12:01 -08:00
parent 1fe860421b
commit 7e539c639b
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/lib.rs
View File

@@ -84,7 +84,7 @@ pub fn main(mut event_loop: EventLoop<WinitEvent>) {
}); });
warn!("WGPU new instance at {} line {}", file!(), line!()); warn!("WGPU new instance at {} line {}", file!(), line!());
let mut instance = wgpu::Instance::new(wgpu::Backends::PRIMARY); let instance = wgpu::Instance::new(wgpu::Backends::PRIMARY);
let mut size = window.inner_size(); let mut size = window.inner_size();
let outer_size = window.outer_size(); let outer_size = window.outer_size();
@@ -102,6 +102,8 @@ pub fn main(mut event_loop: EventLoop<WinitEvent>) {
style: Default::default(), style: Default::default(),
}); });
let mut recreate_surface = false;
#[cfg(target_os = "android")] #[cfg(target_os = "android")]
let mut platform = { let mut platform = {
//Just find the actual screen size on android //Just find the actual screen size on android
@@ -121,8 +123,9 @@ pub fn main(mut event_loop: EventLoop<WinitEvent>) {
StartCause::Init => {} StartCause::Init => {}
}, },
WindowEvent { WindowEvent {
window_id, //window_id,
ref event, ref event,
..
} => { } => {
if let winit::event::WindowEvent::Resized(r) = event { if let winit::event::WindowEvent::Resized(r) = event {
size = *r; size = *r;
@@ -131,6 +134,7 @@ pub fn main(mut event_loop: EventLoop<WinitEvent>) {
DeviceEvent { .. } => {} DeviceEvent { .. } => {}
UserEvent(_) => {} UserEvent(_) => {}
Suspended => { Suspended => {
info!("Suspended");
control_flow.set_poll(); control_flow.set_poll();
} }
Resumed => { Resumed => {
@@ -153,10 +157,13 @@ pub fn main(mut event_loop: EventLoop<WinitEvent>) {
line!() line!()
); );
} }
info!("Resumed");
recreate_surface = true;
control_flow.set_exit(); control_flow.set_exit();
} }
MainEventsCleared => {} MainEventsCleared => {}
RedrawRequested(rdr) => {} RedrawRequested(_rdr) => {}
RedrawEventsCleared => {} RedrawEventsCleared => {}
LoopDestroyed => {} LoopDestroyed => {}
}; };
@@ -228,8 +235,6 @@ pub fn main(mut event_loop: EventLoop<WinitEvent>) {
let start_time = Instant::now(); let start_time = Instant::now();
let mut in_bad_state = false;
warn!("Enter the loop"); warn!("Enter the loop");
event_loop.run(move |event, _, control_flow| { event_loop.run(move |event, _, control_flow| {
// Pass the winit events to the platform integration. // Pass the winit events to the platform integration.
@@ -245,14 +250,14 @@ pub fn main(mut event_loop: EventLoop<WinitEvent>) {
// This error occurs when the app is minimized on Windows. // This error occurs when the app is minimized on Windows.
// Silently return here to prevent spamming the console with: // Silently return here to prevent spamming the console with:
error!("The underlying surface has changed, and therefore the swap chain must be updated"); error!("The underlying surface has changed, and therefore the swap chain must be updated");
in_bad_state = true; recreate_surface = true;
return; return;
} }
Err(wgpu::SurfaceError::Lost) => { Err(wgpu::SurfaceError::Lost) => {
// This error occurs when the app is minimized on Windows. // This error occurs when the app is minimized on Windows.
// Silently return here to prevent spamming the console with: // Silently return here to prevent spamming the console with:
error!("LOST surface, drop frame. Originally: \"The swap chain has been lost and needs to be recreated\""); error!("LOST surface, drop frame. Originally: \"The swap chain has been lost and needs to be recreated\"");
in_bad_state = true; recreate_surface = true;
return; return;
} }
Err(e) => { Err(e) => {
@@ -337,16 +342,19 @@ pub fn main(mut event_loop: EventLoop<WinitEvent>) {
_ => {} _ => {}
}, },
Resumed => { Resumed => {
if in_bad_state { info!("Damus Resumed (recreate surface? {})", recreate_surface);
if recreate_surface {
//https://github.com/gfx-rs/wgpu/issues/2302 //https://github.com/gfx-rs/wgpu/issues/2302
warn!("WGPU new surface at {} line {}", file!(), line!()); warn!("WGPU new surface at {} line {}", file!(), line!());
surface = unsafe { instance.create_surface(&window) }; surface = unsafe { instance.create_surface(&window) };
warn!("surface configure at {} line {}", file!(), line!()); warn!("surface configure at {} line {}", file!(), line!());
surface.configure(&device, &surface_config); surface.configure(&device, &surface_config);
in_bad_state = false; recreate_surface = false;
} }
}, },
Suspended => (), Suspended => {
recreate_surface = true;
},
_ => (), _ => (),
} }
}); });