Update Peniko (#769)

linebender · Dec 18, 2024 · a71236c · a71236c
1 parent 2f2bcad
commit a71236c
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 36 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -101,8 +101,7 @@ bytemuck = { version = "1.20.0", features = ["derive"] }
 skrifa = "0.26.0"
 # The version of kurbo used below should be kept in sync
 # with the version of kurbo used by peniko.
-# peniko = "0.2.0"
-peniko = { version = "0.2.0", git = "https://github.com/linebender/peniko.git", rev = "3462e19" }
+peniko = "0.3.0"
 # FIXME: This can be removed once peniko supports the schemars feature.
 kurbo = "0.11.1"
 futures-intrusive = "0.5.0"

diff --git a/examples/scenes/src/images.rs b/examples/scenes/src/images.rs
@@ -5,7 +5,7 @@ use std::collections::HashMap;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 
-use vello::peniko::{Blob, Format, Image};
+use vello::peniko::{Blob, Image, ImageFormat};
 
 /// Simple hack to support loading images for examples.
 #[derive(Default)]
@@ -50,5 +50,5 @@ fn decode_image(data: &[u8]) -> anyhow::Result<Image> {
     let height = image.height();
     let data = Arc::new(image.into_rgba8().into_vec());
     let blob = Blob::new(data);
-    Ok(Image::new(blob, Format::Rgba8, width, height))
+    Ok(Image::new(blob, ImageFormat::Rgba8, width, height))
 }
diff --git a/examples/scenes/src/test_scenes.rs b/examples/scenes/src/test_scenes.rs
@@ -1779,7 +1779,7 @@ mod impls {
             blob.extend(c.premultiply().to_rgba8().to_u8_array());
         });
         let data = Blob::new(Arc::new(blob));
-        let image = Image::new(data, Format::Rgba8, 2, 2);
+        let image = Image::new(data, ImageFormat::Rgba8, 2, 2);
 
         scene.draw_image(
             &image,
@@ -1822,7 +1822,7 @@ mod impls {
             blob.extend(c.premultiply().to_rgba8().to_u8_array());
         });
         let data = Blob::new(Arc::new(blob));
