Skip to content

Commit d4f8e19

Browse files
hecrjhecrj
authored
Merge pull request #3019 from iced-rs/wgpu-26
Update `wgpu` to `26`
2 parents 71b0b6a + 195146b commit d4f8e19

File tree

11 files changed

+435
-385
lines changed

11 files changed

+435
-385
lines changed

‎Cargo.lock‎

Lines changed: 384 additions & 337 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ cosmic-text = "0.14"
174174
dark-light = "2.0"
175175
futures = { version = "0.3", default-features = false }
176176
glam = "0.25"
177-
cryoglyph = { git = "https://github.com/iced-rs/cryoglyph.git", rev = "a456d1c17bbcf33afcca41d9e5e299f9f1193819" }
177+
cryoglyph = { git = "https://github.com/iced-rs/cryoglyph.git", rev = "453cedec0d2ec563bd7fa87e84a2319bcebb1ba3" }
178178
guillotiere = "0.6"
179179
half = "2.2"
180180
image = { version = "0.25", default-features = false }
@@ -211,7 +211,7 @@ wasm-bindgen-futures = "0.4"
211211
wasmtimer = "0.4.1"
212212
web-sys = "0.3.69"
213213
web-time = "1.1"
214-
wgpu = "24.0"
214+
wgpu = "26.0"
215215
window_clipboard = "0.4.1"
216216
winit = { git = "https://github.com/iced-rs/winit.git", rev = "11414b6aa45699f038114e61b4ddf5102b2d3b4b" }
217217

‎benches/wgpu.rs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,15 @@ pub fn wgpu_benchmark(c: &mut Criterion) {
3232
))
3333
.expect("request adapter");
3434

35-
let (device, queue) = executor::block_on(adapter.request_device(
36-
&wgpu::DeviceDescriptor {
35+
let (device, queue) =
36+
executor::block_on(adapter.request_device(&wgpu::DeviceDescriptor {
3737
label: None,
3838
required_features: wgpu::Features::empty(),
3939
required_limits: wgpu::Limits::default(),
4040
memory_hints: wgpu::MemoryHints::MemoryUsage,
41-
},
42-
None,
43-
))
44-
.expect("request device");
41+
trace: wgpu::Trace::Off,
42+
}))
43+
.expect("request device");
4544

4645
c.bench_function("wgpu — canvas (light)", |b| {
4746
benchmark(b, &adapter, &device, &queue, |_| scene(10));
@@ -140,7 +139,7 @@ fn benchmark<'a>(
140139
&viewport,
141140
);
142141

143-
let _ = device.poll(wgpu::Maintain::WaitForSubmissionIndex(submission));
142+
let _ = device.poll(wgpu::PollType::WaitForSubmissionIndex(submission));
144143

145144
i += 1;
146145
});

