From d850b8bbc2cd86429612386a25a23330faa7c93c Mon Sep 17 00:00:00 2001 From: kamiduki Date: Mon, 15 Jun 2026 17:39:21 +0800 Subject: [PATCH 1/3] Disable default features of vello --- Cargo.lock | 333 ++++---------------------------- imaging_vello/Cargo.toml | 7 +- imaging_vello_hybrid/Cargo.toml | 8 +- 3 files changed, 49 insertions(+), 299 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cb4f6fc..e91e980 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -842,37 +842,6 @@ dependencies = [ "gl_generator", ] -[[package]] -name = "gpu-alloc" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" -dependencies = [ - "bitflags 2.11.1", - "gpu-alloc-types", -] - -[[package]] -name = "gpu-alloc-types" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" -dependencies = [ - "bitflags 2.11.1", -] - -[[package]] -name = "gpu-allocator" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c151a2a5ef800297b4e79efa4f4bec035c5f51d5ae587287c9b952bdf734cacd" -dependencies = [ - "log", - "presser", - "thiserror 1.0.69", - "windows 0.58.0", -] - [[package]] name = "gpu-allocator" version = "0.28.0" @@ -883,8 +852,8 @@ dependencies = [ "hashbrown 0.16.1", "log", "presser", - "thiserror 2.0.18", - "windows 0.62.2", + "thiserror", + "windows", ] [[package]] @@ -1072,7 +1041,7 @@ dependencies = [ "js-sys", "log", "wasm-bindgen", - "windows-core 0.62.2", + "windows-core", ] [[package]] @@ -1153,7 +1122,7 @@ dependencies = [ "peniko", "skia-safe", "wgpu 28.0.0", - "windows 0.62.2", + "windows", ] [[package]] @@ -1200,6 +1169,7 @@ dependencies = [ "vello 0.7.0", "vello 0.8.0", "vello 0.9.0", + "wgpu 29.0.3", ] [[package]] @@ -1343,7 +1313,7 @@ dependencies = [ "log", "oxipng", "rayon", - "thiserror 2.0.18", + "thiserror", "walkdir", ] @@ -1492,21 +1462,6 @@ version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8" -[[package]] -name = "metal" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00c15a6f673ff72ddcc22394663290f870fb224c1bfce55734a75c414150e605" -dependencies = [ - "bitflags 2.11.1", - "block", - "core-graphics-types", - "foreign-types", - "log", - "objc", - "paste", -] - [[package]] name = "metal" version = "0.33.0" @@ -1586,8 +1541,7 @@ dependencies = [ "num-traits", "once_cell", "rustc-hash 1.1.0", - "spirv 0.3.0+sdk-1.3.268.0", - "thiserror 2.0.18", + "thiserror", "unicode-ident", ] @@ -1613,7 +1567,7 @@ dependencies = [ "once_cell", "rustc-hash 1.1.0", "spirv 0.3.0+sdk-1.3.268.0", - "thiserror 2.0.18", + "thiserror", "unicode-ident", ] @@ -1639,7 +1593,7 @@ dependencies = [ "once_cell", "rustc-hash 1.1.0", "spirv 0.4.0+sdk-1.4.341.0", - "thiserror 2.0.18", + "thiserror", "unicode-ident", ] @@ -2328,7 +2282,7 @@ dependencies = [ "percent-encoding", "skia-bindings", "skia-svg-macros", - "windows 0.62.2", + "windows", ] [[package]] @@ -2515,33 +2469,13 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "thiserror" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -dependencies = [ - "thiserror-impl 1.0.69", -] - [[package]] name = "thiserror" version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" dependencies = [ - "thiserror-impl 2.0.18", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -dependencies = [ - "proc-macro2", - "quote", - "syn", + "thiserror-impl", ] [[package]] @@ -2835,7 +2769,7 @@ dependencies = [ "png 0.17.16", "skrifa 0.40.0", "static_assertions", - "thiserror 2.0.18", + "thiserror", "vello_encoding 0.7.0", "vello_shaders 0.7.0", "wgpu 27.0.1", @@ -2854,7 +2788,7 @@ dependencies = [ "png 0.18.1", "skrifa 0.40.0", "static_assertions", - "thiserror 2.0.18", + "thiserror", "vello_encoding 0.8.0", "vello_shaders 0.8.0", "wgpu 28.0.0", @@ -2873,7 +2807,7 @@ dependencies = [ "png 0.18.1", "skrifa 0.42.1", "static_assertions", - "thiserror 2.0.18", + "thiserror", "vello_encoding 0.9.0", "vello_shaders 0.9.0", "wgpu 29.0.3", @@ -2894,7 +2828,7 @@ dependencies = [ "peniko", "png 0.18.1", "smallvec", - "thiserror 2.0.18", + "thiserror", ] [[package]] @@ -2959,7 +2893,7 @@ dependencies = [ "glifo", "hashbrown 0.17.1", "log", - "thiserror 2.0.18", + "thiserror", "vello_common", "vello_sparse_shaders", "wgpu 29.0.3", @@ -2974,7 +2908,7 @@ dependencies = [ "bytemuck", "log", "naga 27.0.3", - "thiserror 2.0.18", + "thiserror", "vello_encoding 0.7.0", ] @@ -2987,7 +2921,7 @@ dependencies = [ "bytemuck", "log", "naga 28.0.0", - "thiserror 2.0.18", + "thiserror", "vello_encoding 0.8.0", ] @@ -3000,7 +2934,7 @@ dependencies = [ "bytemuck", "log", "naga 29.0.3", - "thiserror 2.0.18", + "thiserror", "vello_encoding 0.9.0", ] @@ -3127,18 +3061,12 @@ dependencies = [ "cfg_aliases", "document-features", "hashbrown 0.16.1", - "js-sys", "log", - "naga 27.0.3", - "parking_lot", "portable-atomic", "profiling", "raw-window-handle", "smallvec", "static_assertions", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", "wgpu-core 27.0.3", "wgpu-hal 27.0.4", "wgpu-types 27.0.1", @@ -3228,9 +3156,7 @@ dependencies = [ "raw-window-handle", "rustc-hash 1.1.0", "smallvec", - "thiserror 2.0.18", - "wgpu-core-deps-apple 27.0.0", - "wgpu-core-deps-emscripten 27.0.0", + "thiserror", "wgpu-core-deps-windows-linux-android 27.0.0", "wgpu-hal 27.0.4", "wgpu-types 27.0.1", @@ -3260,7 +3186,7 @@ dependencies = [ "raw-window-handle", "rustc-hash 1.1.0", "smallvec", - "thiserror 2.0.18", + "thiserror", "wgpu-core-deps-apple 28.0.0", "wgpu-core-deps-emscripten 28.0.0", "wgpu-core-deps-windows-linux-android 28.0.0", @@ -3292,7 +3218,7 @@ dependencies = [ "raw-window-handle", "rustc-hash 1.1.0", "smallvec", - "thiserror 2.0.18", + "thiserror", "wgpu-core-deps-apple 29.0.3", "wgpu-core-deps-emscripten 29.0.3", "wgpu-core-deps-windows-linux-android 29.0.3", @@ -3301,15 +3227,6 @@ dependencies = [ "wgpu-types 29.0.3", ] -[[package]] -name = "wgpu-core-deps-apple" -version = "27.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0772ae958e9be0c729561d5e3fd9a19679bcdfb945b8b1a1969d9bfe8056d233" -dependencies = [ - "wgpu-hal 27.0.4", -] - [[package]] name = "wgpu-core-deps-apple" version = "28.0.0" @@ -3328,15 +3245,6 @@ dependencies = [ "wgpu-hal 29.0.3", ] -[[package]] -name = "wgpu-core-deps-emscripten" -version = "27.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06ac3444a95b0813ecfd81ddb2774b66220b264b3e2031152a4a29fda4da6b5" -dependencies = [ - "wgpu-hal 27.0.4", -] - [[package]] name = "wgpu-core-deps-emscripten" version = "28.0.0" @@ -3388,47 +3296,18 @@ version = "27.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b21cb61c57ee198bc4aff71aeadff4cbb80b927beb912506af9c780d64313ce" dependencies = [ - "android_system_properties", - "arrayvec", - "ash", - "bit-set 0.8.0", "bitflags 2.11.1", - "block", - "bytemuck", "cfg-if", "cfg_aliases", - "core-graphics-types", - "glow 0.16.0", - "glutin_wgl_sys", - "gpu-alloc", - "gpu-allocator 0.27.0", - "gpu-descriptor", - "hashbrown 0.16.1", - "js-sys", - "khronos-egl", - "libc", "libloading", "log", - "metal 0.32.0", "naga 27.0.3", - "ndk-sys", - "objc", - "once_cell", - "ordered-float", - "parking_lot", "portable-atomic", "portable-atomic-util", - "profiling", - "range-alloc", "raw-window-handle", "renderdoc-sys", - "smallvec", - "thiserror 2.0.18", - "wasm-bindgen", - "web-sys", + "thiserror", "wgpu-types 27.0.1", - "windows 0.58.0", - "windows-core 0.58.0", ] [[package]] @@ -3449,7 +3328,7 @@ dependencies = [ "core-graphics-types", "glow 0.16.0", "glutin_wgl_sys", - "gpu-allocator 0.28.0", + "gpu-allocator", "gpu-descriptor", "hashbrown 0.16.1", "js-sys", @@ -3457,7 +3336,7 @@ dependencies = [ "libc", "libloading", "log", - "metal 0.33.0", + "metal", "naga 28.0.0", "ndk-sys", "objc", @@ -3471,12 +3350,12 @@ dependencies = [ "raw-window-handle", "renderdoc-sys", "smallvec", - "thiserror 2.0.18", + "thiserror", "wasm-bindgen", "web-sys", "wgpu-types 28.0.0", - "windows 0.62.2", - "windows-core 0.62.2", + "windows", + "windows-core", ] [[package]] @@ -3496,7 +3375,7 @@ dependencies = [ "cfg_aliases", "glow 0.17.0", "glutin_wgl_sys", - "gpu-allocator 0.28.0", + "gpu-allocator", "gpu-descriptor", "hashbrown 0.16.1", "js-sys", @@ -3522,15 +3401,15 @@ dependencies = [ "raw-window-metal", "renderdoc-sys", "smallvec", - "thiserror 2.0.18", + "thiserror", "wasm-bindgen", "wayland-sys", "web-sys", "wgpu-naga-bridge", "wgpu-types 29.0.3", - "windows 0.62.2", - "windows-core 0.62.2", - "windows-result 0.4.1", + "windows", + "windows-core", + "windows-result", ] [[package]] @@ -3553,7 +3432,7 @@ dependencies = [ "bytemuck", "js-sys", "log", - "thiserror 2.0.18", + "thiserror", "web-sys", ] @@ -3593,16 +3472,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "windows" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" -dependencies = [ - "windows-core 0.58.0", - "windows-targets", -] - [[package]] name = "windows" version = "0.62.2" @@ -3610,7 +3479,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580" dependencies = [ "windows-collections", - "windows-core 0.62.2", + "windows-core", "windows-future", "windows-numerics", ] @@ -3621,20 +3490,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610" dependencies = [ - "windows-core 0.62.2", -] - -[[package]] -name = "windows-core" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" -dependencies = [ - "windows-implement 0.58.0", - "windows-interface 0.58.0", - "windows-result 0.2.0", - "windows-strings 0.1.0", - "windows-targets", + "windows-core", ] [[package]] @@ -3643,11 +3499,11 @@ version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ - "windows-implement 0.60.2", - "windows-interface 0.59.3", + "windows-implement", + "windows-interface", "windows-link", - "windows-result 0.4.1", - "windows-strings 0.5.1", + "windows-result", + "windows-strings", ] [[package]] @@ -3656,22 +3512,11 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb" dependencies = [ - "windows-core 0.62.2", + "windows-core", "windows-link", "windows-threading", ] -[[package]] -name = "windows-implement" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "windows-implement" version = "0.60.2" @@ -3683,17 +3528,6 @@ dependencies = [ "syn", ] -[[package]] -name = "windows-interface" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "windows-interface" version = "0.59.3" @@ -3717,19 +3551,10 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26" dependencies = [ - "windows-core 0.62.2", + "windows-core", "windows-link", ] -[[package]] -name = "windows-result" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" -dependencies = [ - "windows-targets", -] - [[package]] name = "windows-result" version = "0.4.1" @@ -3739,16 +3564,6 @@ dependencies = [ "windows-link", ] -[[package]] -name = "windows-strings" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" -dependencies = [ - "windows-result 0.2.0", - "windows-targets", -] - [[package]] name = "windows-strings" version = "0.5.1" @@ -3767,22 +3582,6 @@ dependencies = [ "windows-link", ] -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - [[package]] name = "windows-threading" version = "0.2.1" @@ -3792,54 +3591,6 @@ dependencies = [ "windows-link", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - [[package]] name = "winnow" version = "1.0.3" diff --git a/imaging_vello/Cargo.toml b/imaging_vello/Cargo.toml index 7032af1..7618638 100644 --- a/imaging_vello/Cargo.toml +++ b/imaging_vello/Cargo.toml @@ -15,9 +15,9 @@ imaging = { features = ["std"], workspace = true } imaging_wgpu = { default-features = false, workspace = true } kurbo = { default-features = true, workspace = true } peniko = { default-features = true, workspace = true } -vello_07 = { default-features = true, optional = true, package = "vello", version = "0.7.0" } -vello_08 = { default-features = true, optional = true, package = "vello", version = "0.8.0" } -vello_09 = { default-features = true, optional = true, package = "vello", version = "0.9.0" } +vello_07 = { default-features = false, features = ["wgpu"], optional = true, package = "vello", version = "0.7.0" } +vello_08 = { default-features = false, features = ["wgpu"], optional = true, package = "vello", version = "0.8.0" } +vello_09 = { default-features = false, features = ["wgpu"], optional = true, package = "vello", version = "0.9.0" } [features] default = ["vello-0-9"] @@ -27,6 +27,7 @@ vello-0-9 = ["dep:vello_09", "imaging_wgpu/wgpu-29"] [dev-dependencies] pollster = "0.4.0" +wgpu = { version = "29.0.3" } [lints] workspace = true diff --git a/imaging_vello_hybrid/Cargo.toml b/imaging_vello_hybrid/Cargo.toml index 9dacbeb..4a23ae2 100644 --- a/imaging_vello_hybrid/Cargo.toml +++ b/imaging_vello_hybrid/Cargo.toml @@ -17,17 +17,15 @@ imaging_wgpu = { default-features = false, features = ["wgpu-29"], workspace = t kurbo = { default-features = true, workspace = true } peniko = { default-features = true, workspace = true } vello_common = { default-features = true, version = "0.0.9" } -vello_hybrid = { default-features = true, version = "0.0.9" } -wgpu = { default-features = false, features = [ - "std", - "wgsl", -], version = "29.0.3" } +vello_hybrid = { default-features = false, features = ["wgpu", "text"], version = "0.0.9" } +wgpu = { default-features = false, version = "29.0.3" } [lints] workspace = true [dev-dependencies] pollster = "0.4.0" +wgpu = { version = "29.0.3" } [package.metadata.docs.rs] default-target = "x86_64-unknown-linux-gnu" From 4a2e457a432586ef74dddbbfa7fb918cad34fd98 Mon Sep 17 00:00:00 2001 From: kamiduki Date: Sat, 20 Jun 2026 10:38:37 +0800 Subject: [PATCH 2/3] style: format with taplo --- imaging_vello_hybrid/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/imaging_vello_hybrid/Cargo.toml b/imaging_vello_hybrid/Cargo.toml index 4a23ae2..409d145 100644 --- a/imaging_vello_hybrid/Cargo.toml +++ b/imaging_vello_hybrid/Cargo.toml @@ -17,7 +17,7 @@ imaging_wgpu = { default-features = false, features = ["wgpu-29"], workspace = t kurbo = { default-features = true, workspace = true } peniko = { default-features = true, workspace = true } vello_common = { default-features = true, version = "0.0.9" } -vello_hybrid = { default-features = false, features = ["wgpu", "text"], version = "0.0.9" } +vello_hybrid = { default-features = false, features = ["text", "wgpu"], version = "0.0.9" } wgpu = { default-features = false, version = "29.0.3" } [lints] From 984913d0e3f043e5f2d765a06b8639c42a110b47 Mon Sep 17 00:00:00 2001 From: kamiduki Date: Sat, 20 Jun 2026 10:39:30 +0800 Subject: [PATCH 3/3] fix: add dev deps to pass test --- Cargo.lock | 334 ++++++++++++++++++++++++++++++++++----- imaging_vello/Cargo.toml | 4 +- 2 files changed, 296 insertions(+), 42 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e91e980..9deb28c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -842,6 +842,37 @@ dependencies = [ "gl_generator", ] +[[package]] +name = "gpu-alloc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" +dependencies = [ + "bitflags 2.11.1", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" +dependencies = [ + "bitflags 2.11.1", +] + +[[package]] +name = "gpu-allocator" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c151a2a5ef800297b4e79efa4f4bec035c5f51d5ae587287c9b952bdf734cacd" +dependencies = [ + "log", + "presser", + "thiserror 1.0.69", + "windows 0.58.0", +] + [[package]] name = "gpu-allocator" version = "0.28.0" @@ -852,8 +883,8 @@ dependencies = [ "hashbrown 0.16.1", "log", "presser", - "thiserror", - "windows", + "thiserror 2.0.18", + "windows 0.62.2", ] [[package]] @@ -1041,7 +1072,7 @@ dependencies = [ "js-sys", "log", "wasm-bindgen", - "windows-core", + "windows-core 0.62.2", ] [[package]] @@ -1122,7 +1153,7 @@ dependencies = [ "peniko", "skia-safe", "wgpu 28.0.0", - "windows", + "windows 0.62.2", ] [[package]] @@ -1169,6 +1200,8 @@ dependencies = [ "vello 0.7.0", "vello 0.8.0", "vello 0.9.0", + "wgpu 27.0.1", + "wgpu 28.0.0", "wgpu 29.0.3", ] @@ -1313,7 +1346,7 @@ dependencies = [ "log", "oxipng", "rayon", - "thiserror", + "thiserror 2.0.18", "walkdir", ] @@ -1462,6 +1495,21 @@ version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8" +[[package]] +name = "metal" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00c15a6f673ff72ddcc22394663290f870fb224c1bfce55734a75c414150e605" +dependencies = [ + "bitflags 2.11.1", + "block", + "core-graphics-types", + "foreign-types", + "log", + "objc", + "paste", +] + [[package]] name = "metal" version = "0.33.0" @@ -1541,7 +1589,8 @@ dependencies = [ "num-traits", "once_cell", "rustc-hash 1.1.0", - "thiserror", + "spirv 0.3.0+sdk-1.3.268.0", + "thiserror 2.0.18", "unicode-ident", ] @@ -1567,7 +1616,7 @@ dependencies = [ "once_cell", "rustc-hash 1.1.0", "spirv 0.3.0+sdk-1.3.268.0", - "thiserror", + "thiserror 2.0.18", "unicode-ident", ] @@ -1593,7 +1642,7 @@ dependencies = [ "once_cell", "rustc-hash 1.1.0", "spirv 0.4.0+sdk-1.4.341.0", - "thiserror", + "thiserror 2.0.18", "unicode-ident", ] @@ -2282,7 +2331,7 @@ dependencies = [ "percent-encoding", "skia-bindings", "skia-svg-macros", - "windows", + "windows 0.62.2", ] [[package]] @@ -2469,13 +2518,33 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "thiserror" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] + [[package]] name = "thiserror" version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" dependencies = [ - "thiserror-impl", + "thiserror-impl 2.0.18", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -2769,7 +2838,7 @@ dependencies = [ "png 0.17.16", "skrifa 0.40.0", "static_assertions", - "thiserror", + "thiserror 2.0.18", "vello_encoding 0.7.0", "vello_shaders 0.7.0", "wgpu 27.0.1", @@ -2788,7 +2857,7 @@ dependencies = [ "png 0.18.1", "skrifa 0.40.0", "static_assertions", - "thiserror", + "thiserror 2.0.18", "vello_encoding 0.8.0", "vello_shaders 0.8.0", "wgpu 28.0.0", @@ -2807,7 +2876,7 @@ dependencies = [ "png 0.18.1", "skrifa 0.42.1", "static_assertions", - "thiserror", + "thiserror 2.0.18", "vello_encoding 0.9.0", "vello_shaders 0.9.0", "wgpu 29.0.3", @@ -2828,7 +2897,7 @@ dependencies = [ "peniko", "png 0.18.1", "smallvec", - "thiserror", + "thiserror 2.0.18", ] [[package]] @@ -2893,7 +2962,7 @@ dependencies = [ "glifo", "hashbrown 0.17.1", "log", - "thiserror", + "thiserror 2.0.18", "vello_common", "vello_sparse_shaders", "wgpu 29.0.3", @@ -2908,7 +2977,7 @@ dependencies = [ "bytemuck", "log", "naga 27.0.3", - "thiserror", + "thiserror 2.0.18", "vello_encoding 0.7.0", ] @@ -2921,7 +2990,7 @@ dependencies = [ "bytemuck", "log", "naga 28.0.0", - "thiserror", + "thiserror 2.0.18", "vello_encoding 0.8.0", ] @@ -2934,7 +3003,7 @@ dependencies = [ "bytemuck", "log", "naga 29.0.3", - "thiserror", + "thiserror 2.0.18", "vello_encoding 0.9.0", ] @@ -3061,12 +3130,18 @@ dependencies = [ "cfg_aliases", "document-features", "hashbrown 0.16.1", + "js-sys", "log", + "naga 27.0.3", + "parking_lot", "portable-atomic", "profiling", "raw-window-handle", "smallvec", "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", "wgpu-core 27.0.3", "wgpu-hal 27.0.4", "wgpu-types 27.0.1", @@ -3156,7 +3231,9 @@ dependencies = [ "raw-window-handle", "rustc-hash 1.1.0", "smallvec", - "thiserror", + "thiserror 2.0.18", + "wgpu-core-deps-apple 27.0.0", + "wgpu-core-deps-emscripten 27.0.0", "wgpu-core-deps-windows-linux-android 27.0.0", "wgpu-hal 27.0.4", "wgpu-types 27.0.1", @@ -3186,7 +3263,7 @@ dependencies = [ "raw-window-handle", "rustc-hash 1.1.0", "smallvec", - "thiserror", + "thiserror 2.0.18", "wgpu-core-deps-apple 28.0.0", "wgpu-core-deps-emscripten 28.0.0", "wgpu-core-deps-windows-linux-android 28.0.0", @@ -3218,7 +3295,7 @@ dependencies = [ "raw-window-handle", "rustc-hash 1.1.0", "smallvec", - "thiserror", + "thiserror 2.0.18", "wgpu-core-deps-apple 29.0.3", "wgpu-core-deps-emscripten 29.0.3", "wgpu-core-deps-windows-linux-android 29.0.3", @@ -3227,6 +3304,15 @@ dependencies = [ "wgpu-types 29.0.3", ] +[[package]] +name = "wgpu-core-deps-apple" +version = "27.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0772ae958e9be0c729561d5e3fd9a19679bcdfb945b8b1a1969d9bfe8056d233" +dependencies = [ + "wgpu-hal 27.0.4", +] + [[package]] name = "wgpu-core-deps-apple" version = "28.0.0" @@ -3245,6 +3331,15 @@ dependencies = [ "wgpu-hal 29.0.3", ] +[[package]] +name = "wgpu-core-deps-emscripten" +version = "27.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b06ac3444a95b0813ecfd81ddb2774b66220b264b3e2031152a4a29fda4da6b5" +dependencies = [ + "wgpu-hal 27.0.4", +] + [[package]] name = "wgpu-core-deps-emscripten" version = "28.0.0" @@ -3296,18 +3391,47 @@ version = "27.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b21cb61c57ee198bc4aff71aeadff4cbb80b927beb912506af9c780d64313ce" dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set 0.8.0", "bitflags 2.11.1", + "block", + "bytemuck", "cfg-if", "cfg_aliases", + "core-graphics-types", + "glow 0.16.0", + "glutin_wgl_sys", + "gpu-alloc", + "gpu-allocator 0.27.0", + "gpu-descriptor", + "hashbrown 0.16.1", + "js-sys", + "khronos-egl", + "libc", "libloading", "log", + "metal 0.32.0", "naga 27.0.3", + "ndk-sys", + "objc", + "once_cell", + "ordered-float", + "parking_lot", "portable-atomic", "portable-atomic-util", + "profiling", + "range-alloc", "raw-window-handle", "renderdoc-sys", - "thiserror", + "smallvec", + "thiserror 2.0.18", + "wasm-bindgen", + "web-sys", "wgpu-types 27.0.1", + "windows 0.58.0", + "windows-core 0.58.0", ] [[package]] @@ -3328,7 +3452,7 @@ dependencies = [ "core-graphics-types", "glow 0.16.0", "glutin_wgl_sys", - "gpu-allocator", + "gpu-allocator 0.28.0", "gpu-descriptor", "hashbrown 0.16.1", "js-sys", @@ -3336,7 +3460,7 @@ dependencies = [ "libc", "libloading", "log", - "metal", + "metal 0.33.0", "naga 28.0.0", "ndk-sys", "objc", @@ -3350,12 +3474,12 @@ dependencies = [ "raw-window-handle", "renderdoc-sys", "smallvec", - "thiserror", + "thiserror 2.0.18", "wasm-bindgen", "web-sys", "wgpu-types 28.0.0", - "windows", - "windows-core", + "windows 0.62.2", + "windows-core 0.62.2", ] [[package]] @@ -3375,7 +3499,7 @@ dependencies = [ "cfg_aliases", "glow 0.17.0", "glutin_wgl_sys", - "gpu-allocator", + "gpu-allocator 0.28.0", "gpu-descriptor", "hashbrown 0.16.1", "js-sys", @@ -3401,15 +3525,15 @@ dependencies = [ "raw-window-metal", "renderdoc-sys", "smallvec", - "thiserror", + "thiserror 2.0.18", "wasm-bindgen", "wayland-sys", "web-sys", "wgpu-naga-bridge", "wgpu-types 29.0.3", - "windows", - "windows-core", - "windows-result", + "windows 0.62.2", + "windows-core 0.62.2", + "windows-result 0.4.1", ] [[package]] @@ -3432,7 +3556,7 @@ dependencies = [ "bytemuck", "js-sys", "log", - "thiserror", + "thiserror 2.0.18", "web-sys", ] @@ -3472,6 +3596,16 @@ dependencies = [ "windows-sys", ] +[[package]] +name = "windows" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" +dependencies = [ + "windows-core 0.58.0", + "windows-targets", +] + [[package]] name = "windows" version = "0.62.2" @@ -3479,7 +3613,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580" dependencies = [ "windows-collections", - "windows-core", + "windows-core 0.62.2", "windows-future", "windows-numerics", ] @@ -3490,7 +3624,20 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610" dependencies = [ - "windows-core", + "windows-core 0.62.2", +] + +[[package]] +name = "windows-core" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" +dependencies = [ + "windows-implement 0.58.0", + "windows-interface 0.58.0", + "windows-result 0.2.0", + "windows-strings 0.1.0", + "windows-targets", ] [[package]] @@ -3499,11 +3646,11 @@ version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ - "windows-implement", - "windows-interface", + "windows-implement 0.60.2", + "windows-interface 0.59.3", "windows-link", - "windows-result", - "windows-strings", + "windows-result 0.4.1", + "windows-strings 0.5.1", ] [[package]] @@ -3512,11 +3659,22 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb" dependencies = [ - "windows-core", + "windows-core 0.62.2", "windows-link", "windows-threading", ] +[[package]] +name = "windows-implement" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "windows-implement" version = "0.60.2" @@ -3528,6 +3686,17 @@ dependencies = [ "syn", ] +[[package]] +name = "windows-interface" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "windows-interface" version = "0.59.3" @@ -3551,10 +3720,19 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26" dependencies = [ - "windows-core", + "windows-core 0.62.2", "windows-link", ] +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets", +] + [[package]] name = "windows-result" version = "0.4.1" @@ -3564,6 +3742,16 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result 0.2.0", + "windows-targets", +] + [[package]] name = "windows-strings" version = "0.5.1" @@ -3582,6 +3770,22 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + [[package]] name = "windows-threading" version = "0.2.1" @@ -3591,6 +3795,54 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + [[package]] name = "winnow" version = "1.0.3" diff --git a/imaging_vello/Cargo.toml b/imaging_vello/Cargo.toml index 7618638..a035305 100644 --- a/imaging_vello/Cargo.toml +++ b/imaging_vello/Cargo.toml @@ -27,7 +27,9 @@ vello-0-9 = ["dep:vello_09", "imaging_wgpu/wgpu-29"] [dev-dependencies] pollster = "0.4.0" -wgpu = { version = "29.0.3" } +wgpu_27 = { package = "wgpu", version = "27" } +wgpu_28 = { package = "wgpu", version = "28" } +wgpu_29 = { package = "wgpu", version = "29" } [lints] workspace = true