Skip to content

Commit 1ca5d24

Browse files
authored
Merge pull request #83 from PolyMeilex/wgpu-update
Update wgpu 0.12
2 parents de88c5c + 58be22c commit 1ca5d24

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ readme = "README.md"
1212
resolver = "2"
1313

1414
[dependencies]
15-
wgpu = "0.11"
15+
wgpu = "0.12"
1616
glyph_brush = "0.7"
1717
log = "0.4"
1818

@@ -21,6 +21,6 @@ version = "1.4"
2121
features = ["derive"]
2222

2323
[dev-dependencies]
24-
env_logger = "0.7"
25-
winit = "0.24"
24+
env_logger = "0.9"
25+
winit = "0.26"
2626
futures = "0.3"

src/pipeline.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -236,10 +236,7 @@ fn build<D>(
236236
wgpu::BindGroupLayoutEntry {
237237
binding: 1,
238238
visibility: wgpu::ShaderStages::FRAGMENT,
239-
ty: wgpu::BindingType::Sampler {
240-
filtering: true,
241-
comparison: false,
242-
},
239+
ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Filtering),
243240
count: None,
244241
},
245242
wgpu::BindGroupLayoutEntry {
@@ -333,6 +330,7 @@ fn build<D>(
333330
write_mask: wgpu::ColorWrites::ALL,
334331
}],
335332
}),
333+
multiview: None,
336334
});
337335

338336
Pipeline {

src/shader/glyph.wgsl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
[[block]]
21
struct Globals {
32
transform: mat4x4<f32>;
43
};

0 commit comments

Comments
 (0)