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

Update wgpu to 24 and use cryoglyph fork

Browse source 
Co-authored-by: Winfried Baumann <codewing@web.de>
This commit is contained in:
Héctor Ramón Jiménez 2025-03-09 01:38:34 +01:00
parent 86e8494bfa
commit fb2544021a
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
9 changed files with 126 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

56
wgpu/src/text.rs
View file

@ -12,10 +12,10 @@ use std::sync::{self, Arc};
pub use crate::graphics::Text;
const COLOR_MODE: glyphon::ColorMode = if color::GAMMA_CORRECTION {
glyphon::ColorMode::Accurate
const COLOR_MODE: cryoglyph::ColorMode = if color::GAMMA_CORRECTION {
cryoglyph::ColorMode::Accurate
} else {
glyphon::ColorMode::Web
cryoglyph::ColorMode::Web
};
pub type Batch = Vec<Item>;
@ -70,7 +70,7 @@ impl Cache {
}
struct Upload {
renderer: glyphon::TextRenderer,
renderer: cryoglyph::TextRenderer,
buffer_cache: BufferCache,
transformation: Transformation,
version: usize,
@ -86,7 +86,7 @@ pub struct Storage {
}
struct Group {
atlas: glyphon::TextAtlas,
atlas: cryoglyph::TextAtlas,
version: usize,
should_trim: bool,
handle: Arc<()>, // Keeps track of active uploads
@ -97,7 +97,7 @@ impl Storage {
Self::default()
}
fn get(&self, cache: &Cache) -> Option<(&glyphon::TextAtlas, &Upload)> {
fn get(&self, cache: &Cache) -> Option<(&cryoglyph::TextAtlas, &Upload)> {
if cache.text.is_empty() {
return None;
}
@ -112,10 +112,10 @@ impl Storage {
&mut self,
device: &wgpu::Device,
queue: &wgpu::Queue,
viewport: &glyphon::Viewport,
viewport: &cryoglyph::Viewport,
encoder: &mut wgpu::CommandEncoder,
format: wgpu::TextureFormat,
state: &glyphon::Cache,
state: &cryoglyph::Cache,
cache: &Cache,
new_transformation: Transformation,
bounds: Rectangle,
@ -130,7 +130,7 @@ impl Storage {
);
Group {
atlas: glyphon::TextAtlas::with_color_mode(
atlas: cryoglyph::TextAtlas::with_color_mode(
device, queue, state, format, COLOR_MODE,
),
version: 0,
@ -175,7 +175,7 @@ impl Storage {
}
}
hash_map::Entry::Vacant(entry) => {
let mut renderer = glyphon::TextRenderer::new(
let mut renderer = cryoglyph::TextRenderer::new(
&mut group.atlas,
device,
wgpu::MultisampleState::default(),
@ -257,13 +257,13 @@ impl Storage {
}
}
pub struct Viewport(glyphon::Viewport);
pub struct Viewport(cryoglyph::Viewport);
impl Viewport {
pub fn update(&mut self, queue: &wgpu::Queue, resolution: Size<u32>) {
self.0.update(
queue,
glyphon::Resolution {
cryoglyph::Resolution {
width: resolution.width,
height: resolution.height,
},
@ -273,10 +273,10 @@ impl Viewport {
#[allow(missing_debug_implementations)]
pub struct Pipeline {
state: glyphon::Cache,
state: cryoglyph::Cache,
format: wgpu::TextureFormat,
atlas: glyphon::TextAtlas,
renderers: Vec<glyphon::TextRenderer>,
atlas: cryoglyph::TextAtlas,
renderers: Vec<cryoglyph::TextRenderer>,
prepare_layer: usize,
cache: BufferCache,
}
@ -287,8 +287,8 @@ impl Pipeline {
queue: &wgpu::Queue,
format: wgpu::TextureFormat,
) -> Self {
let state = glyphon::Cache::new(device);
let atlas = glyphon::TextAtlas::with_color_mode(
let state = cryoglyph::Cache::new(device);
let atlas = cryoglyph::TextAtlas::with_color_mode(
device, queue, &state, format, COLOR_MODE,
);
@ -320,7 +320,7 @@ impl Pipeline {
text,
} => {
if self.renderers.len() <= self.prepare_layer {
self.renderers.push(glyphon::TextRenderer::new(
self.renderers.push(cryoglyph::TextRenderer::new(
&mut self.atlas,
device,
wgpu::MultisampleState::default(),
@ -346,7 +346,7 @@ impl Pipeline {
Ok(()) => {
self.prepare_layer += 1;
}
Err(glyphon::PrepareError::AtlasFull) => {
Err(cryoglyph::PrepareError::AtlasFull) => {
// If the atlas cannot grow, then all bets are off.
// Instead of panicking, we will just pray that the result
// will be somewhat readable...
@ -417,7 +417,7 @@ impl Pipeline {
}
pub fn create_viewport(&self, device: &wgpu::Device) -> Viewport {
Viewport(glyphon::Viewport::new(device, &self.state))
Viewport(cryoglyph::Viewport::new(device, &self.state))
}
pub fn end_frame(&mut self) {
@ -431,15 +431,15 @@ impl Pipeline {
fn prepare(
device: &wgpu::Device,
queue: &wgpu::Queue,
viewport: &glyphon::Viewport,
viewport: &cryoglyph::Viewport,
encoder: &mut wgpu::CommandEncoder,
renderer: &mut glyphon::TextRenderer,
atlas: &mut glyphon::TextAtlas,
renderer: &mut cryoglyph::TextRenderer,
atlas: &mut cryoglyph::TextAtlas,
buffer_cache: &mut BufferCache,
sections: &[Text],
layer_bounds: Rectangle,
layer_transformation: Transformation,
) -> Result<(), glyphon::PrepareError> {
) -> Result<(), cryoglyph::PrepareError> {
let mut font_system = font_system().write().expect("Write font system");
let font_system = font_system.raw();
@ -447,7 +447,7 @@ fn prepare(
Paragraph(Paragraph),
Editor(Editor),
Cache(text_cache::KeyHash),
Raw(Arc<glyphon::Buffer>),
Raw(Arc<cryoglyph::Buffer>),
}
let allocations: Vec<_> = sections
@ -618,13 +618,13 @@ fn prepare(
&(clip_bounds * transformation * layer_transformation),
)?;
Some(glyphon::TextArea {
Some(cryoglyph::TextArea {
buffer,
left,
top,
scale: transformation.scale_factor()
* layer_transformation.scale_factor(),
bounds: glyphon::TextBounds {
bounds: cryoglyph::TextBounds {
left: clip_bounds.x as i32,
top: clip_bounds.y as i32,
right: (clip_bounds.x + clip_bounds.width) as i32,
@ -643,6 +643,6 @@ fn prepare(
atlas,
viewport,
text_areas,
&mut glyphon::SwashCache::new(),
&mut cryoglyph::SwashCache::new(),
)
}