Update Peniko to 0.2.0

CHANGELOG.md

@@ -29,7 +29,7 @@ This release has an [MSRV][] of 1.75.
 
 ### Fixed
 
-## Removed
+### Removed
 
 - Breaking: `Pipelines` API from `vello_shaders` ([#612] by [@DJMcNab])
 

Cargo.toml

@@ -43,7 +43,7 @@ vello_encoding = { version = "0.2.0", path = "vello_encoding" }
 vello_shaders = { version = "0.2.0", path = "vello_shaders" }
 bytemuck = { version = "1.16.0", features = ["derive"] }
 skrifa = "0.19.3"
-peniko = "0.1.1"
+peniko = "0.2.0"
 futures-intrusive = "0.5.0"
 raw-window-handle = "0.6.2"
 smallvec = "1.13.2"

vello/src/scene.rs

@@ -433,7 +433,7 @@ impl<'a> DrawGlyphs<'a> {
         resources.patches.push(Patch::GlyphRun { index });
         self.scene
             .encoding
-            .encode_brush(self.brush.clone(), self.brush_alpha);
+            .encode_brush(self.brush, self.brush_alpha);
         // Glyph run resolve step affects transform and style state in a way
         // that is opaque to the current encoding.
         // See <https://github.com/linebender/vello/issues/424>
@@ -574,6 +574,7 @@ impl<'a> DrawGlyphs<'a> {
                             )
                         }
                     };
+                    let image = image.multiply_alpha(self.brush_alpha);
                     // Split into multiple statements because rustfmt breaks
                     let transform =
                         run_transform.then_translate(Vec2::new(glyph.x.into(), glyph.y.into()));
@@ -625,7 +626,7 @@ impl<'a> DrawGlyphs<'a> {
                             clip_box: DEFAULT_CLIP_RECT,
                             clip_depth: 0,
                             location,
-                            foreground_brush: self.brush.clone(),
+                            foreground_brush: self.brush,
                         },
                     )
                     .unwrap();
@@ -903,8 +904,8 @@ fn conv_brush(
             palette_index,
             alpha,
         } => color_index(cpal, palette_index)
-            .map(|it| Brush::Solid(it.with_alpha_factor(alpha)))
-            .unwrap_or(apply_alpha(foreground_brush.to_owned(), alpha)),
+            .map(|it| Brush::Solid(it.multiply_alpha(alpha)))
+            .unwrap_or(foreground_brush.to_owned().multiply_alpha(alpha)),
 
         skrifa::color::Brush::LinearGradient {
             p0,
@@ -942,19 +943,6 @@ fn conv_brush(
     }
 }
 
-fn apply_alpha(mut brush: Brush, alpha: f32) -> Brush {
-    match &mut brush {
-        Brush::Solid(color) => *color = color.with_alpha_factor(alpha),
-        Brush::Gradient(grad) => grad
-            .stops
-            .iter_mut()
-            .for_each(|it| it.color = it.color.with_alpha_factor(alpha)),
-        // Cannot apply an alpha factor to
-        Brush::Image(_) => {}
-    }
-    brush
-}
-
 fn color_index(cpal: &'_ Cpal<'_>, palette_index: u16) -> Option<Color> {
     // The "application determined" foreground colour should be used
     // This will be handled by the caller
@@ -1013,7 +1001,7 @@ impl ColorStopsSource for ColorStopsConverter<'_> {
                     BrushRef::Image(_) => Color::BLACK,
                 },
             };
-            let color = color.with_alpha_factor(item.alpha);
+            let color = color.multiply_alpha(item.alpha);
             vec.push(ColorStop {
                 color,
                 offset: item.offset,

vello_encoding/src/encoding.rs

@@ -264,14 +264,13 @@ impl Encoding {
     }
 
     /// Encodes a brush with an optional alpha modifier.
-    #[allow(unused_variables)]
     pub fn encode_brush<'b>(&mut self, brush: impl Into<BrushRef<'b>>, alpha: f32) {
         #[cfg(feature = "full")]
         use super::math::point_to_f32;
         match brush.into() {
             BrushRef::Solid(color) => {
                 let color = if alpha != 1.0 {
-                    color.with_alpha_factor(alpha)
+                    color.multiply_alpha(alpha)
                 } else {
                     color
                 };
@@ -418,9 +417,11 @@ impl Encoding {
 
     /// Encodes an image brush.
     #[cfg(feature = "full")]
-    pub fn encode_image(&mut self, image: &Image, _alpha: f32) {
+    pub fn encode_image(&mut self, image: &Image, alpha: f32) {
+        let _alpha = alpha * f32::from(image.alpha);
         // TODO: feed the alpha multiplier through the full pipeline for consistency
         // with other brushes?
+        // Tracked in https://github.com/linebender/vello/issues/692
         self.resources.patches.push(Patch::Image {
             image: image.clone(),
             draw_data_offset: self.draw_data.len(),
@@ -500,7 +501,7 @@ impl Encoding {
         if alpha != 1.0 {
             self.resources
                 .color_stops
-                .extend(color_stops.map(|stop| stop.with_alpha_factor(alpha)));
+                .extend(color_stops.map(|stop| stop.multiply_alpha(alpha)));
         } else {
             self.resources.color_stops.extend(color_stops);
         }