reivilibre
/
iced-mobile
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use latest `wgpu` releases instead of patched sources

This commit is contained in:
Héctor Ramón 2021-05-19 17:11:51 +07:00
parent 8b7452a55d
commit cf6af4c256
5 changed files with 31 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Cargo.toml
View File

@ -11,18 +11,6 @@ readme = "README.md"
keywords = ["gui", "ui", "graphics", "interface", "widgets"] keywords = ["gui", "ui", "graphics", "interface", "widgets"]
categories = ["gui"] categories = ["gui"]
[patch."https://github.com/gfx-rs/wgpu"]
wgpu-types = { git = "https://github.com/Dispersia/wgpu" }
wgpu-core = { git = "https://github.com/Dispersia/wgpu" }
[patch."https://github.com/gfx-rs/wgpu-rs"]
wgpu = { git = "https://github.com/Dispersia/wgpu-rs" }
[patch.crates-io]
wgpu-types = { git = "https://github.com/Dispersia/wgpu" }
wgpu-core = { git = "https://github.com/Dispersia/wgpu" }
wgpu = { git = "https://github.com/Dispersia/wgpu-rs" }
[features] [features]
default = ["wgpu", "default_system_font"] default = ["wgpu", "default_system_font"]
# Enables the `iced_wgpu` renderer # Enables the `iced_wgpu` renderer

4
wgpu/Cargo.toml
View File

@ -26,8 +26,8 @@ qr_code = ["iced_graphics/qr_code"]
default_system_font = ["iced_graphics/font-source"] default_system_font = ["iced_graphics/font-source"]
[dependencies] [dependencies]
wgpu = {git="https://github.com/Dispersia/wgpu-rs"} wgpu = "0.8"
wgpu_glyph = {git="https://github.com/Dispersia/wgpu_glyph", branch = "update-wgpu"} wgpu_glyph = "0.12"
glyph_brush = "0.7" glyph_brush = "0.7"
raw-window-handle = "0.3" raw-window-handle = "0.3"
log = "0.4" log = "0.4"

4
wgpu/src/image.rs
View File

@ -97,11 +97,13 @@ impl Pipeline {
entries: &[ entries: &[
wgpu::BindGroupEntry { wgpu::BindGroupEntry {
binding: 0, binding: 0,
resource: wgpu::BindingResource::Buffer { resource: wgpu::BindingResource::Buffer(
wgpu::BufferBinding {
buffer: &uniforms_buffer, buffer: &uniforms_buffer,
offset: 0, offset: 0,
size: None, size: None,
}, },
),
}, },
wgpu::BindGroupEntry { wgpu::BindGroupEntry {
binding: 1, binding: 1,

4
wgpu/src/quad.rs
View File

@ -47,11 +47,11 @@ impl Pipeline {
layout: &constant_layout, layout: &constant_layout,
entries: &[wgpu::BindGroupEntry { entries: &[wgpu::BindGroupEntry {
binding: 0, binding: 0,
resource: wgpu::BindingResource::Buffer { resource: wgpu::BindingResource::Buffer(wgpu::BufferBinding {
buffer: &constants_buffer, buffer: &constants_buffer,
offset: 0, offset: 0,
size: None, size: None,
}, }),
}], }],
}); });

24
wgpu/src/triangle.rs
View File

@ -110,13 +110,17 @@ impl Pipeline {
layout: &constants_layout, layout: &constants_layout,
entries: &[wgpu::BindGroupEntry { entries: &[wgpu::BindGroupEntry {
binding: 0, binding: 0,
resource: wgpu::BindingResource::Buffer { resource: wgpu::BindingResource::Buffer(
wgpu::BufferBinding {
buffer: &constants_buffer.raw, buffer: &constants_buffer.raw,
offset: 0, offset: 0,
size: wgpu::BufferSize::new( size: wgpu::BufferSize::new(std::mem::size_of::<
std::mem::size_of::<Uniforms>() as u64, Uniforms,
), >(
)
as u64),
}, },
),
}], }],
}); });
@ -256,15 +260,15 @@ impl Pipeline {
layout: &self.constants_layout, layout: &self.constants_layout,
entries: &[wgpu::BindGroupEntry { entries: &[wgpu::BindGroupEntry {
binding: 0, binding: 0,
resource: wgpu::BindingResource::Buffer { resource: wgpu::BindingResource::Buffer(
wgpu::BufferBinding {
buffer: &self.uniforms_buffer.raw, buffer: &self.uniforms_buffer.raw,
offset: 0, offset: 0,
size: wgpu::BufferSize::new(std::mem::size_of::< size: wgpu::BufferSize::new(
Uniforms, std::mem::size_of::<Uniforms>() as u64,
>( ),
)
as u64),
}, },
),
}], }],
}); });
} }