From 99c1464cc16979381b3a531d293ee34fd6697480 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 8 May 2024 19:34:43 +0200 Subject: Update `glyphon` fork to a cleaner branch --- Cargo.toml | 2 +- wgpu/src/text.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 1bd26ea6..fc35fee8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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, @@ -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, ); -- cgit