From 2d76c7165c4a82f27090cbf69f811f8e0f2f28a4 Mon Sep 17 00:00:00 2001
From: Poly <marynczak.bartlomiej@gmail.com>
Date: Wed, 3 Feb 2021 19:21:02 +0100
Subject: [wgpu 0.7] Update quad.rs
---
wgpu/src/quad.rs | 116 +++++++++++++++++++++++++++++--------------------------
1 file changed, 62 insertions(+), 54 deletions(-)
diff --git a/wgpu/src/quad.rs b/wgpu/src/quad.rs
index 24d20cfa..c1399d53 100644
--- a/wgpu/src/quad.rs
+++ b/wgpu/src/quad.rs
@@ -24,8 +24,9 @@ impl Pipeline {
entries: &[wgpu::BindGroupLayoutEntry {
binding: 0,
visibility: wgpu::ShaderStage::VERTEX,
- ty: wgpu::BindingType::UniformBuffer {
- dynamic: false,
+ ty: wgpu::BindingType::Buffer {
+ ty: wgpu::BufferBindingType::Uniform,
+ has_dynamic_offset: false,
min_binding_size: wgpu::BufferSize::new(
mem::size_of::<Uniforms>() as u64,
),
@@ -46,9 +47,11 @@ impl Pipeline {
layout: &constant_layout,
entries: &[wgpu::BindGroupEntry {
binding: 0,
- resource: wgpu::BindingResource::Buffer(
- constants_buffer.slice(..),
- ),
+ resource: wgpu::BindingResource::Buffer {
+ buffer: &constants_buffer,
+ offset: 0,
+ size: None,
+ },
}],
});
@@ -59,87 +62,61 @@ impl Pipeline {
bind_group_layouts: &[&constant_layout],
});
- let vs_module = device
- .create_shader_module(wgpu::include_spirv!("shader/quad.vert.spv"));
+ let vs_module = device.create_shader_module(&wgpu::include_spirv!(
+ "shader/quad.vert.spv"
+ ));
- let fs_module = device
- .create_shader_module(wgpu::include_spirv!("shader/quad.frag.spv"));
+ let fs_module = device.create_shader_module(&wgpu::include_spirv!(
+ "shader/quad.frag.spv"
+ ));
let pipeline =
device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
label: Some("iced_wgpu::quad pipeline"),
layout: Some(&layout),
- vertex_stage: wgpu::ProgrammableStageDescriptor {
+ vertex: wgpu::VertexState {
module: &vs_module,
entry_point: "main",
- },
- fragment_stage: Some(wgpu::ProgrammableStageDescriptor {
- module: &fs_module,
- entry_point: "main",
- }),
- rasterization_state: Some(wgpu::RasterizationStateDescriptor {
- front_face: wgpu::FrontFace::Cw,
- cull_mode: wgpu::CullMode::None,
- ..Default::default()
- }),
- primitive_topology: wgpu::PrimitiveTopology::TriangleList,
- color_states: &[wgpu::ColorStateDescriptor {
- format,
- color_blend: wgpu::BlendDescriptor {
- src_factor: wgpu::BlendFactor::SrcAlpha,
- dst_factor: wgpu::BlendFactor::OneMinusSrcAlpha,
- operation: wgpu::BlendOperation::Add,
- },
- alpha_blend: wgpu::BlendDescriptor {
- src_factor: wgpu::BlendFactor::One,
- dst_factor: wgpu::BlendFactor::OneMinusSrcAlpha,
- operation: wgpu::BlendOperation::Add,
- },
- write_mask: wgpu::ColorWrite::ALL,
- }],
- depth_stencil_state: None,
- vertex_state: wgpu::VertexStateDescriptor {
- index_format: wgpu::IndexFormat::Uint16,
- vertex_buffers: &[
- wgpu::VertexBufferDescriptor {
- stride: mem::size_of::<Vertex>() as u64,
+ buffers: &[
+ wgpu::VertexBufferLayout {
+ array_stride: mem::size_of::<Vertex>() as u64,
step_mode: wgpu::InputStepMode::Vertex,
- attributes: &[wgpu::VertexAttributeDescriptor {
+ attributes: &[wgpu::VertexAttribute {
shader_location: 0,
format: wgpu::VertexFormat::Float2,
offset: 0,
}],
},
- wgpu::VertexBufferDescriptor {
- stride: mem::size_of::<layer::Quad>() as u64,
+ wgpu::VertexBufferLayout {
+ array_stride: mem::size_of::<layer::Quad>() as u64,
step_mode: wgpu::InputStepMode::Instance,
attributes: &[
- wgpu::VertexAttributeDescriptor {
+ wgpu::VertexAttribute {
shader_location: 1,
format: wgpu::VertexFormat::Float2,
offset: 0,
},
- wgpu::VertexAttributeDescriptor {
+ wgpu::VertexAttribute {
shader_location: 2,
format: wgpu::VertexFormat::Float2,
offset: 4 * 2,
},
- wgpu::VertexAttributeDescriptor {
+ wgpu::VertexAttribute {
shader_location: 3,
format: wgpu::VertexFormat::Float4,
offset: 4 * (2 + 2),
},
- wgpu::VertexAttributeDescriptor {
+ wgpu::VertexAttribute {
shader_location: 4,
format: wgpu::VertexFormat::Float4,
offset: 4 * (2 + 2 + 4),
},
- wgpu::VertexAttributeDescriptor {
+ wgpu::VertexAttribute {
shader_location: 5,
format: wgpu::VertexFormat::Float,
offset: 4 * (2 + 2 + 4 + 4),
},
- wgpu::VertexAttributeDescriptor {
+ wgpu::VertexAttribute {
shader_location: 6,
format: wgpu::VertexFormat::Float,
offset: 4 * (2 + 2 + 4 + 4 + 1),
@@ -148,9 +125,36 @@ impl Pipeline {
},
],
},
- sample_count: 1,
- sample_mask: !0,
- alpha_to_coverage_enabled: false,
+ fragment: Some(wgpu::FragmentState {
+ module: &fs_module,
+ entry_point: "main",
+ targets: &[wgpu::ColorTargetState {
+ format,
+ alpha_blend: wgpu::BlendState {
+ src_factor: wgpu::BlendFactor::One,
+ dst_factor: wgpu::BlendFactor::OneMinusSrcAlpha,
+ operation: wgpu::BlendOperation::Add,
+ },
+ color_blend: wgpu::BlendState {
+ src_factor: wgpu::BlendFactor::SrcAlpha,
+ dst_factor: wgpu::BlendFactor::OneMinusSrcAlpha,
+ operation: wgpu::BlendOperation::Add,
+ },
+ write_mask: wgpu::ColorWrite::ALL,
+ }],
+ }),
+ primitive: wgpu::PrimitiveState {
+ topology: wgpu::PrimitiveTopology::TriangleList,
+ front_face: wgpu::FrontFace::Cw,
+ cull_mode: wgpu::CullMode::None,
+ ..Default::default()
+ },
+ depth_stencil: None,
+ multisample: wgpu::MultisampleState {
+ count: 1,
+ mask: !0,
+ alpha_to_coverage_enabled: false,
+ },
});
let vertices =
@@ -232,6 +236,7 @@ impl Pipeline {
{
let mut render_pass =
encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
+ label: Some("iced_wgpu::quad render pass"),
color_attachments: &[
wgpu::RenderPassColorAttachmentDescriptor {
attachment: target,
@@ -247,7 +252,10 @@ impl Pipeline {
render_pass.set_pipeline(&self.pipeline);
render_pass.set_bind_group(0, &self.constants, &[]);
- render_pass.set_index_buffer(self.indices.slice(..));
+ render_pass.set_index_buffer(
+ self.indices.slice(..),
+ wgpu::IndexFormat::Uint16,
+ );
render_pass.set_vertex_buffer(0, self.vertices.slice(..));
render_pass.set_vertex_buffer(1, self.instances.slice(..));
render_pass.set_scissor_rect(
--
cgit