-        let image = Image::new(data, Format::Rgba8, 2, 2);
+        let image = Image::new(data, ImageFormat::Rgba8, 2, 2);
         let image = image.with_extend(Extend::Pad);
         // Pad extend mode
         scene.fill(

diff --git a/vello/src/scene.rs b/vello/src/scene.rs
@@ -561,7 +561,7 @@ impl<'a> DrawGlyphs<'a> {
                             Image::new(
                                 // TODO: The design of the Blob type forces the double boxing
                                 Blob::new(Arc::new(data)),
-                                peniko::Format::Rgba8,
+                                peniko::ImageFormat::Rgba8,
                                 bitmap.width,
                                 bitmap.height,
                             )
@@ -590,7 +590,7 @@ impl<'a> DrawGlyphs<'a> {
                             Image::new(
                                 // TODO: The design of the Blob type forces the double boxing
                                 Blob::new(Arc::new(buf)),
-                                peniko::Format::Rgba8,
+                                peniko::ImageFormat::Rgba8,
                                 bitmap.width,
                                 bitmap.height,
                             )
@@ -621,7 +621,7 @@ impl<'a> DrawGlyphs<'a> {
                             Image::new(
                                 // TODO: The design of the Blob type forces the double boxing
                                 Blob::new(Arc::new(data)),
-                                peniko::Format::Rgba8,
+                                peniko::ImageFormat::Rgba8,
                                 bitmap.width,
                                 bitmap.height,
                             )
@@ -1022,7 +1022,7 @@ fn conv_extend(extend: skrifa::color::Extend) -> Extend {
 struct ColorStopsConverter<'a>(&'a [skrifa::color::ColorStop], &'a Cpal<'a>, BrushRef<'a>);
 
 impl ColorStopsSource for ColorStopsConverter<'_> {
-    fn collect_stops(&self, vec: &mut ColorStops) {
+    fn collect_stops(self, stops: &mut ColorStops) {
         for item in self.0 {
             let color = color_index(self.1, item.palette_index);
             let color = match color {
@@ -1043,7 +1043,7 @@ impl ColorStopsSource for ColorStopsConverter<'_> {
                 },
             };
             let color = color.multiply_alpha(item.alpha);
-            vec.push(ColorStop {
+            stops.push(ColorStop {
                 color: DynamicColor::from_alpha_color(color),
                 offset: item.offset,
             });

diff --git a/vello_encoding/src/ramp_cache.rs b/vello_encoding/src/ramp_cache.rs
@@ -3,6 +3,7 @@
 
 use std::collections::HashMap;
 
+use peniko::color::cache_key::CacheKey;
 use peniko::color::{HueDirection, Srgb};
 use peniko::{ColorStop, ColorStops};
 
@@ -20,7 +21,7 @@ pub struct Ramps<'a> {
 #[derive(Default)]
 pub(crate) struct RampCache {
     epoch: u64,
-    map: HashMap<ColorStops, (u32, u64)>,
+    map: HashMap<CacheKey<ColorStops>, (u32, u64)>,
     data: Vec<u32>,
 }
 
@@ -35,13 +36,13 @@ impl RampCache {
     }
 
     pub(crate) fn add(&mut self, stops: &[ColorStop]) -> u32 {
-        if let Some(entry) = self.map.get_mut(stops) {
+        if let Some(entry) = self.map.get_mut(&CacheKey(stops.into())) {
             entry.1 = self.epoch;
             entry.0
         } else if self.map.len() < RETAINED_COUNT {
             let id = (self.data.len() / N_SAMPLES) as u32;
             self.data.extend(make_ramp(stops));
-            self.map.insert(stops.into(), (id, self.epoch));
+            self.map.insert(CacheKey(stops.into()), (id, self.epoch));
             id
         } else {
             let mut reuse = None;
@@ -60,12 +61,12 @@ impl RampCache {
                 {
                     *dst = src;
                 }
-                self.map.insert(stops.into(), (id, self.epoch));
+                self.map.insert(CacheKey(stops.into()), (id, self.epoch));
                 id
             } else {
                 let id = (self.data.len() / N_SAMPLES) as u32;
                 self.data.extend(make_ramp(stops));
-                self.map.insert(stops.into(), (id, self.epoch));
+                self.map.insert(CacheKey(stops.into()), (id, self.epoch));
                 id
             }
         }

diff --git a/vello_tests/src/compare.rs b/vello_tests/src/compare.rs
@@ -10,7 +10,7 @@ use anyhow::{anyhow, bail, Result};
 use image::DynamicImage;
 use nv_flip::FlipPool;
 use vello::{
-    peniko::{Format, Image},
+    peniko::{Image, ImageFormat},
     Scene,
 };
 
@@ -105,8 +105,8 @@ pub async fn compare_gpu_cpu(scene: Scene, mut params: TestParams) -> Result<Gpu
     assert!(gpu_rendered.width == cpu_rendered.width && gpu_rendered.height == cpu_rendered.height,);
 
     // Compare the images using nv-flip
-    assert_eq!(cpu_rendered.format, Format::Rgba8);
-    assert_eq!(gpu_rendered.format, Format::Rgba8);
+    assert_eq!(cpu_rendered.format, ImageFormat::Rgba8);
+    assert_eq!(gpu_rendered.format, ImageFormat::Rgba8);
     let gpu_rendered_data: DynamicImage = image::RgbaImage::from_raw(
         cpu_rendered.width,
         cpu_rendered.height,

diff --git a/vello_tests/src/lib.rs b/vello_tests/src/lib.rs
@@ -40,7 +40,7 @@ use std::sync::Arc;
 use anyhow::{anyhow, bail, Result};
 use scenes::{ExampleScene, ImageCache, SceneParams, SimpleText};
 use vello::kurbo::{Affine, Vec2};
-use vello::peniko::{color::palette, Blob, Color, Format, Image};
+use vello::peniko::{color::palette, Blob, Color, Image, ImageFormat};
 use vello::wgpu::{
     self, BufferDescriptor, BufferUsages, CommandEncoderDescriptor, Extent3d, ImageCopyBuffer,
     TextureDescriptor, TextureFormat, TextureUsages,
@@ -188,7 +188,7 @@ pub async fn get_scene_image(params: &TestParams, scene: &Scene) -> Result<Image
         result_unpadded.extend(&data[start..start + (width * 4) as usize]);
     }
     let data = Blob::new(Arc::new(result_unpadded));
-    let image = Image::new(data, Format::Rgba8, width, height);
+    let image = Image::new(data, ImageFormat::Rgba8, width, height);
     Ok(image)
 }
 

diff --git a/vello_tests/src/snapshot.rs b/vello_tests/src/snapshot.rs
@@ -11,7 +11,7 @@ use std::{
 use image::{DynamicImage, ImageError};
 use nv_flip::FlipPool;
 use vello::{
-    peniko::{Format, Image},
+    peniko::{Image, ImageFormat},
     Scene,
 };
 
@@ -284,7 +284,7 @@ pub fn snapshot_test_image(
         unreachable!();
     }
     // Compare the images using nv-flip
-    assert_eq!(raw_rendered.format, Format::Rgba8);
+    assert_eq!(raw_rendered.format, ImageFormat::Rgba8);
     let rendered_data: DynamicImage = image::RgbaImage::from_raw(
         raw_rendered.width,
         raw_rendered.height,

diff --git a/vello_tests/tests/known_issues.rs b/vello_tests/tests/known_issues.rs
@@ -14,7 +14,7 @@
 
 use vello::{
     kurbo::{Affine, Rect},
-    peniko::{color::palette, Format},
+    peniko::{color::palette, ImageFormat},
     Scene,
 };
 use vello_tests::TestParams;
@@ -35,7 +35,7 @@ fn many_bins(use_cpu: bool) {
     };
     // To view, use VELLO_DEBUG_TEST=many_bins
     let image = vello_tests::render_then_debug_sync(&scene, &params).unwrap();
-    assert_eq!(image.format, Format::Rgba8);
+    assert_eq!(image.format, ImageFormat::Rgba8);
     let mut red_count = 0;
     let mut black_count = 0;
     for pixel in image.data.data().chunks_exact(4) {

diff --git a/vello_tests/tests/property.rs b/vello_tests/tests/property.rs
@@ -12,7 +12,7 @@
 )]
 
 use vello::kurbo::{Affine, Rect};
-use vello::peniko::{color::palette, Brush, Color, Format};
+use vello::peniko::{color::palette, Brush, Color, ImageFormat};
 use vello::Scene;
 use vello_tests::TestParams;
 
@@ -30,7 +30,7 @@ fn simple_square(use_cpu: bool) {
         ..TestParams::new("simple_square", 150, 150)
     };
     let image = vello_tests::render_then_debug_sync(&scene, &params).unwrap();
-    assert_eq!(image.format, Format::Rgba8);
+    assert_eq!(image.format, ImageFormat::Rgba8);
     let mut red_count = 0;
     let mut black_count = 0;
     for pixel in image.data.data().chunks_exact(4) {
@@ -64,7 +64,7 @@ fn empty_scene(use_cpu: bool) {
         ..TestParams::new("simple_square", 150, 150)
     };
     let image = vello_tests::render_then_debug_sync(&scene, &params).unwrap();
-    assert_eq!(image.format, Format::Rgba8);
+    assert_eq!(image.format, ImageFormat::Rgba8);
     for pixel in image.data.data().chunks_exact(4) {
         let &[r, g, b, a] = pixel else { unreachable!() };
         let image_color = Color::from_rgba8(r, g, b, a);