From 4e391013c8bf8544fb766bee5dbae10cfdbc9d93 Mon Sep 17 00:00:00 2001 From: Billy Messenger Date: Wed, 16 Dec 2020 10:03:51 -0600 Subject: don't panic when swapchain frame is outdated --- winit/src/application.rs | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'winit') diff --git a/winit/src/application.rs b/winit/src/application.rs index d1a94864..f19526cb 100644 --- a/winit/src/application.rs +++ b/winit/src/application.rs @@ -311,27 +311,32 @@ async fn run_instance( viewport_version = current_viewport_version; } - let new_mouse_interaction = compositor.draw( + if let Ok(new_mouse_interaction) = compositor.draw( &mut renderer, &mut swap_chain, state.viewport(), state.background_color(), &primitive, &debug.overlay(), - ); + ) { + debug.render_finished(); - debug.render_finished(); + if new_mouse_interaction != mouse_interaction { + window.set_cursor_icon(conversion::mouse_interaction( + new_mouse_interaction, + )); - if new_mouse_interaction != mouse_interaction { - window.set_cursor_icon(conversion::mouse_interaction( - new_mouse_interaction, - )); - - mouse_interaction = new_mouse_interaction; - } + mouse_interaction = new_mouse_interaction; + } // TODO: Handle animations! // Maybe we can use `ControlFlow::WaitUntil` for this. + } else { + debug.render_finished(); + + // Rendering could not complete, try again next frame. + window.request_redraw(); + } } event::Event::WindowEvent { event: window_event, -- cgit