diff options
author | 2022-06-17 02:32:34 -0400 | |
---|---|---|
committer | 2022-06-17 02:32:34 -0400 | |
commit | 9b46176b2677c51ff025e8a7c3bdd5c094baa4d6 (patch) | |
tree | f4944350c2bb6026fd26c5dad0253038487a294d /wgpu | |
parent | 449bbb112e0c1e07c34cbf88786062c1ff7361c1 (diff) | |
parent | aae880ca5d50b144abdae482a92cefbffcdf3a40 (diff) | |
download | iced-9b46176b2677c51ff025e8a7c3bdd5c094baa4d6.tar.gz iced-9b46176b2677c51ff025e8a7c3bdd5c094baa4d6.tar.bz2 iced-9b46176b2677c51ff025e8a7c3bdd5c094baa4d6.zip |
Merge pull request #1367 from tarkah/fix/wgpu-msaa-alpha-blending
Fix alpha blending for wgpu msaa
Diffstat (limited to '')
-rw-r--r-- | wgpu/src/triangle.rs | 13 | ||||
-rw-r--r-- | wgpu/src/triangle/msaa.rs | 15 |
2 files changed, 4 insertions, 24 deletions
diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs index c702243b..bed64e99 100644 --- a/wgpu/src/triangle.rs +++ b/wgpu/src/triangle.rs @@ -162,18 +162,7 @@ impl Pipeline { entry_point: "fs_main", targets: &[wgpu::ColorTargetState { format, - blend: Some(wgpu::BlendState { - color: wgpu::BlendComponent { - src_factor: wgpu::BlendFactor::SrcAlpha, - dst_factor: wgpu::BlendFactor::OneMinusSrcAlpha, - operation: wgpu::BlendOperation::Add, - }, - alpha: wgpu::BlendComponent { - src_factor: wgpu::BlendFactor::One, - dst_factor: wgpu::BlendFactor::OneMinusSrcAlpha, - operation: wgpu::BlendOperation::Add, - }, - }), + blend: Some(wgpu::BlendState::ALPHA_BLENDING), write_mask: wgpu::ColorWrites::ALL, }], }), diff --git a/wgpu/src/triangle/msaa.rs b/wgpu/src/triangle/msaa.rs index 9fb87544..5d3ee311 100644 --- a/wgpu/src/triangle/msaa.rs +++ b/wgpu/src/triangle/msaa.rs @@ -95,18 +95,9 @@ impl Blit { entry_point: "fs_main", targets: &[wgpu::ColorTargetState { format, - blend: Some(wgpu::BlendState { - color: wgpu::BlendComponent { - src_factor: wgpu::BlendFactor::SrcAlpha, - dst_factor: wgpu::BlendFactor::OneMinusSrcAlpha, - operation: wgpu::BlendOperation::Add, - }, - alpha: wgpu::BlendComponent { - src_factor: wgpu::BlendFactor::One, - dst_factor: wgpu::BlendFactor::OneMinusSrcAlpha, - operation: wgpu::BlendOperation::Add, - }, - }), + blend: Some( + wgpu::BlendState::PREMULTIPLIED_ALPHA_BLENDING, + ), write_mask: wgpu::ColorWrites::ALL, }], }), |