diff --git a/Cargo.toml b/Cargo.toml index ba8558c..5d4740a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,20 +1,20 @@ [package] name = "cryoglyph" -description = "Fast, simple 2D text rendering for wgpu" +description = "Fast, simple 2D text rendering for wgpu. A fork of glyphon for iced." version = "0.1.0" edition = "2024" +authors = ["Héctor Ramón Jiménez "] repository = "https://github.com/iced-rs/cryoglyph" license = "MIT OR Apache-2.0 OR Zlib" [dependencies] -wgpu = { version = "24", default-features = false, features = ["wgsl"] } -etagere = "0.2.10" -cosmic-text = "0.14" -lru = { version = "0.12.1", default-features = false } -rustc-hash = "2.0" +wgpu = { version = "27", default-features = false, features = ["wgsl"] } +etagere = "0.2" +cosmic-text = { path = "../cosmic-text" } +lru = { version = "0.16", default-features = false } +rustc-hash = "2" [dev-dependencies] -wgpu = "24" winit = "0.30" pollster = "0.4" criterion = { version = "0.5", features = ["html_reports"] } diff --git a/benches/prepare.rs b/benches/prepare.rs index 0e5669d..e6d800b 100644 --- a/benches/prepare.rs +++ b/benches/prepare.rs @@ -74,7 +74,7 @@ fn run_bench(ctx: &mut Criterion) { .map(|s| { let mut text_buffer = Buffer::new(&mut font_system, Metrics::relative(1.0, 10.0)); text_buffer.set_size(&mut font_system, Some(20.0), None); - text_buffer.set_text(&mut font_system, s, attrs, shaping); + text_buffer.set_text(&mut font_system, s, &attrs, shaping, None); text_buffer.shape_until_scroll(&mut font_system, false); text_buffer }) diff --git a/benches/state.rs b/benches/state.rs index 8f1dcb2..c716f24 100644 --- a/benches/state.rs +++ b/benches/state.rs @@ -14,15 +14,13 @@ impl State { )) .unwrap(); - let (device, queue) = block_on(adapter.request_device( - &wgpu::DeviceDescriptor { - label: Some("Benchmark Device"), - required_features: adapter.features(), - required_limits: adapter.limits(), - memory_hints: wgpu::MemoryHints::Performance, - }, - None, - )) + let (device, queue) = block_on(adapter.request_device(&wgpu::DeviceDescriptor { + label: Some("Benchmark Device"), + required_features: adapter.features(), + required_limits: adapter.limits(), + memory_hints: wgpu::MemoryHints::Performance, + ..wgpu::DeviceDescriptor::default() + })) .unwrap(); Self { device, queue } diff --git a/examples/hello-world.rs b/examples/hello-world.rs index 51671cc..9197b0d 100644 --- a/examples/hello-world.rs +++ b/examples/hello-world.rs @@ -49,7 +49,7 @@ impl WindowState { .await .unwrap(); let (device, queue) = adapter - .request_device(&DeviceDescriptor::default(), None) + .request_device(&DeviceDescriptor::default()) .await .unwrap(); @@ -87,7 +87,7 @@ impl WindowState { Some(physical_width), Some(physical_height), ); - text_buffer.set_text(&mut font_system, "Hello world! 👋\nThis is rendered with 🦅 glyphon 🦁\nThe text below should be partially clipped.\na b c d e f g h i j k l m n o p q r s t u v w x y z", &Attrs::new().family(Family::SansSerif), Shaping::Advanced); + text_buffer.set_text(&mut font_system, "Hello world! 👋\nThis is rendered with 🦅 glyphon 🦁\nThe text below should be partially clipped.\na b c d e f g h i j k l m n o p q r s t u v w x y z", &Attrs::new().family(Family::SansSerif), Shaping::Advanced, None); text_buffer.shape_until_scroll(&mut font_system, false); Self { @@ -203,6 +203,7 @@ impl winit::application::ApplicationHandler for Application { label: None, color_attachments: &[Some(RenderPassColorAttachment { view: &view, + depth_slice: None, resolve_target: None, ops: Operations { load: LoadOp::Clear(wgpu::Color::BLACK),