Upgrade to WGPU v29 (+ latest vello main)

Signed-off-by: Nico Burns <nico@nicoburns.com>

Author: nicoburns

Cargo.lock

@@ -22,7 +22,7 @@ homepage = "https://github.com/dioxuslabs/anyrender"
 repository = "https://github.com/dioxuslabs/anyrender"
 categories = ["gui"]
 edition = "2024"
-rust-version = "1.92.0"
+rust-version = "1.88.0"
 
 [workspace.dependencies]
 # AnyRender dependencies (in-repo)
@@ -52,13 +52,29 @@ color = "0.3"
 linebender_resource_handle = "0.1"
 peniko = "0.6"
 kurbo = "0.13"
-vello = { version = "0.8", features = [ "wgpu" ] }
-vello_cpu = { version = "0.0.7", default-features = false, features = ["std", "text", "u8_pipeline"] }
-vello_hybrid = { version = "0.0.7" }
-vello_common = { version = "0.0.7" }
+# glifo = { version = "0.0.0" }
+# vello = { version = "0.8", features = ["wgpu"] }
+# vello_cpu = { version = "0.0.7", default-features = false, features = [
+#   "std",
+#   "text",
+#   "u8_pipeline",
+# ] }
+# vello_hybrid = { version = "0.0.7" }
+# vello_common = { version = "0.0.7" }
+glifo = { git = "https://github.com/linebender/vello", rev = "b5c4a3192c1a2a5cc1dc2fe45342de1de95a1dc5" }
+vello = { git = "https://github.com/linebender/vello", rev = "b5c4a3192c1a2a5cc1dc2fe45342de1de95a1dc5", features = [
+  "wgpu",
+] }
+vello_cpu = { git = "https://github.com/linebender/vello", rev = "b5c4a3192c1a2a5cc1dc2fe45342de1de95a1dc5", default-features = false, features = [
+  "std",
+  "text",
+  "u8_pipeline",
+] }
+vello_hybrid = { git = "https://github.com/linebender/vello", rev = "b5c4a3192c1a2a5cc1dc2fe45342de1de95a1dc5" }
+vello_common = { git = "https://github.com/linebender/vello", rev = "b5c4a3192c1a2a5cc1dc2fe45342de1de95a1dc5" }
 
 # Rendering
-wgpu = "28"
+wgpu = "29"
 raw-window-handle = "0.6.0"
 softbuffer = "0.4"
 pixels = "0.17"
@@ -78,9 +94,3 @@ wasm-bindgen-futures = "0.4"
 
 # Dev-dependencies
 winit = { version = "0.30.2", features = ["rwh_06"] }
-
-# [patch.crates-io]
-# vello = { path = "../vello/vello" }
-# vello_cpu = { path = "../vello/sparse_strips/vello_cpu" }
-# vello_hybrid = { path = "../vello/sparse_strips/vello_hybrid" }
-# vello_common = { path = "../vello/sparse_strips/vello_common" }

Cargo.toml

@@ -234,7 +234,7 @@ pub trait PaintScene: RenderContext {
         brush_alpha: f32,
         transform: Affine,
         glyph_transform: Option<Affine>,
-        glyphs: impl Iterator<Item = Glyph>,
+        glyphs: impl Iterator<Item = Glyph> + Clone,
     );
 
     /// Draw a rounded rectangle blurred with a gaussian filter.

crates/anyrender/src/lib.rs

@@ -11,7 +11,7 @@ use vello::{
     AaConfig, AaSupport, RenderParams, Renderer as VelloRenderer, RendererOptions,
     Scene as VelloScene,
 };
-use wgpu::{Features, Limits, PresentMode, SurfaceError, Texture, TextureFormat, TextureUsages};
+use wgpu::{Features, Limits, PresentMode, Texture, TextureFormat, TextureUsages};
 use wgpu_context::{
     DeviceHandle, SurfaceRenderer, SurfaceRendererConfiguration, TextureConfiguration, WGPUContext,
 };
@@ -305,19 +305,12 @@ impl WindowRenderer for VelloWindowRenderer {
         });
         timer.record_time("cmd");
 
