From 3836ca7a17f410d30871c2254dcc0f2400876636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Tue, 20 Jan 2026 02:01:42 +0100
Subject: [PATCH 1/7] Update `wgpu` to `28`

---
 Cargo.toml              | 2 +-
 examples/hello-world.rs | 1 +
 src/cache.rs            | 6 +++---
 src/text_render.rs      | 5 ++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 44452ef..77cce77 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/iced-rs/cryoglyph"
 license = "MIT OR Apache-2.0 OR Zlib"
 
 [dependencies]
-wgpu = { version = "27", default-features = false, features = ["wgsl"] }
+wgpu = { version = "28", default-features = false, features = ["wgsl"] }
 etagere = "0.2"
 cosmic-text = "0.16"
 lru = { version = "0.16", default-features = false }
diff --git a/examples/hello-world.rs b/examples/hello-world.rs
index 9197b0d..06106d6 100644
--- a/examples/hello-world.rs
+++ b/examples/hello-world.rs
@@ -213,6 +213,7 @@ impl winit::application::ApplicationHandler for Application {
                         depth_stencil_attachment: None,
                         timestamp_writes: None,
                         occlusion_query_set: None,
+                        multiview_mask: None,
                     });
 
                     text_renderer.render(&atlas, &viewport, &mut pass).unwrap();
