Update to newest version of Bitmap support

linebender · Aug 2, 2024 · 2118e86 · 2118e86
1 parent ebad0d0
commit 2118e86
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 38 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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
@@ -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
@@ -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)