migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-02 14:50:03 -04:00
Code Activity

Put FontsImpl and GalleyCache behind the same Mutex

Browse Source
This commit is contained in:
Emil Ernerfeldt
2022-01-22 15:20:47 +01:00
parent 93d5e222db
commit 67c58ace27
4 changed files with 48 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
egui_demo_lib/benches/benchmark.rs
View File

@@ -92,7 +92,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
let fonts =
egui::epaint::text::Fonts::new(pixels_per_point, egui::FontDefinitions::default());
{
let mut fonts_impl = fonts.lock();
let mut locked_fonts = fonts.lock();
c.bench_function("text_layout_uncached", |b| {
b.iter(|| {
use egui::epaint::text::{layout, LayoutJob};
@@ -103,7 +103,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
color,
wrap_width,
);
layout(&mut fonts_impl, job.into())
layout(&mut locked_fonts.fonts, job.into())
})
});
}
@@ -115,7 +115,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
let mut tessellator = egui::epaint::Tessellator::from_options(Default::default());
let mut mesh = egui::epaint::Mesh::default();
let text_shape = TextShape::new(egui::Pos2::ZERO, galley);
let font_image_size = fonts.lock().font_image_size();
let font_image_size = fonts.font_image_size();
c.bench_function("tessellate_text", |b| {
b.iter(|| {
tessellator.tessellate_text(font_image_size, text_shape.clone(), &mut mesh);

1
egui_demo_lib/src/apps/demo/font_book.rs
View File

@@ -73,6 +73,7 @@ impl super::View for FontBook {
let named_chars = self.named_chars.entry(text_style).or_insert_with(|| {
ui.fonts()
.lock()
.fonts
.font_mut(text_style)
.characters()
.iter()