diff --git a/src/cache.rs b/src/cache.rs
index 61d2e4d..f66164d 100644
--- a/src/cache.rs
+++ b/src/cache.rs
@@ -42,7 +42,7 @@ impl Cache {
             label: Some("glyphon sampler"),
             min_filter: FilterMode::Nearest,
             mag_filter: FilterMode::Nearest,
-            mipmap_filter: FilterMode::Nearest,
+            mipmap_filter: wgpu::MipmapFilterMode::Nearest,
             lod_min_clamp: 0f32,
             lod_max_clamp: 0f32,
             ..Default::default()
@@ -139,7 +139,7 @@ impl Cache {
         let pipeline_layout = device.create_pipeline_layout(&PipelineLayoutDescriptor {
             label: None,
             bind_group_layouts: &[&atlas_layout, &uniforms_layout],
-            push_constant_ranges: &[],
+            immediate_size: 0,
         });
 
         Self(Arc::new(Inner {
@@ -237,7 +237,7 @@ impl Cache {
                     },
                     depth_stencil: depth_stencil.clone(),
                     multisample,
-                    multiview: None,
+                    multiview_mask: None,
                     cache: None,
                 });
 
diff --git a/src/text_render.rs b/src/text_render.rs
index 8b73fe7..431a954 100644
--- a/src/text_render.rs
+++ b/src/text_render.rs
@@ -39,7 +39,7 @@ impl TextRenderer {
         let pipeline = atlas.get_or_create_pipeline(device, multisample, depth_stencil);
 
         Self {
-            staging_belt: StagingBelt::new(vertex_buffer_size),
+            staging_belt: StagingBelt::new(device.clone(), vertex_buffer_size),
             vertex_buffer,
             vertex_buffer_size,
             pipeline,
@@ -295,7 +295,6 @@ impl TextRenderer {
                     &self.vertex_buffer,
                     0,
                     NonZeroU64::new(vertices_raw.len() as u64).expect("Non-empty vertices"),
-                    device,
                 )
                 .copy_from_slice(vertices_raw);
         } else {
@@ -312,7 +311,7 @@ impl TextRenderer {
             self.vertex_buffer_size = buffer_size;
 
             self.staging_belt.finish();
-            self.staging_belt = StagingBelt::new(buffer_size);
+            self.staging_belt = StagingBelt::new(device.clone(), buffer_size);
         }
 
         self.staging_belt.finish();

From c49de15bce4d8254ac136d1be9911960cc85ce12 Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Fri, 13 Sep 2024 11:24:00 -0400
Subject: [PATCH 2/7] 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 1d68895e9c4c9b73739f826e81c2e3012c155cce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Thu, 19 Feb 2026 19:13:45 +0100
Subject: [PATCH 3/7] Update `cosmic-text` to `0.18`

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 77cce77..97f8d71 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0 OR Zlib"
 [dependencies]
 wgpu = { version = "28", default-features = false, features = ["wgsl"] }
 etagere = "0.2"
-cosmic-text = "0.16"
+cosmic-text = "0.18"
 lru = { version = "0.16", default-features = false }
 rustc-hash = "2"
 

From e429a025df36ab8145708acb309080ae3deec17a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Thu, 23 Apr 2026 19:43:09 +0900
Subject: [PATCH 4/7] Update `cosmic-text` to `0.19`

---
 Cargo.toml              |  2 +-
 benches/prepare.rs      |  6 +++---
 examples/hello-world.rs | 10 +++-------
 src/lib.rs              |  3 +--
 src/text_render.rs      |  3 +--
 5 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 97f8d71..1fa37fb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0 OR Zlib"
 [dependencies]
 wgpu = { version = "28", default-features = false, features = ["wgsl"] }
 etagere = "0.2"
-cosmic-text = "0.18"
+cosmic-text = "0.19"
 lru = { version = "0.16", default-features = false }
 rustc-hash = "2"
 
diff --git a/benches/prepare.rs b/benches/prepare.rs
index e6d800b..c214d93 100644
--- a/benches/prepare.rs
+++ b/benches/prepare.rs
@@ -73,8 +73,8 @@ fn run_bench(ctx: &mut Criterion) {
             .copied()
             .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, None);
+                text_buffer.set_size(Some(20.0), None);
+                text_buffer.set_text(s, &attrs, shaping, None);
                 text_buffer.shape_until_scroll(&mut font_system, false);
                 text_buffer
             })
@@ -85,7 +85,7 @@ fn run_bench(ctx: &mut Criterion) {
                 let text_areas: Vec<TextArea> = buffers
                     .iter()
                     .map(|b| TextArea {
-                        buffer: b,
+                        text: b.layout_runs(),
                         left: 0.0,
                         top: 0.0,
                         scale: 1.0,
diff --git a/examples/hello-world.rs b/examples/hello-world.rs
index 06106d6..fa2dc69 100644
--- a/examples/hello-world.rs
+++ b/examples/hello-world.rs
@@ -82,12 +82,8 @@ impl WindowState {
         let physical_width = (physical_size.width as f64 * scale_factor) as f32;
         let physical_height = (physical_size.height as f64 * scale_factor) as f32;
 
-        text_buffer.set_size(
-            &mut font_system,
-            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, None);
+        text_buffer.set_size(Some(physical_width), Some(physical_height));
+        text_buffer.set_text("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 {
@@ -179,7 +175,7 @@ impl winit::application::ApplicationHandler for Application {
                         atlas,
                         viewport,
                         [TextArea {
-                            buffer: text_buffer,
+                            text: text_buffer.layout_runs(),
                             left: 10.0,
                             top: 10.0,
                             scale: 1.0,
diff --git a/src/lib.rs b/src/lib.rs
index 9360b30..84325f4 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -102,10 +102,9 @@ impl Default for TextBounds {
 }
 
 /// A text area containing text to be rendered along with its overflow behavior.
-#[derive(Clone)]
 pub struct TextArea<'a> {
     /// The buffer containing the text to be rendered.
-    pub buffer: &'a Buffer,
+    pub text: LayoutRunIter<'a>,
     /// The left edge of the buffer.
     pub left: f32,
     /// The top edge of the buffer.
diff --git a/src/text_render.rs b/src/text_render.rs
index 431a954..40e8b68 100644
--- a/src/text_render.rs
+++ b/src/text_render.rs
@@ -81,8 +81,7 @@ impl TextRenderer {
             };
 
             let layout_runs = text_area
-                .buffer
-                .layout_runs()
+                .text
                 .skip_while(|run| !is_run_visible(run))
                 .take_while(is_run_visible);
 

From 5e16f105e071da83d9b2ccb3cf37e8e80beb966e Mon Sep 17 00:00:00 2001
From: Lionel DARNIS <lionel@wopr.io>
Date: Mon, 25 May 2026 18:27:44 +0200
Subject: [PATCH 5/7] 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"
 

From 2e9ec6ec4259f7e23c29f998eb97c2c2a72d54f8 Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Fri, 13 Sep 2024 11:24:00 -0400
Subject: [PATCH 6/7] fix: cosmic-text

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 1fa37fb..07928c6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0 OR Zlib"
 [dependencies]
 wgpu = { version = "28", default-features = false, features = ["wgsl"] }
 etagere = "0.2"
-cosmic-text = "0.19"
+cosmic-text = { git = "https://github.com/pop-os/cosmic-text.git" }
 lru = { version = "0.16", default-features = false }
 rustc-hash = "2"
 

From 4444857c7ffe5f567c0f574b9fc54ef1d52a2a26 Mon Sep 17 00:00:00 2001
From: Lionel DARNIS <lionel@wopr.io>
Date: Mon, 25 May 2026 18:27:44 +0200
Subject: [PATCH 7/7] chore: use local cosmic-text

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 07928c6..38e28d5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0 OR Zlib"
 [dependencies]
 wgpu = { version = "28", 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"