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

Merge pull request #925 from PolyMeilex/master 

Update `wgpu` to `0.9`
This commit is contained in:
Héctor Ramón 2021-06-22 11:39:18 +02:00 committed by GitHub
parent e68da229b3 a53e7559fe
commit bb6e06127e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 = "0.8" wgpu = "0.9"
wgpu_glyph = "0.12" wgpu_glyph = "0.13"
glyph_brush = "0.7" glyph_brush = "0.7"
raw-window-handle = "0.3" raw-window-handle = "0.3"
log = "0.4" log = "0.4"

34
wgpu/src/image.rs
View File

@ -165,33 +165,13 @@ impl Pipeline {
wgpu::VertexBufferLayout { wgpu::VertexBufferLayout {
array_stride: mem::size_of::<Instance>() as u64, array_stride: mem::size_of::<Instance>() as u64,
step_mode: wgpu::InputStepMode::Instance, step_mode: wgpu::InputStepMode::Instance,
attributes: &[ attributes: &wgpu::vertex_attr_array!(
wgpu::VertexAttribute { 1 => Float32x2,
shader_location: 1, 2 => Float32x2,
format: wgpu::VertexFormat::Float32x2, 3 => Float32x2,
offset: 0, 4 => Float32x2,
}, 5 => Sint32,
wgpu::VertexAttribute { ),
shader_location: 2,
format: wgpu::VertexFormat::Float32x2,
offset: 4 * 2,
},
wgpu::VertexAttribute {
shader_location: 3,
format: wgpu::VertexFormat::Float32x2,
offset: 4 * 4,
},
wgpu::VertexAttribute {
shader_location: 4,
format: wgpu::VertexFormat::Float32x2,
offset: 4 * 6,
},
wgpu::VertexAttribute {
shader_location: 5,
format: wgpu::VertexFormat::Sint32,
offset: 4 * 8,
},
],
}, },
], ],
}, },

40
wgpu/src/quad.rs
View File

@ -87,38 +87,14 @@ impl Pipeline {
wgpu::VertexBufferLayout { wgpu::VertexBufferLayout {
array_stride: mem::size_of::<layer::Quad>() as u64, array_stride: mem::size_of::<layer::Quad>() as u64,
step_mode: wgpu::InputStepMode::Instance, step_mode: wgpu::InputStepMode::Instance,
attributes: &[ attributes: &wgpu::vertex_attr_array!(
wgpu::VertexAttribute { 1 => Float32x2,
shader_location: 1, 2 => Float32x2,
format: wgpu::VertexFormat::Float32x2, 3 => Float32x4,
offset: 0, 4 => Float32x4,
}, 5 => Float32,
wgpu::VertexAttribute { 6 => Float32,
shader_location: 2, ),
format: wgpu::VertexFormat::Float32x2,
offset: 4 * 2,
},
wgpu::VertexAttribute {
shader_location: 3,
format: wgpu::VertexFormat::Float32x4,
offset: 4 * (2 + 2),
},
wgpu::VertexAttribute {
shader_location: 4,
format: wgpu::VertexFormat::Float32x4,
offset: 4 * (2 + 2 + 4),
},
wgpu::VertexAttribute {
shader_location: 5,
format: wgpu::VertexFormat::Float32,
offset: 4 * (2 + 2 + 4 + 4),
},
wgpu::VertexAttribute {
shader_location: 6,
format: wgpu::VertexFormat::Float32,
offset: 4 * (2 + 2 + 4 + 4 + 1),
},
],
}, },
], ],
}, },

16
wgpu/src/triangle.rs
View File

@ -150,20 +150,12 @@ impl Pipeline {
buffers: &[wgpu::VertexBufferLayout { buffers: &[wgpu::VertexBufferLayout {
array_stride: mem::size_of::<Vertex2D>() as u64, array_stride: mem::size_of::<Vertex2D>() as u64,
step_mode: wgpu::InputStepMode::Vertex, step_mode: wgpu::InputStepMode::Vertex,
attributes: &[ attributes: &wgpu::vertex_attr_array!(
// Position // Position
wgpu::VertexAttribute { 0 => Float32x2,
shader_location: 0,
format: wgpu::VertexFormat::Float32x2,
offset: 0,
},
// Color // Color
wgpu::VertexAttribute { 1 => Float32x4,
shader_location: 1, ),
format: wgpu::VertexFormat::Float32x4,
offset: 4 * 2,
},
],
}], }],
}, },
fragment: Some(wgpu::FragmentState { fragment: Some(wgpu::FragmentState {