Merge pull request #104 from Calcoph/master

update to wgpu 0.18
Yatekii · Feb 9, 2024 · 798a498 · 798a498
2 parents 89394e0 + 53abff5
commit 798a498
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -37,6 +37,7 @@ Per Keep a Changelog there are 6 main categories of changes:
 ## Unreleased
 
 - Internal: Fixed Scissor-Rect to not span across Framebuffersize, by limiting to framebuffer width. @PixelboysTM
+- Bump wgpu version to 0.18. @calcoph
 
 ## v0.24.0
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -46,7 +46,7 @@ bytemuck = "1"
 imgui = "0.11"
 log = "0.4"
 smallvec = "1"
-wgpu = "0.17"
+wgpu = "0.18"
 
 [dev-dependencies]
 bytemuck = { version = "1.13", features = ["derive"] }

diff --git a/examples/cube.rs b/examples/cube.rs
@@ -307,10 +307,12 @@ impl Example {
                             b: 0.3,
                             a: 1.0,
                         }),
-                        store: true,
+                        store: wgpu::StoreOp::Store,
                     },
                 })],
                 depth_stencil_attachment: None,
+                timestamp_writes: None,
+                occlusion_query_set: None,
             });
             rpass.push_debug_group("Prepare data for draw.");
             rpass.set_pipeline(&self.pipeline);
@@ -566,10 +568,12 @@ fn main() {
                         ops: wgpu::Operations {
                             load: wgpu::LoadOp::Load, // Do not clear
                             // load: wgpu::LoadOp::Clear(clear_color),
-                            store: true,
+                            store: wgpu::StoreOp::Store,
                         },
                     })],
                     depth_stencil_attachment: None,
+                    timestamp_writes: None,
+                    occlusion_query_set: None,
                 });
 
                 renderer

diff --git a/examples/custom-texture.rs b/examples/custom-texture.rs
@@ -229,10 +229,12 @@ fn main() {
                         resolve_target: None,
                         ops: wgpu::Operations {
                             load: wgpu::LoadOp::Clear(clear_color),
-                            store: true,
+                            store: wgpu::StoreOp::Store,
                         },
                     })],
                     depth_stencil_attachment: None,
+                    timestamp_writes: None,
+                    occlusion_query_set: None,
                 });
 
                 renderer

diff --git a/examples/hello-world.rs b/examples/hello-world.rs
@@ -214,10 +214,12 @@ fn main() {
                         resolve_target: None,
                         ops: wgpu::Operations {
                             load: wgpu::LoadOp::Clear(clear_color),
-                            store: true,
+                            store: wgpu::StoreOp::Store,
                         },
                     })],
                     depth_stencil_attachment: None,
+                    timestamp_writes: None,
+                    occlusion_query_set: None,
                 });
 
                 renderer

diff --git a/src/lib.rs b/src/lib.rs
@@ -730,8 +730,12 @@ impl Renderer {
                     let scissors = (
                         clip_rect[0].max(0.0).floor() as u32,
                         clip_rect[1].max(0.0).floor() as u32,
-                        (clip_rect[2].min(fb_size[0]) - clip_rect[0].max(0.0)).abs().ceil() as u32,
-                        (clip_rect[3].min(fb_size[1]) - clip_rect[1].max(0.0)).abs().ceil() as u32,
+                        (clip_rect[2].min(fb_size[0]) - clip_rect[0].max(0.0))
+                            .abs()
+                            .ceil() as u32,
+                        (clip_rect[3].min(fb_size[1]) - clip_rect[1].max(0.0))
+                            .abs()
+                            .ceil() as u32,
                     );
 
                     // XXX: Work-around for wgpu issue [1] by only issuing draw