diff --git a/Cargo.toml b/Cargo.toml index ee9ad8d9..cb7689db 100755 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,7 +44,7 @@ accesskit = [ [dependencies] # Moving forward, this version should align with the kurbo version in peniko. -kurbo = "0.9.0" +kurbo = "0.10.4" tracing = { version = "0.1.22", features = ["log"] } lazy_static = "1.4.0" @@ -148,10 +148,10 @@ static_assertions = "1.1.0" test-log = { version = "0.2.5", features = ["trace"], default-features = false } tracing-subscriber = { version = "0.3.2", features = ["env-filter"] } unicode-segmentation = "1.7.0" -vello = { git = "https://github.com/linebender/vello", rev = "9d7c4f00d8db420337706771a37937e9025e089c" } +vello = { git = "https://github.com/linebender/vello", rev = "1c06c308b2ed1ebb858ed585cc284756325f9bb3" } parley = { git = "https://github.com/dfrg/parley", rev = "2371bf4b702ec91edee2d58ffb2d432539580e1e" } pollster = "0.3.0" -wgpu = "0.17.0" +wgpu = "0.18.0" [target.'cfg(any(target_os = "freebsd", target_os="linux", target_os="openbsd"))'.build-dependencies] bindgen = { version = "0.66", optional = true } diff --git a/examples/accesskit.rs b/examples/accesskit.rs index c53f3609..83d1a27e 100644 --- a/examples/accesskit.rs +++ b/examples/accesskit.rs @@ -130,6 +130,7 @@ impl WinHandler for HelloState { fn paint(&mut self, _: &Region) {} + #[cfg(feature = "accesskit")] fn accesskit_tree(&mut self) -> TreeUpdate { let root = { let mut builder = NodeBuilder::new(Role::Window); @@ -179,6 +180,7 @@ impl WinHandler for HelloState { self.size = size; } + #[cfg(feature = "accesskit")] fn accesskit_action(&mut self, request: ActionRequest) { if let ActionRequest { action, diff --git a/examples/common/text.rs b/examples/common/text.rs index 316ab7ca..0b3adc76 100644 --- a/examples/common/text.rs +++ b/examples/common/text.rs @@ -8,7 +8,7 @@ use parley::Layout; use vello::kurbo::Affine; use vello::{ - glyph::{fello::raw::FontRef, GlyphContext}, + glyph::{skrifa::raw::FontRef, GlyphContext}, peniko::{Brush, Color}, *, }; @@ -37,7 +37,7 @@ pub fn render_text(builder: &mut SceneBuilder, transform: Affine, layout: &Layou if let Ok(font_ref) = FontRef::from_index(font_ref.data, font.index()) { let style = glyph_run.style(); let vars: [(&str, f32); 0] = []; - let mut gp = gcx.new_provider(&font_ref, None, font_size, false, vars); + let mut gp = gcx.new_provider(&font_ref, font_size, false, &vars); for glyph in glyph_run.glyphs() { if let Some(fragment) = gp.get(glyph.id, Some(&style.brush.0)) { let gx = x + glyph.x; diff --git a/examples/edit_text.rs b/examples/edit_text.rs index 14a287d5..319f52f0 100644 --- a/examples/edit_text.rs +++ b/examples/edit_text.rs @@ -11,7 +11,7 @@ use parley::FontContext; use tracing_subscriber::EnvFilter; use unicode_segmentation::GraphemeCursor; use vello::util::{RenderContext, RenderSurface}; -use vello::Renderer; +use vello::{AaSupport, Renderer}; use vello::{ kurbo::{Affine, Point, Rect}, peniko::{Brush, Color, Fill}, @@ -205,15 +205,17 @@ impl WindowState { let queue = &self.render.devices[dev_id].queue; let renderer_options = RendererOptions { surface_format: Some(surface.format), - timestamp_period: queue.get_timestamp_period(), + use_cpu: false, + antialiasing_support: AaSupport { area: true, msaa8: false, msaa16: false }, }; let render_params = RenderParams { base_color: Color::BLACK, width, height, + antialiasing_method: vello::AaConfig::Area, }; self.renderer - .get_or_insert_with(|| Renderer::new(device, &renderer_options).unwrap()) + .get_or_insert_with(|| Renderer::new(device, renderer_options).unwrap()) .render_to_surface(device, queue, &self.scene, &surface_texture, &render_params) .unwrap(); surface_texture.present(); diff --git a/examples/pen.rs b/examples/pen.rs index 4779864c..e70b2740 100644 --- a/examples/pen.rs +++ b/examples/pen.rs @@ -6,10 +6,10 @@ use std::f64::consts::PI; use accesskit::TreeUpdate; use kurbo::Ellipse; use vello::util::{RenderContext, RenderSurface}; -use vello::Renderer; +use vello::{AaSupport, Renderer}; use vello::{ - kurbo::{Affine, BezPath, Point, Rect}, - peniko::{Brush, Color, Fill, Stroke}, + kurbo::{Affine, BezPath, Point, Rect, Stroke}, + peniko::{Brush, Color, Fill}, RenderParams, RendererOptions, Scene, SceneBuilder, }; @@ -112,15 +112,21 @@ impl WindowState { let queue = &self.render.devices[dev_id].queue; let renderer_options = RendererOptions { surface_format: Some(surface.format), - timestamp_period: queue.get_timestamp_period(), + use_cpu: false, + antialiasing_support: AaSupport { + area: true, + msaa8: false, + msaa16: false, + }, }; let render_params = RenderParams { base_color: Color::BLACK, width, height, + antialiasing_method: vello::AaConfig::Area, }; self.renderer - .get_or_insert_with(|| Renderer::new(device, &renderer_options).unwrap()) + .get_or_insert_with(|| Renderer::new(device, renderer_options).unwrap()) .render_to_surface(device, queue, &self.scene, &surface_texture, &render_params) .unwrap(); surface_texture.present(); diff --git a/examples/shello.rs b/examples/shello.rs index 1c41bdb1..4770f5b7 100644 --- a/examples/shello.rs +++ b/examples/shello.rs @@ -5,10 +5,10 @@ use accesskit::TreeUpdate; use parley::FontContext; use tracing_subscriber::EnvFilter; use vello::util::{RenderContext, RenderSurface}; -use vello::Renderer; +use vello::{AaSupport, Renderer}; use vello::{ - kurbo::{Affine, PathEl, Point, Rect}, - peniko::{Brush, Color, Fill, Mix, Stroke}, + kurbo::{Affine, PathEl, Point, Rect, Stroke}, + peniko::{Brush, Color, Fill, Mix}, RenderParams, RendererOptions, Scene, SceneBuilder, }; @@ -100,15 +100,21 @@ impl WindowState { let queue = &self.render.devices[dev_id].queue; let renderer_options = RendererOptions { surface_format: Some(surface.format), - timestamp_period: queue.get_timestamp_period(), + use_cpu: false, + antialiasing_support: AaSupport { + area: true, + msaa8: false, + msaa16: false, + }, }; let render_params = RenderParams { base_color: Color::BLACK, width, height, + antialiasing_method: vello::AaConfig::Area, }; self.renderer - .get_or_insert_with(|| Renderer::new(device, &renderer_options).unwrap()) + .get_or_insert_with(|| Renderer::new(device, renderer_options).unwrap()) .render_to_surface(device, queue, &self.scene, &surface_texture, &render_params) .unwrap(); surface_texture.present(); diff --git a/examples/wgpu-triangle/main.rs b/examples/wgpu-triangle/main.rs index 57b531ee..227ddaae 100644 --- a/examples/wgpu-triangle/main.rs +++ b/examples/wgpu-triangle/main.rs @@ -134,9 +134,11 @@ impl InnerWindowState { resolve_target: None, ops: wgpu::Operations { load: wgpu::LoadOp::Clear(wgpu::Color::GREEN), - store: true, + store: wgpu::StoreOp::Store, }, })], + timestamp_writes: None, + occlusion_query_set: None, depth_stencil_attachment: None, }); rpass.set_pipeline(&self.render_pipeline);