Skip to content

Commit c1962ae

Browse files
authored
Update dependencies (#230)
* Move to Edition 2021 * Update `wgpu`, `raw-window-handle`, and all dependencies for the examples * Update MSRV * Closes #244
1 parent 32e14da commit c1962ae

23 files changed

Lines changed: 109 additions & 111 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
rust:
1414
- stable
1515
- beta
16-
- 1.54.0
16+
- 1.57.0
1717
steps:
1818
- name: Checkout sources
1919
uses: actions/checkout@v2
@@ -73,7 +73,7 @@ jobs:
7373
rust:
7474
- stable
7575
- beta
76-
- 1.54.0
76+
- 1.57.0
7777
steps:
7878
- name: Checkout sources
7979
uses: actions/checkout@v2

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "pixels"
33
description = "A tiny library providing a GPU-powered pixel frame buffer."
44
version = "0.8.0"
55
authors = ["Jay Oster <jay@kodewerx.org>"]
6-
edition = "2018"
6+
edition = "2021"
77
repository = "https://github.com/parasyte/pixels"
88
readme = "README.md"
99
keywords = ["pixels", "2D", "GPU", "framebuffer"]
@@ -20,17 +20,17 @@ include = [
2020

2121
[dependencies]
2222
bytemuck = "1.7"
23-
raw-window-handle = "0.3"
23+
raw-window-handle = "0.4"
2424
thiserror = "1.0"
2525
ultraviolet = "0.8"
26-
wgpu = "0.11"
26+
wgpu = "0.12"
2727

2828
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
2929
pollster = "0.2"
3030

3131
[dev-dependencies]
3232
pixels-mocks = { path = "internals/pixels-mocks" }
33-
winit = "0.25"
33+
winit = "0.26"
3434

3535
[workspace]
3636
resolver = "2"

MSRV.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
| `pixels` version | `rustc` version |
44
|------------------|-----------------|
5-
| `0.9.0` | `1.54.0` |
5+
| `0.9.0` | `1.57.0` |
66
| `0.8.0` | `1.52.0` |
77
| `0.7.0` | `1.52.0` |
88
| `0.6.0` | `1.52.0` |

examples/conway/Cargo.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
name = "conway"
33
version = "0.1.0"
44
authors = ["Jay Oster <jay@kodewerx.org>"]
5-
edition = "2018"
6-
resolver = "2"
5+
edition = "2021"
76
publish = false
87

98
[features]
@@ -18,5 +17,5 @@ line_drawing = "1.0"
1817
log = "0.4"
1918
pixels = { path = "../.." }
2019
randomize = "3.0"
21-
winit = "0.25"
22-
winit_input_helper = "0.10"
20+
winit = "0.26"
21+
winit_input_helper = "0.11"

examples/custom-shader/Cargo.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
name = "custom-shader"
33
version = "0.1.0"
44
authors = ["Jay Oster <jay@kodewerx.org>"]
5-
edition = "2018"
6-
resolver = "2"
5+
edition = "2021"
76
publish = false
87

98
[features]
@@ -15,5 +14,5 @@ bytemuck = "1.7"
1514
env_logger = "0.9"
1615
log = "0.4"
1716
pixels = { path = "../.." }
18-
winit = "0.25"
19-
winit_input_helper = "0.10"
17+
winit = "0.26"
18+
winit_input_helper = "0.11"

examples/custom-shader/shaders/noise.wgsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ fn vs_main(
1919

2020
[[group(0), binding(0)]] var r_tex_color: texture_2d<f32>;
2121
[[group(0), binding(1)]] var r_tex_sampler: sampler;
22-
[[block]] struct Locals {
22+
struct Locals {
2323
time: f32;
2424
};
2525
[[group(0), binding(2)]] var<uniform> r_locals: Locals;

examples/custom-shader/src/renderers.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,7 @@ impl NoiseRenderer {
8484
wgpu::BindGroupLayoutEntry {
8585
binding: 1,
8686
visibility: wgpu::ShaderStages::FRAGMENT,
87-
ty: wgpu::BindingType::Sampler {
88-
filtering: true,
89-
comparison: false,
90-
},
87+
ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Filtering),
9188
count: None,
9289
},
9390
wgpu::BindGroupLayoutEntry {
@@ -139,6 +136,7 @@ impl NoiseRenderer {
139136
write_mask: wgpu::ColorWrites::ALL,
140137
}],
141138
}),
139+
multiview: None,
142140
});
143141

144142
Self {

examples/imgui-winit/Cargo.toml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
name = "imgui-winit"
33
version = "0.1.0"
44
authors = ["Jay Oster <jay@kodewerx.org>"]
5-
edition = "2018"
6-
resolver = "2"
5+
edition = "2021"
76
publish = false
87

98
[features]
@@ -13,9 +12,9 @@ default = ["optimize"]
1312
[dependencies]
1413
env_logger = "0.9"
1514
imgui = "0.8"
16-
imgui-wgpu = "0.18"
17-
imgui-winit-support = { version = "0.8", default-features = false, features = ["winit-25"] }
15+
imgui-wgpu = "0.19"
16+
imgui-winit-support = { version = "0.8", default-features = false, features = ["winit-26"] }
1817
log = "0.4"
1918
pixels = { path = "../.." }
20-
winit = "0.25"
21-
winit_input_helper = "0.10"
19+
winit = "0.26"
20+
winit_input_helper = "0.11"

examples/invaders/Cargo.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
name = "invaders"
33
version = "0.1.0"
44
authors = ["Jay Oster <jay@kodewerx.org>"]
5-
edition = "2018"
6-
resolver = "2"
5+
edition = "2021"
76
publish = false
87

98
[features]
@@ -19,5 +18,5 @@ log = "0.4"
1918
pixels = { path = "../.." }
2019
randomize = "3.0"
2120
simple-invaders = { path = "simple-invaders" }
22-
winit = "0.25"
23-
winit_input_helper = "0.10"
21+
winit = "0.26"
22+
winit_input_helper = "0.11"

examples/minimal-egui/Cargo.toml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,19 @@
22
name = "minimal-egui"
33
version = "0.1.0"
44
authors = ["Jay Oster <jay@kodewerx.org>"]
5-
edition = "2018"
6-
resolver = "2"
5+
edition = "2021"
76
publish = false
87

98
[features]
109
optimize = ["log/release_max_level_warn"]
1110
default = ["optimize"]
1211

1312
[dependencies]
14-
egui = "0.15"
15-
egui_wgpu_backend = "0.14"
16-
egui-winit = { version = "0.15", default-features = false, features = ["links"] }
13+
egui = "0.16"
14+
egui_wgpu_backend = "0.16"
15+
egui-winit = { version = "0.16", default-features = false, features = ["links"] }
1716
env_logger = "0.9"
1817
log = "0.4"
1918
pixels = { path = "../.." }
20-
winit = "0.25"
21-
winit_input_helper = "0.10"
19+
winit = "0.26"
20+
winit_input_helper = "0.11"

0 commit comments

Comments
 (0)