Skip to content

Commit 4b6bcee

Browse files
authored
Merge pull request #89 from Swoorup/update-deps
Update dependencies and fix API changes
2 parents c95c546 + 7306ab5 commit 4b6bcee

5 files changed

Lines changed: 13 additions & 12 deletions

File tree

Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ data-encoding = "2.5"
2020
educe = "0.6"
2121
derive_builder = "0.20"
2222
derive_more = { version = "2.0", features = ["full"] }
23-
encase = "0.11"
23+
encase = "0.12"
2424
enumflags2 = "0.7"
2525
futures = "0.3"
2626
fxhash = "0.2"
@@ -30,8 +30,8 @@ include_absolute_path = "0.1"
3030
indexmap = "2.7"
3131
indoc = "2.0"
3232
miette = "7.5"
33-
naga = { version = "25.0", features = ["wgsl-in", "wgsl-out"] }
34-
naga_oil = "0.18"
33+
naga = { version = "26", features = ["wgsl-in", "wgsl-out"] }
34+
naga_oil = "0.19"
3535
pathdiff = "0.2"
3636
pretty_assertions = "1.4"
3737
prettyplease = "0.2"
@@ -45,9 +45,9 @@ strum = "0.27"
4545
strum_macros = "0.27"
4646
syn = "2.0"
4747
thiserror = "2.0"
48-
wgpu = "25.0"
49-
wgpu-types = "25.0"
48+
wgpu = "26"
49+
wgpu-types = "26"
5050
winit = "0.30"
5151
insta = "1.43"
5252
stdext = "0.3.1"
53-
toml = "0.8"
53+
toml = "0.9"

example/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ winit.workspace = true
1010
wgpu = { workspace = true, features = ["naga-ir"] }
1111
futures.workspace = true
1212
bytemuck = { workspace = true, features = ["derive"] }
13-
encase = { workspace = true, features = ["glam"] }
13+
encase = { workspace = true }
1414
glam = { workspace = true, features = ["bytemuck"] }
1515
naga_oil.workspace = true
1616
include_absolute_path.workspace = true

example/src/demos/particle_compute_demo.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ impl Demo for ParticleComputeDemo {
370370
});
371371

372372
// Poll the device to complete the mapping
373-
let _ = device.poll(wgpu::MaintainBase::Wait);
373+
let _ = device.poll(wgpu::PollType::Wait).unwrap();
374374

375375
// Process the mapped data
376376
if let Ok(Ok(())) = futures::executor::block_on(rx) {

example/src/main.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ impl State {
200200
static mut COUNTER: u32 = 0;
201201
unsafe {
202202
COUNTER += 1;
203-
if COUNTER % 60 == 0 {
203+
if COUNTER.is_multiple_of(60) {
204204
// Print every 60 mouse moves
205205
println!(
206206
"Mouse: physical=({:.0}, {:.0}) window_size=({}, {}) normalized=({:.2}, {:.2})",
@@ -233,7 +233,7 @@ impl State {
233233
static mut RENDER_COUNTER: u32 = 0;
234234
unsafe {
235235
RENDER_COUNTER += 1;
236-
if RENDER_COUNTER % 180 == 0 {
236+
if RENDER_COUNTER.is_multiple_of(180) {
237237
// Print every 3 seconds at 60fps
238238
println!(
239239
"GPU uniforms: mouse=({:.2}, {:.2}) frame_size=({:.0}, {:.0})",
@@ -267,6 +267,7 @@ impl State {
267267
label: Some("Render Pass"),
268268
color_attachments: &[Some(wgpu::RenderPassColorAttachment {
269269
view: &output_view,
270+
depth_slice: None,
270271
resolve_target: None,
271272
ops: wgpu::Operations {
272273
load: wgpu::LoadOp::Clear(wgpu::Color::BLACK),

example/src/shader_bindings.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// File automatically generated by wgsl_bindgen^
22
//
3-
// ^ wgsl_bindgen version 0.21.0
3+
// ^ wgsl_bindgen version 0.21.1
44
// Changes made to this file will not be saved.
5-
// SourceHash: 82cb0f3508ed747301cbee8f93e2d976ff91e674b25617e3670fdb88f79168f7
5+
// SourceHash: 2912961085980a9d91157db974fb697dce154c7d497643300598dd056b157885
66

77
#![allow(unused, non_snake_case, non_camel_case_types, non_upper_case_globals)]
88
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]

0 commit comments

Comments
 (0)