-        match render_surface.ensure_current_surface_texture() {
-            Ok(_) => {}
-            Err(SurfaceError::Timeout | SurfaceError::Lost | SurfaceError::Outdated) => {
-                render_surface.clear_surface_texture();
-                return;
-            }
-            Err(SurfaceError::OutOfMemory) => panic!("Out of memory"),
-            Err(SurfaceError::Other) => panic!("Unknown error getting surface"),
+        let Ok(texture_view) = render_surface.target_texture_view() else {
+            // Skip frame in case of error trying to get current surface texture
+            render_surface.clear_surface_texture();
+            return;
         };
 
-        let texture_view = render_surface
-            .target_texture_view()
-            .expect("handled errors from ensure_current_surface_texture above");
         state
             .renderer
             .render_to_texture(
@@ -337,9 +330,9 @@ impl WindowRenderer for VelloWindowRenderer {
 
         drop(texture_view);
 
-        render_surface
-            .maybe_blit_and_present()
-            .expect("handled errors from ensure_current_surface_texture above");
+        if render_surface.maybe_blit_and_present().is_err() {
+            return;
+        }
         timer.record_time("present");
 
         render_surface

crates/anyrender_vello/src/window_renderer.rs

@@ -1,7 +1,7 @@
 use crate::VelloCpuScenePainter;
 use anyrender::{ImageRenderer, RenderContext as AnyRenderContext};
 use debug_timer::debug_timer;
-use vello_cpu::{RenderContext, RenderMode};
+use vello_cpu::{RenderContext, RenderMode, Resources};
 
 pub struct VelloCpuImageRenderer {
     scene: VelloCpuScenePainter,
@@ -13,16 +13,19 @@ impl ImageRenderer for VelloCpuImageRenderer {
 
     fn new(width: u32, height: u32) -> Self {
         Self {
-            scene: VelloCpuScenePainter(RenderContext::new(width as u16, height as u16)),
+            scene: VelloCpuScenePainter {
+                render_ctx: RenderContext::new(width as u16, height as u16),
+                resources: Resources::new(),
+            },
         }
     }
 
     fn resize(&mut self, width: u32, height: u32) {
-        self.scene.0 = RenderContext::new(width as u16, height as u16);
+        self.scene.render_ctx = RenderContext::new(width as u16, height as u16);
     }
 
     fn reset(&mut self) {
-        self.scene.0.reset();
+        self.scene.render_ctx.reset();
     }
 
     fn render<F: FnOnce(&mut Self::ScenePainter<'_>)>(&mut self, draw_fn: F, buffer: &mut [u8]) {
@@ -31,13 +34,14 @@ impl ImageRenderer for VelloCpuImageRenderer {
         draw_fn(&mut self.scene);
         timer.record_time("cmds");
 
-        self.scene.0.flush();
+        self.scene.render_ctx.flush();
         timer.record_time("flush");
 
-        self.scene.0.render_to_buffer(
+        self.scene.render_ctx.render_to_buffer(
+            &mut self.scene.resources,
             buffer,
-            self.scene.0.width(),
-            self.scene.0.height(),
+            self.scene.render_ctx.width(),
+            self.scene.render_ctx.height(),
             RenderMode::OptimizeSpeed,
         );
         timer.record_time("render");
@@ -50,8 +54,8 @@ impl ImageRenderer for VelloCpuImageRenderer {
         draw_fn: F,
         buffer: &mut Vec<u8>,
     ) {
-        let width = self.scene.0.width();
-        let height = self.scene.0.height();
+        let width = self.scene.render_ctx.width();
+        let height = self.scene.render_ctx.height();
         buffer.resize(width as usize * height as usize * 4, 0);
         self.render(draw_fn, buffer);
     }

crates/anyrender_vello_cpu/src/image_renderer.rs

@@ -36,20 +36,24 @@ fn convert_image_cached(image: &peniko::ImageData) -> ImageSource {
         .clone()
 }
 
-pub struct VelloCpuScenePainter(pub vello_cpu::RenderContext);
+pub struct VelloCpuScenePainter {
+    pub render_ctx: vello_cpu::RenderContext,
+    pub resources: vello_cpu::Resources,
+}
 
 impl VelloCpuScenePainter {
-    pub fn finish(self) -> Pixmap {
-        let mut pixmap = Pixmap::new(self.0.width(), self.0.height());
-        self.0.render_to_pixmap(&mut pixmap);
+    pub fn finish(mut self) -> Pixmap {
+        let mut pixmap = Pixmap::new(self.render_ctx.width(), self.render_ctx.height());
+        self.render_ctx
+            .render_to_pixmap(&mut self.resources, &mut pixmap);
         pixmap
     }
 }
 
 impl RenderContext for VelloCpuScenePainter {}
 impl PaintScene for VelloCpuScenePainter {
     fn reset(&mut self) {
-        self.0.reset();
+        self.render_ctx.reset();
     }
 
     fn push_layer(
@@ -59,8 +63,8 @@ impl PaintScene for VelloCpuScenePainter {
         transform: Affine,
         clip: &impl Shape,
     ) {
-        self.0.set_transform(transform);
-        self.0.push_layer(
+        self.render_ctx.set_transform(transform);
+        self.render_ctx.push_layer(
             Some(&clip.into_path(DEFAULT_TOLERANCE)),
             Some(blend.into()),
             Some(alpha),
@@ -70,12 +74,13 @@ impl PaintScene for VelloCpuScenePainter {
     }
 
     fn push_clip_layer(&mut self, transform: Affine, clip: &impl Shape) {
-        self.0.set_transform(transform);
-        self.0.push_clip_layer(&clip.into_path(DEFAULT_TOLERANCE));
+        self.render_ctx.set_transform(transform);
+        self.render_ctx
+            .push_clip_layer(&clip.into_path(DEFAULT_TOLERANCE));
     }
 
     fn pop_layer(&mut self) {
-        self.0.pop_layer();
+        self.render_ctx.pop_layer();
     }
 
     fn stroke<'a>(
@@ -86,13 +91,14 @@ impl PaintScene for VelloCpuScenePainter {
         brush_transform: Option<Affine>,
         shape: &impl Shape,
     ) {
-        self.0.set_transform(transform);
-        self.0.set_stroke(style.clone());
-        self.0
+        self.render_ctx.set_transform(transform);
+        self.render_ctx.set_stroke(style.clone());
+        self.render_ctx
             .set_paint(anyrender_paint_to_vello_cpu_paint(paint.into()));
-        self.0
+        self.render_ctx
             .set_paint_transform(brush_transform.unwrap_or(Affine::IDENTITY));
-        self.0.stroke_path(&shape.into_path(DEFAULT_TOLERANCE));
+        self.render_ctx
+            .stroke_path(&shape.into_path(DEFAULT_TOLERANCE));
     }
 
     fn fill<'a>(
@@ -103,13 +109,14 @@ impl PaintScene for VelloCpuScenePainter {
         brush_transform: Option<Affine>,
         shape: &impl Shape,
     ) {
-        self.0.set_transform(transform);
-        self.0.set_fill_rule(style);
-        self.0
+        self.render_ctx.set_transform(transform);
+        self.render_ctx.set_fill_rule(style);
+        self.render_ctx
             .set_paint(anyrender_paint_to_vello_cpu_paint(paint.into()));
-        self.0
+        self.render_ctx
             .set_paint_transform(brush_transform.unwrap_or(Affine::IDENTITY));
-        self.0.fill_path(&shape.into_path(DEFAULT_TOLERANCE));
+        self.render_ctx
+            .fill_path(&shape.into_path(DEFAULT_TOLERANCE));
     }
 
     fn draw_glyphs<'a, 's: 'a>(
@@ -123,10 +130,10 @@ impl PaintScene for VelloCpuScenePainter {
         _brush_alpha: f32,
         transform: Affine,
         glyph_transform: Option<Affine>,
-        glyphs: impl Iterator<Item = anyrender::Glyph>,
+        glyphs: impl Iterator<Item = anyrender::Glyph> + Clone,
     ) {
-        self.0.set_transform(transform);
-        self.0
+        self.render_ctx.set_transform(transform);
+        self.render_ctx
             .set_paint(anyrender_paint_to_vello_cpu_paint(paint.into()));
 
         fn into_vello_cpu_glyph(g: anyrender::Glyph) -> vello_cpu::Glyph {
@@ -140,19 +147,19 @@ impl PaintScene for VelloCpuScenePainter {
         let style: StyleRef<'a> = style.into();
         match style {
             StyleRef::Fill(fill) => {
-                self.0.set_fill_rule(fill);
-                self.0
-                    .glyph_run(font)
+                self.render_ctx.set_fill_rule(fill);
+                self.render_ctx
+                    .glyph_run(&mut self.resources, font)
                     .font_size(font_size)
                     .hint(hint)
                     .normalized_coords(normalized_coords)
                     .glyph_transform(glyph_transform.unwrap_or_default())
                     .fill_glyphs(glyphs.map(into_vello_cpu_glyph));
             }
             StyleRef::Stroke(stroke) => {
-                self.0.set_stroke(stroke.clone());
-                self.0
-                    .glyph_run(font)
+                self.render_ctx.set_stroke(stroke.clone());
+                self.render_ctx
+                    .glyph_run(&mut self.resources, font)
                     .font_size(font_size)
                     .hint(hint)
                     .normalized_coords(normalized_coords)
@@ -169,9 +176,9 @@ impl PaintScene for VelloCpuScenePainter {
         radius: f64,
         std_dev: f64,
     ) {
-        self.0.set_transform(transform);
-        self.0.set_paint(PaintType::Solid(color));
-        self.0
+        self.render_ctx.set_transform(transform);
+        self.render_ctx.set_paint(PaintType::Solid(color));
+        self.render_ctx
             .fill_blurred_rounded_rect(&rect, radius as f32, std_dev as f32);
     }
 }

crates/anyrender_vello_cpu/src/scene.rs

@@ -19,6 +19,7 @@ kurbo = { workspace = true }
 peniko = { workspace = true }
 vello_hybrid = { workspace = true }
 vello_common = { workspace = true }
+glifo = { workspace = true }
 wgpu = { workspace = true }
 rustc-hash = { workspace = true }
 wgpu_context = { workspace = true }