Use vello#1718's inverse blurred rounded rects for box shadows (follow-up to #117)

Cargo.toml

@@ -83,4 +83,14 @@ pollster = "0.4"
 wasm-bindgen-futures = "0.4"
 
 # Dev-dependencies
-winit = { version = "0.30.2", features = ["rwh_06"] }
+winit = { version = "0.30.2", features = ["rwh_06"] }
+# TODO: remove once linebender/vello#1718 is released
+[patch.crates-io]
+vello = { git = "https://github.com/nicoburns/vello", branch = "inverse-blur-classic" }
+vello_encoding = { git = "https://github.com/nicoburns/vello", branch = "inverse-blur-classic" }
+vello_shaders = { git = "https://github.com/nicoburns/vello", branch = "inverse-blur-classic" }
+vello_common = { git = "https://github.com/nicoburns/vello", branch = "inverse-blur-classic" }
+vello_cpu = { git = "https://github.com/nicoburns/vello", branch = "inverse-blur-classic" }
+vello_gpu = { git = "https://github.com/nicoburns/vello", branch = "inverse-blur-classic" }
+vello_gpu_shaders = { git = "https://github.com/nicoburns/vello", branch = "inverse-blur-classic" }
+glifo = { git = "https://github.com/nicoburns/vello", branch = "inverse-blur-classic" }

crates/anyrender_vello/src/scene.rs

@@ -187,10 +187,6 @@ impl PaintScene for VelloScenePainter<'_, '_> {
             geometry.draw_unblurred(self, transform, color);
             return;
         }
-        if geometry.is_inset() {
-            geometry.draw_inset_with_layers(self, transform, color);
-            return;
-        }
         // TODO: draw shadows with matching individual radii instead of averaging them
         self.inner.draw_blurred_rounded_rect_in(
             &geometry.area,
@@ -199,6 +195,7 @@ impl PaintScene for VelloScenePainter<'_, '_> {
             color,
             geometry.shadow.average_radius(),
             geometry.std_dev,
+            geometry.is_inset(),
         );
     }
 }

crates/anyrender_vello_cpu/src/scene.rs

@@ -279,25 +279,14 @@ impl PaintScene for VelloCpuScenePainter {
             }
             return;
         }
-        if geometry.is_inset() {
-            geometry.draw_inset_with_layers(self, transform, color);
-            return;
-        }
-        // A single fill, so a non-isolated clip anti-aliases the clip edge only once.
-        let clip = geometry.needs_clip();
-        if clip {
-            self.render_ctx.push_clip_path(&geometry.area);
-        }
         // TODO: draw shadows with matching individual radii instead of averaging them
-        self.render_ctx.fill_blurred_rounded_rect(
+        self.render_ctx.fill_blurred_rounded_rect_in(
+            &geometry.area,
             &geometry.shadow.rect,
             geometry.shadow.average_radius() as f32,
             geometry.std_dev as f32,
-            false,
+            geometry.is_inset(),
         );
-        if clip {
-            self.render_ctx.pop_clip();
-        }
     }
 }
 

crates/anyrender_vello_hybrid/src/scene.rs

@@ -389,24 +389,13 @@ impl PaintScene for VelloHybridScenePainter<'_> {
             }
             return;
         }
-        if geometry.is_inset() {
-            geometry.draw_inset_with_layers(self, transform, color);
-            return;
-        }
-        // A single fill, so a non-isolated clip anti-aliases the clip edge only once.
-        let clip = geometry.needs_clip();
-        if clip {
-            self.scene.push_clip_path(&geometry.area);
-        }
         // TODO: draw shadows with matching individual radii instead of averaging them
-        self.scene.fill_blurred_rounded_rect(
+        self.scene.fill_blurred_rounded_rect_in(
+            &geometry.area,
             &geometry.shadow.rect,
             geometry.shadow.average_radius() as f32,
             geometry.std_dev as f32,
-            false,
+            geometry.is_inset(),
         );
-        if clip {
-            self.scene.pop_clip();
-        }
     }
 }

crates/anyrender_vello_hybrid/src/webgl_scene.rs

@@ -291,24 +291,13 @@ impl PaintScene for WebGlScenePainter<'_> {
             }
             return;
         }
-        if geometry.is_inset() {
-            geometry.draw_inset_with_layers(self, transform, color);
-            return;
-        }
-        // A single fill, so a non-isolated clip anti-aliases the clip edge only once.
-        let clip = geometry.needs_clip();
-        if clip {
-            self.scene.push_clip_path(&geometry.area);
-        }
         // TODO: draw shadows with matching individual radii instead of averaging them
-        self.scene.fill_blurred_rounded_rect(
+        self.scene.fill_blurred_rounded_rect_in(
+            &geometry.area,
             &geometry.shadow.rect,
             geometry.shadow.average_radius() as f32,
             geometry.std_dev as f32,
-            false,
+            geometry.is_inset(),
         );
-        if clip {
-            self.scene.pop_clip();
-        }
     }
 }