From 934fd11cc1a50c6b3e54fbac5d914f7586177f23 Mon Sep 17 00:00:00 2001 From: Nico Burns Date: Fri, 9 Oct 2026 23:09:57 +0100 Subject: [PATCH] Upgrade to skrifa 0.48 --- Cargo.lock | 27 ++++++++++--------- Cargo.toml | 2 +- .../snapshots/glyphs_bitmap_sbix_cff.png | 4 +-- .../glyphs_bitmap_sbix_cff_cached.png | 4 +-- .../snapshots/glyphs_bitmap_sbix_glyf.png | 4 +-- .../glyphs_bitmap_sbix_glyf_cached.png | 4 +-- vello_tests/tests/glyph.rs | 4 --- 7 files changed, 23 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7c03e211a..916c7dc8e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1159,9 +1159,9 @@ checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" [[package]] name = "font-types" -version = "0.12.1" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad67eced03f5504d9cbd3a879b5958b5c54d4e5fd794361c6eb21b05fb703411" +checksum = "6c92d9081c7ab3bd83ef1eecdfad090f3d966e3ce74106779664114cfe1a6274" dependencies = [ "bytemuck", ] @@ -1373,7 +1373,7 @@ dependencies = [ "log", "peniko", "png", - "skrifa 0.44.0", + "skrifa 0.48.0", "smallvec", "vello_common", ] @@ -3383,14 +3383,15 @@ dependencies = [ [[package]] name = "read-fonts" -version = "0.41.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046a7d674daf459825b32f5062056d6882db0d2f5a479fbd76ccfc870ac18709" +checksum = "8a5b7bed3d16ab428d8fa533640ab805ff50e7ad8a4d00649de1259e70023282" dependencies = [ "bytemuck", "core_maths", "font-types", "once_cell", + "yoke", ] [[package]] @@ -3589,7 +3590,7 @@ dependencies = [ "image", "rand", "roxmltree 0.20.0", - "skrifa 0.44.0", + "skrifa 0.48.0", "vello", "web-time", ] @@ -3811,13 +3812,13 @@ dependencies = [ [[package]] name = "skrifa" -version = "0.44.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819ab7d62b1d3e72d9d9dea5650bac30424f9111364bb94928dbf5ecad1baa68" +checksum = "a5213b4825bac3587046330052d61bfac7bd3bd0d203c758d7c2ef726fcea034" dependencies = [ "bytemuck", "core_maths", - "read-fonts 0.41.0", + "read-fonts 0.45.0", ] [[package]] @@ -4462,7 +4463,7 @@ dependencies = [ "log", "peniko", "png", - "skrifa 0.44.0", + "skrifa 0.48.0", "static_assertions", "thiserror 2.0.21", "vello_encoding", @@ -4547,7 +4548,7 @@ dependencies = [ "bytemuck", "guillotiere", "peniko", - "skrifa 0.44.0", + "skrifa 0.48.0", "smallvec", ] @@ -4562,7 +4563,7 @@ dependencies = [ "image", "log", "parley", - "skrifa 0.44.0", + "skrifa 0.48.0", "smallvec", "vello_common", "vello_cpu", @@ -4676,7 +4677,7 @@ dependencies = [ "glifo", "oxipng", "pollster", - "skrifa 0.44.0", + "skrifa 0.48.0", "smallvec", "vello_common", "vello_cpu", diff --git a/Cargo.toml b/Cargo.toml index e66416ea5..d0b396d30 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -108,7 +108,7 @@ vello = { version = "0.11.0", path = "research/vello_research" } vello_encoding = { version = "0.11.0", path = "research/vello_encoding" } vello_shaders = { version = "0.11.0", path = "research/vello_shaders" } bytemuck = { version = "1.25.0", features = ["derive"] } -skrifa = { version = "0.44.0", default-features = false, features = ["autohint_shaping"] } +skrifa = { version = "0.48.0", default-features = false, features = ["autohint_shaping"] } # The version of kurbo used below should be kept in sync # with the version of kurbo used by peniko. peniko = { version = "0.6.1", default-features = false } diff --git a/vello_tests/snapshots/glyphs_bitmap_sbix_cff.png b/vello_tests/snapshots/glyphs_bitmap_sbix_cff.png index 70a10f0c5..4ce90b964 100644 --- a/vello_tests/snapshots/glyphs_bitmap_sbix_cff.png +++ b/vello_tests/snapshots/glyphs_bitmap_sbix_cff.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ca11c4c2ed3befdb26bac54428206eadea567ad8d7f0b1e41fd3b367f797e2a -size 582 +oid sha256:f6654ea1c33c84ce9c43d344b937b70baf8e6aa6b575e37ef4abfab01bb2b37b +size 526 diff --git a/vello_tests/snapshots/glyphs_bitmap_sbix_cff_cached.png b/vello_tests/snapshots/glyphs_bitmap_sbix_cff_cached.png index 70a10f0c5..4ce90b964 100644 --- a/vello_tests/snapshots/glyphs_bitmap_sbix_cff_cached.png +++ b/vello_tests/snapshots/glyphs_bitmap_sbix_cff_cached.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ca11c4c2ed3befdb26bac54428206eadea567ad8d7f0b1e41fd3b367f797e2a -size 582 +oid sha256:f6654ea1c33c84ce9c43d344b937b70baf8e6aa6b575e37ef4abfab01bb2b37b +size 526 diff --git a/vello_tests/snapshots/glyphs_bitmap_sbix_glyf.png b/vello_tests/snapshots/glyphs_bitmap_sbix_glyf.png index 5a4f6149b..4ce90b964 100644 --- a/vello_tests/snapshots/glyphs_bitmap_sbix_glyf.png +++ b/vello_tests/snapshots/glyphs_bitmap_sbix_glyf.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1ba7e330f2153a6e2b0d1fac801272cc8b3bb491fb34d10174f7a1e2f081575 -size 532 +oid sha256:f6654ea1c33c84ce9c43d344b937b70baf8e6aa6b575e37ef4abfab01bb2b37b +size 526 diff --git a/vello_tests/snapshots/glyphs_bitmap_sbix_glyf_cached.png b/vello_tests/snapshots/glyphs_bitmap_sbix_glyf_cached.png index 5a4f6149b..4ce90b964 100644 --- a/vello_tests/snapshots/glyphs_bitmap_sbix_glyf_cached.png +++ b/vello_tests/snapshots/glyphs_bitmap_sbix_glyf_cached.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1ba7e330f2153a6e2b0d1fac801272cc8b3bb491fb34d10174f7a1e2f081575 -size 532 +oid sha256:f6654ea1c33c84ce9c43d344b937b70baf8e6aa6b575e37ef4abfab01bb2b37b +size 526 diff --git a/vello_tests/tests/glyph.rs b/vello_tests/tests/glyph.rs index 478613b1b..119086a17 100644 --- a/vello_tests/tests/glyph.rs +++ b/vello_tests/tests/glyph.rs @@ -948,8 +948,6 @@ fn glyphs_bitmap_apple(ctx: &mut impl Renderer, enable_caching: bool) { .unwrap(); } -// Note that there are still four cases (which can be reduced to 2 underlying issues) -// that don't yet render the same as in CoreText. #[vello_test(width = 288, height = 240, skip_gpu, glyph)] fn glyphs_bitmap_sbix_glyf(ctx: &mut impl Renderer, enable_caching: bool) { draw_sbix_grid( @@ -959,8 +957,6 @@ fn glyphs_bitmap_sbix_glyf(ctx: &mut impl Renderer, enable_caching: bool) { ); } -// Couple of glyphs are misplaced, due to the same bug affecting two glyphs -// in the `glyf` test. #[vello_test(width = 288, height = 240, skip_gpu, glyph)] fn glyphs_bitmap_sbix_cff(ctx: &mut impl Renderer, enable_caching: bool) { draw_sbix_grid(