From 1b72c1fe9ec53c481f12fed847bbbc1dca13add7 Mon Sep 17 00:00:00 2001 From: Markus Mayer Date: Fri, 11 Apr 2025 01:08:15 +0200 Subject: [PATCH 1/9] Upgrade to wgpu 25 --- Cargo.toml | 8 ++++---- examples/hello-world.rs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ba8558c..a6921a2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,14 +7,14 @@ 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" +wgpu = { version = "25", default-features = false, features = ["wgsl"] } +etagere = "0.2.15" cosmic-text = "0.14" -lru = { version = "0.12.1", default-features = false } +lru = { version = "0.13", default-features = false } rustc-hash = "2.0" [dev-dependencies] -wgpu = "24" +wgpu = "25" winit = "0.30" pollster = "0.4" criterion = { version = "0.5", features = ["html_reports"] } diff --git a/examples/hello-world.rs b/examples/hello-world.rs index 51671cc..2ffe580 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(); From 36459b06ca6b84cf44e91aac2e3554909fb1e74f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= Date: Tue, 22 Jul 2025 02:25:09 +0200 Subject: [PATCH 2/9] Update `lru` and remove patch of `etagere` --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a6921a2..29d8656 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,9 +8,9 @@ license = "MIT OR Apache-2.0 OR Zlib" [dependencies] wgpu = { version = "25", default-features = false, features = ["wgsl"] } -etagere = "0.2.15" +etagere = "0.2" cosmic-text = "0.14" -lru = { version = "0.13", default-features = false } +lru = { version = "0.16", default-features = false } rustc-hash = "2.0" [dev-dependencies] From b36979ec183d776154bd2ad7ad79a3a571b00612 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= Date: Tue, 22 Jul 2025 02:37:58 +0200 Subject: [PATCH 3/9] Update `wgpu` to `26.0` --- Cargo.toml | 5 ++--- examples/hello-world.rs | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 29d8656..60bc8c2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,14 +7,13 @@ repository = "https://github.com/iced-rs/cryoglyph" license = "MIT OR Apache-2.0 OR Zlib" [dependencies] -wgpu = { version = "25", default-features = false, features = ["wgsl"] } +wgpu = { version = "26", default-features = false, features = ["wgsl"] } etagere = "0.2" cosmic-text = "0.14" lru = { version = "0.16", default-features = false } -rustc-hash = "2.0" +rustc-hash = "2" [dev-dependencies] -wgpu = "25" winit = "0.30" pollster = "0.4" criterion = { version = "0.5", features = ["html_reports"] } diff --git a/examples/hello-world.rs b/examples/hello-world.rs index 2ffe580..2338f46 100644 --- a/examples/hello-world.rs +++ b/examples/hello-world.rs @@ -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), From 1d68a5405986287475fd49a7793c2edd0ea41d0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= Date: Fri, 31 Oct 2025 14:03:21 +0100 Subject: [PATCH 4/9] Update `wgpu` to `27` --- Cargo.toml | 2 +- benches/prepare.rs | 2 +- benches/state.rs | 16 +++++++--------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 60bc8c2..4b44e24 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ repository = "https://github.com/iced-rs/cryoglyph" license = "MIT OR Apache-2.0 OR Zlib" [dependencies] -wgpu = { version = "26", default-features = false, features = ["wgsl"] } +wgpu = { version = "27", default-features = false, features = ["wgsl"] } etagere = "0.2" cosmic-text = "0.14" lru = { version = "0.16", default-features = false } diff --git a/benches/prepare.rs b/benches/prepare.rs index 0e5669d..c810005 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); 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 } From 99b46959369f38a06c11353bf1be81d383b289fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= Date: Fri, 31 Oct 2025 14:33:21 +0100 Subject: [PATCH 5/9] Update `cosmic-text` to `0.15` --- Cargo.toml | 2 +- benches/prepare.rs | 2 +- examples/hello-world.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4b44e24..1554e42 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ license = "MIT OR Apache-2.0 OR Zlib" [dependencies] wgpu = { version = "27", default-features = false, features = ["wgsl"] } etagere = "0.2" -cosmic-text = "0.14" +cosmic-text = "0.15" lru = { version = "0.16", default-features = false } rustc-hash = "2" diff --git a/benches/prepare.rs b/benches/prepare.rs index c810005..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/examples/hello-world.rs b/examples/hello-world.rs index 2338f46..9197b0d 100644 --- a/examples/hello-world.rs +++ b/examples/hello-world.rs @@ -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 { From bb8f59f9f075267f44448e271c867b1278bfd849 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= Date: Fri, 5 Dec 2025 22:32:23 +0100 Subject: [PATCH 6/9] Add `authors` to `Cargo.toml` --- Cargo.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 1554e42..02397ad 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,8 +1,9 @@ [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" From 0e025ed813f2efff3e698808ff188139e9d27c23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= Date: Tue, 20 Jan 2026 01:58:43 +0100 Subject: [PATCH 7/9] Update `cosmic-text` to `0.16` --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 02397ad..44452ef 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0 OR Zlib" [dependencies] wgpu = { version = "27", default-features = false, features = ["wgsl"] } etagere = "0.2" -cosmic-text = "0.15" +cosmic-text = "0.16" lru = { version = "0.16", default-features = false } rustc-hash = "2" From c49de15bce4d8254ac136d1be9911960cc85ce12 Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Fri, 13 Sep 2024 11:24:00 -0400 Subject: [PATCH 8/9] fix: cosmic-text --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 44452ef..018c9d7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0 OR Zlib" [dependencies] wgpu = { version = "27", default-features = false, features = ["wgsl"] } etagere = "0.2" -cosmic-text = "0.16" +cosmic-text = { git = "https://github.com/pop-os/cosmic-text.git" } lru = { version = "0.16", default-features = false } rustc-hash = "2" From 5e16f105e071da83d9b2ccb3cf37e8e80beb966e Mon Sep 17 00:00:00 2001 From: Lionel DARNIS Date: Mon, 25 May 2026 18:27:44 +0200 Subject: [PATCH 9/9] chore: use local cosmic-text --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 018c9d7..5d4740a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0 OR Zlib" [dependencies] wgpu = { version = "27", default-features = false, features = ["wgsl"] } etagere = "0.2" -cosmic-text = { git = "https://github.com/pop-os/cosmic-text.git" } +cosmic-text = { path = "../cosmic-text" } lru = { version = "0.16", default-features = false } rustc-hash = "2"