Merge pull request #75 from Yatekii/wgpu-0.11

Yatekii · Oct 8, 2021 · 7258bbc · 7258bbc
2 parents e04038f + 685c876
commit 7258bbc
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,9 @@ Per Keep a Changelog there are 6 main categories of changes:
 
 ## Unreleased
 
+#### Updated
+- updated wgpu dependency to `>=0.10,<0.12`
+
 ## v0.17.1
 
 Released 2021-09-22

diff --git a/Cargo.toml b/Cargo.toml
@@ -51,7 +51,7 @@ bytemuck = "1"
 imgui = ">=0.1, <0.9"
 log = "0.4"
 smallvec = "1"
-wgpu = "0.10"
+wgpu = ">=0.10, <0.12"
 
 [dev-dependencies]
 bytemuck = { version = "1.4", features = ["derive"] }

diff --git a/examples/hello-world.rs b/examples/hello-world.rs
@@ -41,6 +41,7 @@ fn main() {
     let adapter = block_on(instance.request_adapter(&wgpu::RequestAdapterOptions {
         power_preference: wgpu::PowerPreference::HighPerformance,
         compatible_surface: Some(&surface),
+        force_fallback_adapter: false,
     }))
     .unwrap();
 
@@ -152,7 +153,7 @@ fn main() {
                 imgui.io_mut().update_delta_time(now - last_frame);
                 last_frame = now;
 
-                let frame = match surface.get_current_frame() {
+                let frame = match surface.get_current_texture() {
                     Ok(frame) => frame,
                     Err(e) => {
                         eprintln!("dropped frame: {:?}", e);
@@ -222,6 +223,8 @@ fn main() {
                 drop(rpass);
 
                 queue.submit(Some(encoder.finish()));
+
+                frame.submit();
             }
             _ => (),
         }

diff --git a/simple-api/Cargo.toml b/simple-api/Cargo.toml
@@ -21,5 +21,5 @@ imgui-wgpu = { path = ".." }
 imgui-winit-support = "0.8"
 pollster = "0.2" # for block_on executor
 winit = "0.25"
-wgpu = "0.10"
+wgpu = "0.11"
 
diff --git a/simple-api/src/lib.rs b/simple-api/src/lib.rs
@@ -103,6 +103,7 @@ pub fn run<YourState: 'static, UiFunction: 'static + Fn(&imgui::Ui, &mut YourSta
     let adapter = block_on(instance.request_adapter(&wgpu::RequestAdapterOptions {
         power_preference: wgpu::PowerPreference::HighPerformance,
         compatible_surface: Some(&surface),
+        force_fallback_adapter: false,
     }))
     .unwrap();
 
@@ -205,7 +206,7 @@ pub fn run<YourState: 'static, UiFunction: 'static + Fn(&imgui::Ui, &mut YourSta
                 imgui.io_mut().update_delta_time(now - last_frame);
                 last_frame = now;
 
-                let frame = match surface.get_current_frame() {
+                let frame = match surface.get_current_texture() {
                     Ok(frame) => frame,
                     Err(e) => {
                         eprintln!("dropped frame: {:?}", e);
@@ -228,7 +229,6 @@ pub fn run<YourState: 'static, UiFunction: 'static + Fn(&imgui::Ui, &mut YourSta
                 }
 
                 let view = frame
-                    .output
                     .texture
                     .create_view(&wgpu::TextureViewDescriptor::default());
                 let mut rpass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
@@ -251,6 +251,7 @@ pub fn run<YourState: 'static, UiFunction: 'static + Fn(&imgui::Ui, &mut YourSta
                 drop(rpass);
 
                 queue.submit(Some(encoder.finish()));
+                frame.present();
             }
             Event::WindowEvent { ref event, .. } => {
                 (config.on_event)(event, &mut state);