me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update glyphon fork to a cleaner branch

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-05-08 19:34:43 +02:00
parent bed53f8143
commit 99c1464cc1
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -142,7 +142,7 @@ cosmic-text = "0.10"
dark-light = "1.0" dark-light = "1.0"
futures = "0.3" futures = "0.3"
glam = "0.25" 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" guillotiere = "0.6"
half = "2.2" half = "2.2"
image = "0.24" image = "0.24"

8
wgpu/src/text.rs
View file

@ -116,7 +116,7 @@ impl Storage {
viewport: &glyphon::Viewport, viewport: &glyphon::Viewport,
encoder: &mut wgpu::CommandEncoder, encoder: &mut wgpu::CommandEncoder,
format: wgpu::TextureFormat, format: wgpu::TextureFormat,
pipeline: &glyphon::Pipeline, state: &glyphon::Cache,
cache: &Cache, cache: &Cache,
new_transformation: Transformation, new_transformation: Transformation,
bounds: Rectangle, bounds: Rectangle,
@ -132,7 +132,7 @@ impl Storage {
Group { Group {
atlas: glyphon::TextAtlas::with_color_mode( atlas: glyphon::TextAtlas::with_color_mode(
device, queue, pipeline, format, COLOR_MODE, device, queue, state, format, COLOR_MODE,
), ),
version: 0, version: 0,
should_trim: false, should_trim: false,
@ -274,7 +274,7 @@ impl Viewport {
#[allow(missing_debug_implementations)] #[allow(missing_debug_implementations)]
pub struct Pipeline { pub struct Pipeline {
state: glyphon::Pipeline, state: glyphon::Cache,
format: wgpu::TextureFormat, format: wgpu::TextureFormat,
atlas: glyphon::TextAtlas, atlas: glyphon::TextAtlas,
renderers: Vec<glyphon::TextRenderer>, renderers: Vec<glyphon::TextRenderer>,
@ -288,7 +288,7 @@ impl Pipeline {
queue: &wgpu::Queue, queue: &wgpu::Queue,
format: wgpu::TextureFormat, format: wgpu::TextureFormat,
) -> Self { ) -> Self {
let state = glyphon::Pipeline::new(device); let state = glyphon::Cache::new(device);
let atlas = glyphon::TextAtlas::with_color_mode( let atlas = glyphon::TextAtlas::with_color_mode(
device, queue, &state, format, COLOR_MODE, device, queue, &state, format, COLOR_MODE,
); );