From e70b01ccc076787dedcfc83bcca402ec88d94d0b Mon Sep 17 00:00:00 2001 From: psincf <44228825+psincf@users.noreply.github.com> Date: Mon, 22 Apr 2019 22:59:25 +0200 Subject: [PATCH] Fix winit event loop in the triangle example --- examples/hello_triangle_rust/main.rs | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/examples/hello_triangle_rust/main.rs b/examples/hello_triangle_rust/main.rs index 5e5dd070f..0c00d429b 100644 --- a/examples/hello_triangle_rust/main.rs +++ b/examples/hello_triangle_rust/main.rs @@ -60,8 +60,7 @@ fn main() { }); use wgpu::winit::{ - ControlFlow, ElementState, Event, EventsLoop, KeyboardInput, VirtualKeyCode, Window, - WindowEvent, + ElementState, Event, EventsLoop, KeyboardInput, VirtualKeyCode, Window, WindowEvent, }; let mut events_loop = EventsLoop::new(); @@ -81,9 +80,9 @@ fn main() { height: size.height.round() as u32, }, ); - - events_loop.run_forever(|event| { - match event { + let mut running = true; + while running { + events_loop.poll_events(|event| match event { Event::WindowEvent { event, .. } => match event { WindowEvent::KeyboardInput { input: @@ -94,14 +93,14 @@ fn main() { }, .. } => match code { - VirtualKeyCode::Escape => return ControlFlow::Break, + VirtualKeyCode::Escape => running = false, _ => {} }, - WindowEvent::CloseRequested => return ControlFlow::Break, + WindowEvent::CloseRequested => running = false, _ => {} }, _ => {} - } + }); let frame = swap_chain.get_next_texture(); let mut encoder = @@ -122,7 +121,5 @@ fn main() { } device.get_queue().submit(&[encoder.finish()]); - - ControlFlow::Continue - }); + } }