Merge pull request #1367 from tarkah/fix/wgpu-msaa-alpha-blending

Fix alpha blending for wgpu msaa
iced-rs · Jun 17, 2022 · 9b46176 · 9b46176
2 parents 449bbb1 + aae880c
commit 9b46176
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 28 deletions.
diff --git a/examples/solar_system/src/main.rs b/examples/solar_system/src/main.rs
@@ -48,6 +48,10 @@ impl Application for SolarSystem {
         String::from("Solar system - Iced")
     }
 
+    fn background_color(&self) -> Color {
+        Color::BLACK
+    }
+
     fn update(&mut self, message: Message) -> Command<Message> {
         match message {
             Message::Tick(instant) => {
@@ -137,16 +141,12 @@ impl<Message> canvas::Program<Message> for State {
         use std::f32::consts::PI;
 
         let background = self.space_cache.draw(bounds.size(), |frame| {
-            let space = Path::rectangle(Point::new(0.0, 0.0), frame.size());
-
             let stars = Path::new(|path| {
                 for (p, size) in &self.stars {
                     path.rectangle(*p, Size::new(*size, *size));
                 }
             });
 
-            frame.fill(&space, Color::BLACK);
-
             frame.translate(frame.center() - Point::ORIGIN);
             frame.fill(&stars, Color::WHITE);
         });

diff --git 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
@@ -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,
                     }],
                 }),