me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2122 from iced-rs/update-wgpu

Browse source 
Update `wgpu` to `0.18` and `cosmic-text` to `0.10`
This commit is contained in:
Héctor Ramón 2023-10-27 03:41:16 +02:00 • committed by GitHub
commit 8e6f131a06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 28 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Cargo.toml
View file

@ -114,10 +114,10 @@ iced_winit = { version = "0.12", path = "winit" }
async-std = "1.0" async-std = "1.0"
bitflags = "1.0" bitflags = "1.0"
bytemuck = { version = "1.0", features = ["derive"] } bytemuck = { version = "1.0", features = ["derive"] }
cosmic-text = "0.9" cosmic-text = "0.10"
futures = "0.3" futures = "0.3"
glam = "0.24" glam = "0.24"
glyphon = { git = "https://github.com/grovesNL/glyphon.git", rev = "20f0f8fa80e0d0df4c63634ce9176fa489546ca9" } glyphon = { git = "https://github.com/hecrj/glyphon.git", rev = "2caa9fc5e5923c1d827d177c3619cab7e9885b85" }
guillotiere = "0.6" guillotiere = "0.6"
half = "2.2" half = "2.2"
image = "0.24" image = "0.24"
@ -147,7 +147,7 @@ unicode-segmentation = "1.0"
wasm-bindgen-futures = "0.4" wasm-bindgen-futures = "0.4"
wasm-timer = "0.2" wasm-timer = "0.2"
web-sys = "0.3" web-sys = "0.3"
wgpu = "0.17" wgpu = "0.18"
winapi = "0.3" winapi = "0.3"
window_clipboard = "0.3" window_clipboard = "0.3"
winit = { git = "https://github.com/iced-rs/winit.git", rev = "c52db2045d0a2f1b8d9923870de1d4ab1994146e", default-features = false } winit = { git = "https://github.com/iced-rs/winit.git", rev = "c52db2045d0a2f1b8d9923870de1d4ab1994146e", default-features = false }

4
examples/integration/src/scene.rs
View file

@ -36,10 +36,12 @@ impl Scene {
a: a as f64, a: a as f64,
} }
}), }),
store: true, store: wgpu::StoreOp::Store,
}, },
})], })],
depth_stencil_attachment: None, depth_stencil_attachment: None,
timestamp_writes: None,
occlusion_query_set: None,
}) })
} }

9
graphics/src/text.rs
View file

@ -22,12 +22,11 @@ pub struct FontSystem {
impl FontSystem { impl FontSystem {
pub fn new() -> Self { pub fn new() -> Self {
FontSystem { FontSystem {
raw: RwLock::new(cosmic_text::FontSystem::new_with_fonts( raw: RwLock::new(cosmic_text::FontSystem::new_with_fonts([
[cosmic_text::fontdb::Source::Binary(Arc::new( cosmic_text::fontdb::Source::Binary(Arc::new(
include_bytes!("../fonts/Iced-Icons.ttf").as_slice(), include_bytes!("../fonts/Iced-Icons.ttf").as_slice(),
))] )),
.into_iter(), ])),
)),
version: Version::default(), version: Version::default(),
} }
} }

8
wgpu/src/backend.rs
View file

@ -222,10 +222,12 @@ impl Backend {
}), }),
None => wgpu::LoadOp::Load, None => wgpu::LoadOp::Load,
}, },
store: true, store: wgpu::StoreOp::Store,
}, },
})], })],
depth_stencil_attachment: None, depth_stencil_attachment: None,
timestamp_writes: None,
occlusion_query_set: None,
}, },
)); ));
@ -271,11 +273,13 @@ impl Backend {
resolve_target: None, resolve_target: None,
ops: wgpu::Operations { ops: wgpu::Operations {
load: wgpu::LoadOp::Load, load: wgpu::LoadOp::Load,
store: true, store: wgpu::StoreOp::Store,
}, },
}, },
)], )],
depth_stencil_attachment: None, depth_stencil_attachment: None,
timestamp_writes: None,
occlusion_query_set: None,
}, },
)); ));
} }

4
wgpu/src/color.rs
View file

@ -143,10 +143,12 @@ pub fn convert(
resolve_target: None, resolve_target: None,
ops: wgpu::Operations { ops: wgpu::Operations {
load: wgpu::LoadOp::Load, load: wgpu::LoadOp::Load,
store: true, store: wgpu::StoreOp::Store,
}, },
})], })],
depth_stencil_attachment: None, depth_stencil_attachment: None,
timestamp_writes: None,
occlusion_query_set: None,
}); });
pass.set_pipeline(&pipeline); pass.set_pipeline(&pipeline);

7
wgpu/src/triangle.rs
View file

@ -300,10 +300,15 @@ impl Pipeline {
wgpu::RenderPassColorAttachment { wgpu::RenderPassColorAttachment {
view: attachment, view: attachment,
resolve_target, resolve_target,
ops: wgpu::Operations { load, store: true }, ops: wgpu::Operations {
load,
store: wgpu::StoreOp::Store,
},
}, },
)], )],
depth_stencil_attachment: None, depth_stencil_attachment: None,
timestamp_writes: None,
occlusion_query_set: None,
}); });
let layer = &mut self.layers[layer]; let layer = &mut self.layers[layer];

4
wgpu/src/triangle/msaa.rs
View file

@ -167,10 +167,12 @@ impl Blit {
resolve_target: None, resolve_target: None,
ops: wgpu::Operations { ops: wgpu::Operations {
load: wgpu::LoadOp::Load, load: wgpu::LoadOp::Load,
store: true, store: wgpu::StoreOp::Store,
}, },
})], })],
depth_stencil_attachment: None, depth_stencil_attachment: None,
timestamp_writes: None,
occlusion_query_set: None,
}); });
render_pass.set_pipeline(&self.pipeline); render_pass.set_pipeline(&self.pipeline);