diff options
| author | 2022-07-03 17:35:31 +0200 | |
|---|---|---|
| committer | 2022-07-03 17:35:31 +0200 | |
| commit | 66eb6263003c1bbedd1fd14d6b12f172d20a6211 (patch) | |
| tree | 46253081865e677d7199fd036f0fed309f531ea7 /wgpu/src/image | |
| parent | e6e3eff8762e9e8350f00b340348dc2261dd0053 (diff) | |
| parent | 9adc20922d16b990eede1f6c5f059e68efe15d0e (diff) | |
| download | iced-66eb6263003c1bbedd1fd14d6b12f172d20a6211.tar.gz iced-66eb6263003c1bbedd1fd14d6b12f172d20a6211.tar.bz2 iced-66eb6263003c1bbedd1fd14d6b12f172d20a6211.zip | |
Merge pull request #1378 from Cupnfish/wgpu-0.13
update `wgpu` to `0.13`
Diffstat (limited to '')
| -rw-r--r-- | wgpu/src/image.rs | 22 | 
1 files changed, 12 insertions, 10 deletions
| diff --git a/wgpu/src/image.rs b/wgpu/src/image.rs index 0fefbfaf..750ad62a 100644 --- a/wgpu/src/image.rs +++ b/wgpu/src/image.rs @@ -136,7 +136,7 @@ impl Pipeline {              });          let shader = -            device.create_shader_module(&wgpu::ShaderModuleDescriptor { +            device.create_shader_module(wgpu::ShaderModuleDescriptor {                  label: Some("iced_wgpu::image::shader"),                  source: wgpu::ShaderSource::Wgsl(std::borrow::Cow::Borrowed(                      include_str!("shader/image.wgsl"), @@ -176,7 +176,7 @@ impl Pipeline {                  fragment: Some(wgpu::FragmentState {                      module: &shader,                      entry_point: "fs_main", -                    targets: &[wgpu::ColorTargetState { +                    targets: &[Some(wgpu::ColorTargetState {                          format,                          blend: Some(wgpu::BlendState {                              color: wgpu::BlendComponent { @@ -191,7 +191,7 @@ impl Pipeline {                              },                          }),                          write_mask: wgpu::ColorWrites::ALL, -                    }], +                    })],                  }),                  primitive: wgpu::PrimitiveState {                      topology: wgpu::PrimitiveTopology::TriangleList, @@ -406,14 +406,16 @@ impl Pipeline {              let mut render_pass =                  encoder.begin_render_pass(&wgpu::RenderPassDescriptor {                      label: Some("iced_wgpu::image render pass"), -                    color_attachments: &[wgpu::RenderPassColorAttachment { -                        view: target, -                        resolve_target: None, -                        ops: wgpu::Operations { -                            load: wgpu::LoadOp::Load, -                            store: true, +                    color_attachments: &[Some( +                        wgpu::RenderPassColorAttachment { +                            view: target, +                            resolve_target: None, +                            ops: wgpu::Operations { +                                load: wgpu::LoadOp::Load, +                                store: true, +                            },                          }, -                    }], +                    )],                      depth_stencil_attachment: None,                  }); | 
