diff options
| author |  Héctor Ramón Jiménez <hector@hecrj.dev> | 2024-05-08 19:34:43 +0200 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector@hecrj.dev> | 2024-05-08 19:34:43 +0200 |
| commit | 99c1464cc16979381b3a531d293ee34fd6697480 (patch) | |
| tree | 5bcd99647c79dba266b3c061f755d0047cfe6ed9 | |
| parent | bed53f81436c595e479009427e1fa4ff4a1048d3 (diff) | |
| download | iced-99c1464cc16979381b3a531d293ee34fd6697480.tar.gz iced-99c1464cc16979381b3a531d293ee34fd6697480.tar.bz2 iced-99c1464cc16979381b3a531d293ee34fd6697480.zip | |
Update `glyphon` fork to a cleaner branch
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | wgpu/src/text.rs | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -142,7 +142,7 @@ cosmic-text = "0.10" dark-light = "1.0" futures = "0.3" glam = "0.25" -glyphon = { git = "https://github.com/hecrj/glyphon.git", rev = "f410f3ab4fc7b484003684881124cb0ee7ef2e01" } +glyphon = { git = "https://github.com/hecrj/glyphon.git", rev = "f07e7bab705e69d39a5e6e52c73039a93c4552f8" } guillotiere = "0.6" half = "2.2" image = "0.24" diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs index 9ecd5c99..05db5f80 100644 --- a/wgpu/src/text.rs +++ b/wgpu/src/text.rs @@ -116,7 +116,7 @@ impl Storage { viewport: &glyphon::Viewport, encoder: &mut wgpu::CommandEncoder, format: wgpu::TextureFormat, - pipeline: &glyphon::Pipeline, + state: &glyphon::Cache, cache: &Cache, new_transformation: Transformation, bounds: Rectangle, @@ -132,7 +132,7 @@ impl Storage { Group { atlas: glyphon::TextAtlas::with_color_mode( - device, queue, pipeline, format, COLOR_MODE, + device, queue, state, format, COLOR_MODE, ), version: 0, should_trim: false, @@ -274,7 +274,7 @@ impl Viewport { #[allow(missing_debug_implementations)] pub struct Pipeline { - state: glyphon::Pipeline, + state: glyphon::Cache, format: wgpu::TextureFormat, atlas: glyphon::TextAtlas, renderers: Vec<glyphon::TextRenderer>, @@ -288,7 +288,7 @@ impl Pipeline { queue: &wgpu::Queue, format: wgpu::TextureFormat, ) -> Self { - let state = glyphon::Pipeline::new(device); + let state = glyphon::Cache::new(device); let atlas = glyphon::TextAtlas::with_color_mode( device, queue, &state, format, COLOR_MODE, ); |