‎examples/custom_shader/src/scene/pipeline.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,7 @@ impl Pipeline {
369369
color_attachments: &[Some(
370370
wgpu::RenderPassColorAttachment {
371371
view: target,
372+
depth_slice: None,
372373
resolve_target: None,
373374
ops: wgpu::Operations {
374375
load: wgpu::LoadOp::Load,
@@ -568,6 +569,7 @@ impl DepthPipeline {
568569
label: Some("cubes.pipeline.depth_pass"),
569570
color_attachments: &[Some(wgpu::RenderPassColorAttachment {
570571
view: target,
572+
depth_slice: None,
571573
resolve_target: None,
572574
ops: wgpu::Operations {
573575
load: wgpu::LoadOp::Load,

‎examples/integration/src/main.rs‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -96,17 +96,14 @@ pub fn main() -> Result<(), winit::error::EventLoopError> {
9696
let capabilities = surface.get_capabilities(&adapter);
9797

9898
let (device, queue) = adapter
99-
.request_device(
100-
&wgpu::DeviceDescriptor {
101-
label: None,
102-
required_features: adapter_features
103-
& wgpu::Features::default(),
104-
required_limits: wgpu::Limits::default(),
105-
memory_hints:
106-
wgpu::MemoryHints::MemoryUsage,
107-
},
108-
None,
109-
)
99+
.request_device(&wgpu::DeviceDescriptor {
100+
label: None,
101+
required_features: adapter_features
102+
& wgpu::Features::default(),
103+
required_limits: wgpu::Limits::default(),
104+
memory_hints: wgpu::MemoryHints::MemoryUsage,
105+
trace: wgpu::Trace::Off,
106+
})
110107
.await
111108
.expect("Request device");
112109

‎examples/integration/src/scene.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ impl Scene {
2424
label: None,
2525
color_attachments: &[Some(wgpu::RenderPassColorAttachment {
2626
view: target,
27+
depth_slice: None,
2728
resolve_target: None,
2829
ops: wgpu::Operations {
2930
load: wgpu::LoadOp::Clear({

‎wgpu/src/color.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ pub fn convert(
184184
label: Some("iced_wgpu.offscreen.blit.render_pass"),
185185
color_attachments: &[Some(wgpu::RenderPassColorAttachment {
186186
view,
187+
depth_slice: None,
187188
resolve_target: None,
188189
ops: wgpu::Operations {
189190
load: wgpu::LoadOp::Load,

‎wgpu/src/lib.rs‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ impl Renderer {
284284
let _ = self
285285
.engine
286286
.device
287-
.poll(wgpu::Maintain::WaitForSubmissionIndex(index));
287+
.poll(wgpu::PollType::WaitForSubmissionIndex(index));
288288

289289
let mapped_buffer = slice.get_mapped_range();
290290

@@ -426,6 +426,7 @@ impl Renderer {
426426
label: Some("iced_wgpu render pass"),
427427
color_attachments: &[Some(wgpu::RenderPassColorAttachment {
428428
view: frame,
429+
depth_slice: None,
429430
resolve_target: None,
430431
ops: wgpu::Operations {
431432
load: match clear_color {
@@ -514,6 +515,7 @@ impl Renderer {
514515
color_attachments: &[Some(
515516
wgpu::RenderPassColorAttachment {
516517
view: frame,
518+
depth_slice: None,
517519
resolve_target: None,
518520
ops: wgpu::Operations {
519521
load: wgpu::LoadOp::Load,
@@ -560,6 +562,7 @@ impl Renderer {
560562
color_attachments: &[Some(
561563
wgpu::RenderPassColorAttachment {
562564
view: frame,
565+
depth_slice: None,
563566
resolve_target: None,
564567
ops: wgpu::Operations {
565568
load: wgpu::LoadOp::Load,
@@ -831,21 +834,20 @@ impl renderer::Headless for Renderer {
831834
force_fallback_adapter: false,
832835
compatible_surface: None,
833836
})
834-
.await?;
837+
.await
838+
.ok()?;
835839

836840
let (device, queue) = adapter
837-
.request_device(
838-
&wgpu::DeviceDescriptor {
839-
label: Some("iced_wgpu [headless]"),
840-
required_features: wgpu::Features::empty(),
841-
required_limits: wgpu::Limits {
842-
max_bind_groups: 2,
843-
..wgpu::Limits::default()
844-
},
845-
memory_hints: wgpu::MemoryHints::MemoryUsage,
841+
.request_device(&wgpu::DeviceDescriptor {
842+
label: Some("iced_wgpu [headless]"),
843+
required_features: wgpu::Features::empty(),
844+
required_limits: wgpu::Limits {
845+
max_bind_groups: 2,
846+
..wgpu::Limits::default()
846847
},
847-
None,
848-
)
848+
memory_hints: wgpu::MemoryHints::MemoryUsage,
849+
trace: wgpu::Trace::Off,
850+
})
849851
.await
850852
.ok()?;
851853

‎wgpu/src/triangle.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,7 @@ fn render<'a>(
335335
label: Some("iced_wgpu.triangle.render_pass"),
336336
color_attachments: &[Some(wgpu::RenderPassColorAttachment {
337337
view: target,
338+
depth_slice: None,
338339
resolve_target: None,
339340
ops: wgpu::Operations {
340341
load: wgpu::LoadOp::Load,

‎wgpu/src/triangle/msaa.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ impl Pipeline {
167167
label: Some("iced_wgpu.triangle.render_pass"),
168168
color_attachments: &[Some(wgpu::RenderPassColorAttachment {
169169
view: &targets.attachment,
170+
depth_slice: None,
170171
resolve_target: Some(&targets.resolve),
171172
ops: wgpu::Operations {
172173
load: wgpu::LoadOp::Clear(wgpu::Color::TRANSPARENT),
@@ -340,6 +341,7 @@ impl State {
340341
label: Some("iced_wgpu::triangle::msaa render pass"),
341342
color_attachments: &[Some(wgpu::RenderPassColorAttachment {
342343
view: target,
344+
depth_slice: None,
343345
resolve_target: None,
344346
ops: wgpu::Operations {
345347
load: wgpu::LoadOp::Load,

0 commit comments

Comments
 (0)