fixes #285

code/beginner/tutorial2-surface/src/challenge.rs

@@ -168,7 +168,7 @@ fn main() {
                     }
                 }
             }
-            Event::RedrawRequested(_) => {
+            Event::RedrawRequested(window_id) if window_id == window.id() => {
                 state.update();
                 match state.render() {
                     Ok(_) => {}

code/beginner/tutorial2-surface/src/main.rs

@@ -24,7 +24,7 @@ impl State {
         let surface = unsafe { instance.create_surface(window) };
         let adapter = instance
             .request_adapter(&wgpu::RequestAdapterOptions {
-                power_preference: wgpu::PowerPreference::HighPerformance,
+                power_preference: wgpu::PowerPreference::default(),
                 compatible_surface: Some(&surface),
                 force_fallback_adapter: false,
             })
@@ -155,7 +155,7 @@ fn main() {
                     }
                 }
             }
-            Event::RedrawRequested(_) => {
+            Event::RedrawRequested(window_id) if window_id == window.id() => {
                 state.update();
                 match state.render() {
                     Ok(_) => {}

code/beginner/tutorial3-pipeline/src/challenge.rs

@@ -279,7 +279,7 @@ fn main() {
                     }
                 }
             }
-            Event::RedrawRequested(_) => {
+            Event::RedrawRequested(window_id) if window_id == window.id() => {
                 state.update();
                 match state.render() {
                     Ok(_) => {}

code/beginner/tutorial3-pipeline/src/main.rs

@@ -47,7 +47,7 @@ impl State {
 
         let config = wgpu::SurfaceConfiguration {
             usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
-            format: wgpu::TextureFormat::Bgra8UnormSrgb,
+            format: surface.get_preferred_format(&adapter).unwrap(),
             width: size.width,
             height: size.height,
             present_mode: wgpu::PresentMode::Fifo,
@@ -214,7 +214,7 @@ fn main() {
                     }
                 }
             }
-            Event::RedrawRequested(_) => {
+            Event::RedrawRequested(window_id) if window_id == window.id() => {
                 state.update();
                 match state.render() {
                     Ok(_) => {}

code/beginner/tutorial4-buffer/src/challenge.rs

@@ -356,7 +356,7 @@ fn main() {
                     }
                 }
             }
-            Event::RedrawRequested(_) => {
+            Event::RedrawRequested(window_id) if window_id == window.id() => {
                 state.update();
                 match state.render() {
                     Ok(_) => {}

code/beginner/tutorial4-buffer/src/main.rs

@@ -288,7 +288,7 @@ fn main() {
                     }
                 }
             }
-            Event::RedrawRequested(_) => {
+            Event::RedrawRequested(window_id) if window_id == window.id() => {
                 state.update();
                 match state.render() {
                     Ok(_) => {}

code/beginner/tutorial5-textures/src/challenge.rs

@@ -383,7 +383,7 @@ fn main() {
                     }
                 }
             }
-            Event::RedrawRequested(_) => {
+            Event::RedrawRequested(window_id) if window_id == window.id() => {
                 state.update();
                 match state.render() {
                     Ok(_) => {}

code/beginner/tutorial5-textures/src/main.rs

@@ -338,7 +338,7 @@ fn main() {
                     }
                 }
             }
-            Event::RedrawRequested(_) => {
+            Event::RedrawRequested(window_id) if window_id == window.id() => {
                 state.update();
                 match state.render() {
                     Ok(_) => {}

code/beginner/tutorial6-uniforms/src/challenge.rs

@@ -566,7 +566,7 @@ fn main() {
                     }
                 }
             }
-            Event::RedrawRequested(_) => {
+            Event::RedrawRequested(window_id) if window_id == window.id() => {
                 state.update();
                 match state.render() {
                     Ok(_) => {}

code/beginner/tutorial6-uniforms/src/main.rs

@@ -547,7 +547,7 @@ fn main() {
                     }
                 }
             }
-            Event::RedrawRequested(_) => {
+            Event::RedrawRequested(window_id) if window_id == window.id() => {
                 state.update();
                 match state.render() {
                     Ok(_) => {}

code/beginner/tutorial7-instancing/src/challenge.rs

@@ -695,7 +695,7 @@ fn main() {
                     }
                 }
             }
-            Event::RedrawRequested(_) => {
+            Event::RedrawRequested(window_id) if window_id == window.id() => {
                 state.update();
                 match state.render() {
                     Ok(_) => {}

code/beginner/tutorial7-instancing/src/main.rs

@@ -645,7 +645,7 @@ fn main() {
                     }
                 }
             }
-            Event::RedrawRequested(_) => {
+            Event::RedrawRequested(window_id) if window_id == window.id() => {
                 state.update();
                 match state.render() {
                     Ok(_) => {}

code/beginner/tutorial8-depth/src/challenge.rs

@@ -863,7 +863,7 @@ fn main() {
                     }
                 }
             }
-            Event::RedrawRequested(_) => {
+            Event::RedrawRequested(window_id) if window_id == window.id() => {
                 state.update();
                 match state.render() {
                     Ok(_) => {}

code/beginner/tutorial8-depth/src/main.rs

@@ -671,7 +671,7 @@ fn main() {
                     }
                 }
             }
-            Event::RedrawRequested(_) => {
+            Event::RedrawRequested(window_id) if window_id == window.id() => {
                 state.update();
                 match state.render() {
                     Ok(_) => {}

code/beginner/tutorial9-models/src/main.rs

@@ -587,7 +587,7 @@ fn main() {
                     }
                 }
             }
-            Event::RedrawRequested(_) => {
+            Event::RedrawRequested(window_id) if window_id == window.id() => {
                 state.update();
                 match state.render() {
                     Ok(_) => {}

code/intermediate/tutorial10-lighting/src/main.rs

@@ -726,7 +726,7 @@ fn main() {
                     }
                 }
             }
-            Event::RedrawRequested(_) => {
+            Event::RedrawRequested(window_id) if window_id == window.id() => {
                 state.update();
                 match state.render() {
                     Ok(_) => {}

code/intermediate/tutorial11-normals/src/main.rs

@@ -775,7 +775,7 @@ fn main() {
                     }
                 }
             }
-            Event::RedrawRequested(_) => {
+            Event::RedrawRequested(window_id) if window_id == window.id() => {
                 state.update();
                 match state.render() {
                     Ok(_) => {}

code/intermediate/tutorial12-camera/src/main.rs

@@ -689,7 +689,7 @@ fn main() {
                 }
             }
             // UPDATED!
-            Event::RedrawRequested(_) => {
+            Event::RedrawRequested(window_id) if window_id == window.id() => {
                 let now = std::time::Instant::now();
                 let dt = now - last_render_time;
                 last_render_time = now;

code/intermediate/tutorial13-threading/src/main.rs

@@ -682,7 +682,7 @@ fn main() {
                     _ => {}
                 }
             }
-            Event::RedrawRequested(_) => {
+            Event::RedrawRequested(window_id) if window_id == window.id() => {
                 let now = std::time::Instant::now();
                 let dt = now - last_render_time;
                 last_render_time = now;

code/showcase/compute/src/main.rs

@@ -636,7 +636,7 @@ fn main() {
                     }
                 }
             }
-            Event::RedrawRequested(_) => {
+            Event::RedrawRequested(window_id) if window_id == window.id() => {
                 let now = std::time::Instant::now();
                 let dt = now - last_render_time;
                 last_render_time = now;

code/showcase/pong/src/lib.rs

@@ -198,7 +198,7 @@ pub fn start() {
                 render.resize(size);
                 events.push(state::Event::Resize(size.width as f32, size.height as f32));
             }
-            Event::RedrawRequested(_) => {
+            Event::RedrawRequested(window_id) if window_id == window.id() => {
                 for event in &events {
                     match event {
                         state::Event::FocusChanged | state::Event::ButtonPressed => {

docs/beginner/tutorial2-surface/README.md

@@ -351,7 +351,7 @@ We need to update the event loop again to call this method. We'll also call upda
 event_loop.run(move |event, _, control_flow| {
     match event {
         // ...
-        Event::RedrawRequested(_) => {
+        Event::RedrawRequested(window_id) if window_id == window.id() => {
             state.update();
             match state.render() {
                 Ok(_) => {}

docs/intermediate/tutorial12-camera/README.md

@@ -431,7 +431,7 @@ fn main() {
         match event {
             // ...
             // UPDATED!
-            Event::RedrawRequested(_) => {
+            Event::RedrawRequested(window_id) if window_id == window.id() => {
                 let now = std::time::Instant::now();
                 let dt = now - last_render_time;
                 last_render_time = now;