summaryrefslogtreecommitdiffstats
path: root/wgpu/src/quad.rs
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón <hector0193@gmail.com>2021-08-25 16:19:00 +0700
committerLibravatar GitHub <noreply@github.com>2021-08-25 16:19:00 +0700
commit2d65621a3b680457e689b93c800e74f726ffc175 (patch)
tree283aaa8245b8cb41d1f4a23709ba13bbe849d4a4 /wgpu/src/quad.rs
parent8333b8f88ceaa53c361eb6726b2b7dac6cd2c402 (diff)
parentacc47a595300ff9bb9cae1e26c2d41135cde8ae8 (diff)
downloadiced-2d65621a3b680457e689b93c800e74f726ffc175.tar.gz
iced-2d65621a3b680457e689b93c800e74f726ffc175.tar.bz2
iced-2d65621a3b680457e689b93c800e74f726ffc175.zip
Merge pull request #1000 from PolyMeilex/wgpu-0.10
wgpu: Update to 0.10
Diffstat (limited to 'wgpu/src/quad.rs')
-rw-r--r--wgpu/src/quad.rs17
1 files changed, 8 insertions, 9 deletions
diff --git a/wgpu/src/quad.rs b/wgpu/src/quad.rs
index 93942fba..148d0f6a 100644
--- a/wgpu/src/quad.rs
+++ b/wgpu/src/quad.rs
@@ -23,7 +23,7 @@ impl Pipeline {
label: Some("iced_wgpu::quad uniforms layout"),
entries: &[wgpu::BindGroupLayoutEntry {
binding: 0,
- visibility: wgpu::ShaderStage::VERTEX,
+ visibility: wgpu::ShaderStages::VERTEX,
ty: wgpu::BindingType::Buffer {
ty: wgpu::BufferBindingType::Uniform,
has_dynamic_offset: false,
@@ -38,7 +38,7 @@ impl Pipeline {
let constants_buffer = device.create_buffer(&wgpu::BufferDescriptor {
label: Some("iced_wgpu::quad uniforms buffer"),
size: mem::size_of::<Uniforms>() as wgpu::BufferAddress,
- usage: wgpu::BufferUsage::UNIFORM | wgpu::BufferUsage::COPY_DST,
+ usage: wgpu::BufferUsages::UNIFORM | wgpu::BufferUsages::COPY_DST,
mapped_at_creation: false,
});
@@ -64,7 +64,6 @@ impl Pipeline {
source: wgpu::ShaderSource::Wgsl(std::borrow::Cow::Borrowed(
include_str!("shader/quad.wgsl"),
)),
- flags: wgpu::ShaderFlags::all(),
});
let pipeline =
@@ -77,7 +76,7 @@ impl Pipeline {
buffers: &[
wgpu::VertexBufferLayout {
array_stride: mem::size_of::<Vertex>() as u64,
- step_mode: wgpu::InputStepMode::Vertex,
+ step_mode: wgpu::VertexStepMode::Vertex,
attributes: &[wgpu::VertexAttribute {
shader_location: 0,
format: wgpu::VertexFormat::Float32x2,
@@ -86,7 +85,7 @@ impl Pipeline {
},
wgpu::VertexBufferLayout {
array_stride: mem::size_of::<layer::Quad>() as u64,
- step_mode: wgpu::InputStepMode::Instance,
+ step_mode: wgpu::VertexStepMode::Instance,
attributes: &wgpu::vertex_attr_array!(
1 => Float32x2,
2 => Float32x2,
@@ -115,7 +114,7 @@ impl Pipeline {
operation: wgpu::BlendOperation::Add,
},
}),
- write_mask: wgpu::ColorWrite::ALL,
+ write_mask: wgpu::ColorWrites::ALL,
}],
}),
primitive: wgpu::PrimitiveState {
@@ -135,20 +134,20 @@ impl Pipeline {
device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
label: Some("iced_wgpu::quad vertex buffer"),
contents: bytemuck::cast_slice(&QUAD_VERTS),
- usage: wgpu::BufferUsage::VERTEX,
+ usage: wgpu::BufferUsages::VERTEX,
});
let indices =
device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
label: Some("iced_wgpu::quad index buffer"),
contents: bytemuck::cast_slice(&QUAD_INDICES),
- usage: wgpu::BufferUsage::INDEX,
+ usage: wgpu::BufferUsages::INDEX,
});
let instances = device.create_buffer(&wgpu::BufferDescriptor {
label: Some("iced_wgpu::quad instance buffer"),
size: mem::size_of::<layer::Quad>() as u64 * MAX_INSTANCES as u64,
- usage: wgpu::BufferUsage::VERTEX | wgpu::BufferUsage::COPY_DST,
+ usage: wgpu::BufferUsages::VERTEX | wgpu::BufferUsages::COPY_DST,
mapped_at_creation: false,
});