diff --git a/Cargo.lock b/Cargo.lock index 5f5710374..462dec1a6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -206,11 +206,11 @@ checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" [[package]] name = "ash" -version = "0.37.3+1.3.251" +version = "0.38.0+1.3.281" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" dependencies = [ - "libloading 0.7.4", + "libloading 0.8.5", ] [[package]] @@ -465,18 +465,18 @@ dependencies = [ [[package]] name = "bit-set" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f" dependencies = [ "bit-vec", ] [[package]] name = "bit-vec" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22" [[package]] name = "bitflags" @@ -838,12 +838,12 @@ checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" [[package]] name = "d3d12" -version = "0.20.0" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b28bfe653d79bd16c77f659305b195b82bb5ce0c0eb2a4846b82ddbd77586813" +checksum = "bdbd1f579714e3c809ebd822c81ef148b1ceaeb3d535352afc73fd0c4c6a0017" dependencies = [ "bitflags 2.6.0", - "libloading 0.8.5", + "libloading 0.7.4", "winapi", ] @@ -1305,9 +1305,9 @@ dependencies = [ [[package]] name = "glutin_wgl_sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +checksum = "0a4e1951bbd9434a81aa496fe59ccc2235af3820d27b85f9314e279609211e2c" dependencies = [ "gl_generator", ] @@ -1333,9 +1333,9 @@ dependencies = [ [[package]] name = "gpu-allocator" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" +checksum = "fdd4240fc91d3433d5e5b0fc5b67672d771850dc19bbee03c1381e19322803d7" dependencies = [ "log", "presser", @@ -1756,9 +1756,9 @@ dependencies = [ [[package]] name = "metal" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5637e166ea14be6063a3f8ba5ccb9a4159df7d8f6d61c02fc3d480b1f90dcfcb" +checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" dependencies = [ "bitflags 2.6.0", "block", @@ -1781,18 +1781,18 @@ dependencies = [ [[package]] name = "naga" -version = "0.20.0" +version = "22.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e536ae46fcab0876853bd4a632ede5df4b1c2527a58f6c5a4150fe86be858231" +checksum = "8bd5a652b6faf21496f2cfd88fc49989c8db0825d1f6746b1a71a6ede24a63ad" dependencies = [ "arrayvec", "bit-set", "bitflags 2.6.0", + "cfg_aliases 0.1.1", "codespan-reporting", "hexf-parse", "indexmap", "log", - "num-traits", "rustc-hash", "spirv", "termcolor", @@ -3122,7 +3122,7 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "vello" version = "0.2.0" -source = "git+https://github.com/DJMcNab/vello/?rev=010e16061126b3c456f66360c483c2e60ec92d28#010e16061126b3c456f66360c483c2e60ec92d28" +source = "git+https://github.com/DJMcNab/vello/?rev=339b029c73ce0cc7a4433c1cd5a98bd681857118#339b029c73ce0cc7a4433c1cd5a98bd681857118" dependencies = [ "bytemuck", "futures-intrusive", @@ -3141,7 +3141,7 @@ dependencies = [ [[package]] name = "vello_encoding" version = "0.2.0" -source = "git+https://github.com/DJMcNab/vello/?rev=010e16061126b3c456f66360c483c2e60ec92d28#010e16061126b3c456f66360c483c2e60ec92d28" +source = "git+https://github.com/DJMcNab/vello/?rev=339b029c73ce0cc7a4433c1cd5a98bd681857118#339b029c73ce0cc7a4433c1cd5a98bd681857118" dependencies = [ "bytemuck", "guillotiere", @@ -3153,7 +3153,7 @@ dependencies = [ [[package]] name = "vello_shaders" version = "0.2.0" -source = "git+https://github.com/DJMcNab/vello/?rev=010e16061126b3c456f66360c483c2e60ec92d28#010e16061126b3c456f66360c483c2e60ec92d28" +source = "git+https://github.com/DJMcNab/vello/?rev=339b029c73ce0cc7a4433c1cd5a98bd681857118#339b029c73ce0cc7a4433c1cd5a98bd681857118" dependencies = [ "bytemuck", "naga", @@ -3386,12 +3386,11 @@ dependencies = [ [[package]] name = "wgpu" -version = "0.20.1" +version = "22.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e37c7b9921b75dfd26dd973fdcbce36f13dfa6e2dc82aece584e0ed48c355c" +checksum = "e1d1c4ba43f80542cf63a0a6ed3134629ae73e8ab51e4b765a67f3aa062eb433" dependencies = [ "arrayvec", - "cfg-if", "cfg_aliases 0.1.1", "document-features", "js-sys", @@ -3412,15 +3411,14 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.21.1" +version = "22.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50819ab545b867d8a454d1d756b90cd5f15da1f2943334ca314af10583c9d39" +checksum = "0348c840d1051b8e86c3bcd31206080c5e71e5933dabd79be1ce732b0b2f089a" dependencies = [ "arrayvec", "bit-vec", "bitflags 2.6.0", "cfg_aliases 0.1.1", - "codespan-reporting", "document-features", "indexmap", "log", @@ -3432,16 +3430,15 @@ dependencies = [ "rustc-hash", "smallvec", "thiserror", - "web-sys", "wgpu-hal", "wgpu-types", ] [[package]] name = "wgpu-hal" -version = "0.21.1" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "172e490a87295564f3fcc0f165798d87386f6231b04d4548bca458cbbfd63222" +checksum = "f6bbf4b4de8b2a83c0401d9e5ae0080a2792055f25859a02bf9be97952bbed4f" dependencies = [ "android_system_properties", "arrayvec", @@ -3461,7 +3458,7 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.5", + "libloading 0.7.4", "log", "metal", "naga", @@ -3484,9 +3481,9 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.20.0" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1353d9a46bff7f955a680577f34c69122628cc2076e1d6f3a9be6ef00ae793ef" +checksum = "bc9d91f0e2c4b51434dfa6db77846f2793149d8e73f800fa2e41f52b8eac3c5d" dependencies = [ "bitflags 2.6.0", "js-sys", diff --git a/Cargo.toml b/Cargo.toml index 7f30a4fb1..5197a14fb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -105,8 +105,8 @@ xilem_web_core = { version = "0.1.0", path = "xilem_web/xilem_web_core" } masonry = { version = "0.2.0", path = "masonry" } xilem_core = { version = "0.1.0", path = "xilem_core" } # We depend on this Vello revision for Emoji support (https://github.com/linebender/vello/pull/615) -vello = { git = "https://github.com/DJMcNab/vello/", rev = "010e16061126b3c456f66360c483c2e60ec92d28" } -wgpu = "0.20.1" +vello = { git = "https://github.com/DJMcNab/vello/", rev = "339b029c73ce0cc7a4433c1cd5a98bd681857118" } +wgpu = "22.1.0" kurbo = "0.11.0" parley = "0.1.0" peniko = "0.1.1" diff --git a/masonry/src/event_loop_runner.rs b/masonry/src/event_loop_runner.rs index 57349fb14..89392a5cf 100644 --- a/masonry/src/event_loop_runner.rs +++ b/masonry/src/event_loop_runner.rs @@ -376,6 +376,7 @@ impl MasonryState<'_> { width, height, antialiasing_method: vello::AaConfig::Area, + debug: vello::DebugLayers::none(), }; self.renderer .get_or_insert_with(|| Renderer::new(device, renderer_options).unwrap()) diff --git a/masonry/src/testing/harness.rs b/masonry/src/testing/harness.rs index 3e031c504..3ced0a1e4 100644 --- a/masonry/src/testing/harness.rs +++ b/masonry/src/testing/harness.rs @@ -271,6 +271,7 @@ impl TestHarness { width, height, antialiasing_method: vello::AaConfig::Area, + debug: vello::DebugLayers::none(), }; let size = Extent3d { diff --git a/xilem/examples/emoji_picker.rs b/xilem/examples/emoji_picker.rs index d1d86a672..2cba4b3b0 100644 --- a/xilem/examples/emoji_picker.rs +++ b/xilem/examples/emoji_picker.rs @@ -126,8 +126,7 @@ fn run(event_loop: EventLoopBuilder) { }; let app = Xilem::new(data, app_logic); - app.run_windowed(event_loop, "First Example".into()) - .unwrap(); + app.run_windowed(event_loop, "Emoji Picker".into()).unwrap(); } struct EmojiInfo { @@ -240,6 +239,7 @@ const EMOJI: &[EmojiInfo] = &[ e("🙏", "person with folded hands"), e("🚀", "rocket"), e("🚁", "helicopter"), + e("🇨🇦", "Canadian Flag"), ]; // The MIT License (MIT)