diff --git a/Cargo.lock b/Cargo.lock index 0e46721db..917e94937 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -936,17 +936,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" -[[package]] -name = "d3d12" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307" -dependencies = [ - "bitflags 2.5.0", - "libloading 0.8.3", - "winapi", -] - [[package]] name = "d3d12" version = "0.20.0" @@ -1141,12 +1130,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "font-types" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b7f6040d337bd44434ab21fc6509154edf2cece88b23758d9d64654c4e7730b" - [[package]] name = "font-types" version = "0.5.5" @@ -1603,7 +1586,7 @@ dependencies = [ "lazy_static", "regex", "rust-fontconfig", - "vello 0.1.0", + "vello", ] [[package]] @@ -1667,8 +1650,8 @@ dependencies = [ "image", "raw-window-handle", "smallvec", - "vello 0.2.0", - "wgpu 0.20.0", + "vello", + "wgpu", ] [[package]] @@ -1731,17 +1714,6 @@ dependencies = [ "windows", ] -[[package]] -name = "gpu-descriptor" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" -dependencies = [ - "bitflags 2.5.0", - "gpu-descriptor-types 0.1.2", - "hashbrown", -] - [[package]] name = "gpu-descriptor" version = "0.3.0" @@ -1749,19 +1721,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" dependencies = [ "bitflags 2.5.0", - "gpu-descriptor-types 0.2.0", + "gpu-descriptor-types", "hashbrown", ] -[[package]] -name = "gpu-descriptor-types" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" -dependencies = [ - "bitflags 2.5.0", -] - [[package]] name = "gpu-descriptor-types" version = "0.2.0" @@ -2341,21 +2304,6 @@ dependencies = [ "libc", ] -[[package]] -name = "metal" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" -dependencies = [ - "bitflags 2.5.0", - "block", - "core-graphics-types", - "foreign-types", - "log", - "objc", - "paste", -] - [[package]] name = "metal" version = "0.28.0" @@ -2408,26 +2356,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "naga" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e3524642f53d9af419ab5e8dd29d3ba155708267667c2f3f06c88c9e130843" -dependencies = [ - "bit-set", - "bitflags 2.5.0", - "codespan-reporting", - "hexf-parse", - "indexmap", - "log", - "num-traits", - "rustc-hash", - "spirv", - "termcolor", - "thiserror", - "unicode-xid", -] - [[package]] name = "naga" version = "0.20.0" @@ -2627,7 +2555,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ "malloc_buf", - "objc_exception", ] [[package]] @@ -2730,15 +2657,6 @@ dependencies = [ "objc2-metal", ] -[[package]] -name = "objc_exception" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" -dependencies = [ - "cc", -] - [[package]] name = "object" version = "0.32.2" @@ -3263,15 +3181,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "read-fonts" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ea23eedb4d938031b6d4343222444608727a6aa68ec355e13588d9947ffe92" -dependencies = [ - "font-types 0.4.3", -] - [[package]] name = "read-fonts" version = "0.19.3" @@ -3279,7 +3188,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8b8af39d1f23869711ad4cea5e7835a20daa987f80232f7f2a2374d648ca64d" dependencies = [ "bytemuck", - "font-types 0.5.5", + "font-types", ] [[package]] @@ -3579,15 +3488,6 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" -[[package]] -name = "skrifa" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff28ee3b66d43060ef9a327e0f18e4c1813f194120156b4d4524fac3ba8ce22" -dependencies = [ - "read-fonts 0.15.6", -] - [[package]] name = "skrifa" version = "0.19.3" @@ -3595,7 +3495,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ab45fb68b53576a43d4fc0e9ec8ea64e29a4d2cc7f44506964cb75f288222e9" dependencies = [ "bytemuck", - "read-fonts 0.19.3", + "read-fonts", ] [[package]] @@ -4219,21 +4119,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "vello" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9a4b96a2d6d6effa67868b4436560e3a767f71f0e043df007587c5d6b2e8b7a" -dependencies = [ - "bytemuck", - "futures-intrusive", - "peniko", - "raw-window-handle", - "skrifa 0.15.5", - "vello_encoding 0.1.0", - "wgpu 0.19.4", -] - [[package]] name = "vello" version = "0.2.0" @@ -4245,24 +4130,12 @@ dependencies = [ "log", "peniko", "raw-window-handle", - "skrifa 0.19.3", + "skrifa", "static_assertions", "thiserror", - "vello_encoding 0.2.0", + "vello_encoding", "vello_shaders", - "wgpu 0.20.0", -] - -[[package]] -name = "vello_encoding" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c5b6c6ec113c9b6ee1e1894ccef1b5559373aead718b7442811f2fefff7d423" -dependencies = [ - "bytemuck", - "guillotiere", - "peniko", - "skrifa 0.15.5", + "wgpu", ] [[package]] @@ -4274,7 +4147,7 @@ dependencies = [ "bytemuck", "guillotiere", "peniko", - "skrifa 0.19.3", + "skrifa", "smallvec", ] @@ -4285,9 +4158,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f3f31e3763e09febb449533238551bca5203aff4513324c8558b4c0b1c546fb" dependencies = [ "bytemuck", - "naga 0.20.0", + "naga", "thiserror", - "vello_encoding 0.2.0", + "vello_encoding", ] [[package]] @@ -4553,31 +4426,6 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" -[[package]] -name = "wgpu" -version = "0.19.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbd7311dbd2abcfebaabf1841a2824ed7c8be443a0f29166e5d3c6a53a762c01" -dependencies = [ - "arrayvec", - "cfg-if", - "cfg_aliases 0.1.1", - "js-sys", - "log", - "naga 0.19.2", - "parking_lot", - "profiling", - "raw-window-handle", - "smallvec", - "static_assertions", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "wgpu-core 0.19.3", - "wgpu-hal 0.19.3", - "wgpu-types 0.19.2", -] - [[package]] name = "wgpu" version = "0.20.0" @@ -4590,7 +4438,7 @@ dependencies = [ "document-features", "js-sys", "log", - "naga 0.20.0", + "naga", "parking_lot", "profiling", "raw-window-handle", @@ -4599,35 +4447,9 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "wgpu-core 0.20.0", - "wgpu-hal 0.20.0", - "wgpu-types 0.20.0", -] - -[[package]] -name = "wgpu-core" -version = "0.19.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9f6b033c2f00ae0bc8ea872c5989777c60bc241aac4e58b24774faa8b391f78" -dependencies = [ - "arrayvec", - "bit-vec", - "bitflags 2.5.0", - "cfg_aliases 0.1.1", - "codespan-reporting", - "indexmap", - "log", - "naga 0.19.2", - "once_cell", - "parking_lot", - "profiling", - "raw-window-handle", - "rustc-hash", - "smallvec", - "thiserror", - "web-sys", - "wgpu-hal 0.19.3", - "wgpu-types 0.19.2", + "wgpu-core", + "wgpu-hal", + "wgpu-types", ] [[package]] @@ -4644,7 +4466,7 @@ dependencies = [ "document-features", "indexmap", "log", - "naga 0.20.0", + "naga", "once_cell", "parking_lot", "profiling", @@ -4653,53 +4475,8 @@ dependencies = [ "smallvec", "thiserror", "web-sys", - "wgpu-hal 0.20.0", - "wgpu-types 0.20.0", -] - -[[package]] -name = "wgpu-hal" -version = "0.19.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f972c280505ab52ffe17e94a7413d9d54b58af0114ab226b9fc4999a47082e" -dependencies = [ - "android_system_properties", - "arrayvec", - "ash", - "bit-set", - "bitflags 2.5.0", - "block", - "cfg_aliases 0.1.1", - "core-graphics-types", - "d3d12 0.19.0", - "glow", - "glutin_wgl_sys", - "gpu-alloc", - "gpu-allocator", - "gpu-descriptor 0.2.4", - "hassle-rs", - "js-sys", - "khronos-egl", - "libc", - "libloading 0.8.3", - "log", - "metal 0.27.0", - "naga 0.19.2", - "ndk-sys 0.5.0+25.2.9519653", - "objc", - "once_cell", - "parking_lot", - "profiling", - "range-alloc", - "raw-window-handle", - "renderdoc-sys", - "rustc-hash", - "smallvec", - "thiserror", - "wasm-bindgen", - "web-sys", - "wgpu-types 0.19.2", - "winapi", + "wgpu-hal", + "wgpu-types", ] [[package]] @@ -4716,20 +4493,20 @@ dependencies = [ "block", "cfg_aliases 0.1.1", "core-graphics-types", - "d3d12 0.20.0", + "d3d12", "glow", "glutin_wgl_sys", "gpu-alloc", "gpu-allocator", - "gpu-descriptor 0.3.0", + "gpu-descriptor", "hassle-rs", "js-sys", "khronos-egl", "libc", "libloading 0.8.3", "log", - "metal 0.28.0", - "naga 0.20.0", + "metal", + "naga", "ndk-sys 0.5.0+25.2.9519653", "objc", "once_cell", @@ -4743,21 +4520,10 @@ dependencies = [ "thiserror", "wasm-bindgen", "web-sys", - "wgpu-types 0.20.0", + "wgpu-types", "winapi", ] -[[package]] -name = "wgpu-types" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b671ff9fb03f78b46ff176494ee1ebe7d603393f42664be55b64dc8d53969805" -dependencies = [ - "bitflags 2.5.0", - "js-sys", - "web-sys", -] - [[package]] name = "wgpu-types" version = "0.20.0" diff --git a/crates/gosub_styling/Cargo.toml b/crates/gosub_styling/Cargo.toml index dd7aaa9b2..192a75a54 100644 --- a/crates/gosub_styling/Cargo.toml +++ b/crates/gosub_styling/Cargo.toml @@ -15,7 +15,7 @@ lazy_static = "1.4" anyhow = "1.0.86" regex = "1.10.4" colors-transform = "0.2.11" -vello = "0.1.0" +vello = "0.2.0" #[target.'cfg(target_arch = "wasm32")'.dependencies] #web-sys = { version = "0.3.69", features = ["fontface"] }