diff options
| author |  Héctor Ramón <hector0193@gmail.com> | 2021-06-22 11:39:18 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2021-06-22 11:39:18 +0200 |
| commit | bb6e06127e15e5eb2b95c765488d75f25f8252ef (patch) | |
| tree | 11ec9945e20780eab9dc1c99044e7bdeaaf508a5 /wgpu/src/image.rs | |
| parent | e68da229b384fbe78514dab0b13c8eb4637f4f5d (diff) | |
| parent | a53e7559fe01ee072d4f0533ecf1facec741b9e4 (diff) | |
| download | iced-bb6e06127e15e5eb2b95c765488d75f25f8252ef.tar.gz iced-bb6e06127e15e5eb2b95c765488d75f25f8252ef.tar.bz2 iced-bb6e06127e15e5eb2b95c765488d75f25f8252ef.zip | |
Merge pull request #925 from PolyMeilex/master
Update `wgpu` to `0.9`
Diffstat (limited to 'wgpu/src/image.rs')
| -rw-r--r-- | wgpu/src/image.rs | 34 |
1 files changed, 7 insertions, 27 deletions
diff --git a/wgpu/src/image.rs b/wgpu/src/image.rs index cd7b3d23..85663bf5 100644 --- a/wgpu/src/image.rs +++ b/wgpu/src/image.rs @@ -165,33 +165,13 @@ impl Pipeline { wgpu::VertexBufferLayout { array_stride: mem::size_of::<Instance>() as u64, step_mode: wgpu::InputStepMode::Instance, - attributes: &[ - wgpu::VertexAttribute { - shader_location: 1, - format: wgpu::VertexFormat::Float32x2, - offset: 0, - }, - 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, - }, - ], + attributes: &wgpu::vertex_attr_array!( + 1 => Float32x2, + 2 => Float32x2, + 3 => Float32x2, + 4 => Float32x2, + 5 => Sint32, + ), }, ], }, |