mirror of
https://github.com/slint-ui/slint.git
synced 2025-10-02 06:41:14 +00:00

This removes a lot of allocations and speeds up the compiler step a bit. Sadly, this patch is very invasive as it touches a lot of files. That said, each individual hunk is pretty trivial. For a non-trivial real-world example, the impact is significant, we get rid of ~29% of all allocations and improve the runtime by about 4.8% (measured until the viewer loop would start). Before: ``` Benchmark 1: ./target/release/slint-viewer ../slint-perf/app.slint Time (mean ± σ): 664.2 ms ± 6.7 ms [User: 589.2 ms, System: 74.0 ms] Range (min … max): 659.0 ms … 682.4 ms 10 runs allocations: 4886888 temporary allocations: 857508 ``` After: ``` Benchmark 1: ./target/release/slint-viewer ../slint-perf/app.slint Time (mean ± σ): 639.5 ms ± 17.8 ms [User: 556.9 ms, System: 76.2 ms] Range (min … max): 621.4 ms … 666.5 ms 10 runs allocations: 3544318 temporary allocations: 495685 ```
457 lines
15 KiB
Rust
457 lines
15 KiB
Rust
// Copyright © SixtyFPS GmbH <info@slint.dev>
|
|
// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
|
|
|
|
use crate::diagnostics::BuildDiagnostics;
|
|
#[cfg(not(target_arch = "wasm32"))]
|
|
use crate::embedded_resources::{BitmapFont, BitmapGlyph, BitmapGlyphs, CharacterMapEntry};
|
|
#[cfg(not(target_arch = "wasm32"))]
|
|
use crate::expression_tree::BuiltinFunction;
|
|
use crate::expression_tree::{Expression, Unit};
|
|
use crate::object_tree::*;
|
|
use crate::CompilerConfiguration;
|
|
use std::cell::RefCell;
|
|
use std::collections::HashSet;
|
|
use std::rc::Rc;
|
|
|
|
use i_slint_common::sharedfontdb::{self, fontdb};
|
|
|
|
#[derive(Clone, derive_more::Deref)]
|
|
struct Font {
|
|
id: fontdb::ID,
|
|
#[deref]
|
|
fontdue_font: Rc<fontdue::Font>,
|
|
metrics: i_slint_common::sharedfontdb::DesignFontMetrics,
|
|
}
|
|
|
|
#[cfg(target_arch = "wasm32")]
|
|
pub fn embed_glyphs<'a>(
|
|
_component: &Document,
|
|
_compiler_config: &CompilerConfiguration,
|
|
_scale_factor: f64,
|
|
_pixel_sizes: Vec<i16>,
|
|
_characters_seen: HashSet<char>,
|
|
_all_docs: impl Iterator<Item = &'a crate::object_tree::Document> + 'a,
|
|
_diag: &mut BuildDiagnostics,
|
|
) -> bool {
|
|
false
|
|
}
|
|
|
|
#[cfg(not(target_arch = "wasm32"))]
|
|
pub fn embed_glyphs<'a>(
|
|
doc: &Document,
|
|
compiler_config: &CompilerConfiguration,
|
|
scale_factor: f64,
|
|
mut pixel_sizes: Vec<i16>,
|
|
mut characters_seen: HashSet<char>,
|
|
all_docs: impl Iterator<Item = &'a crate::object_tree::Document> + 'a,
|
|
diag: &mut BuildDiagnostics,
|
|
) {
|
|
use crate::diagnostics::Spanned;
|
|
|
|
let generic_diag_location = doc.node.as_ref().map(|n| n.to_source_location());
|
|
|
|
characters_seen.extend(
|
|
('a'..='z')
|
|
.chain('A'..='Z')
|
|
.chain('0'..='9')
|
|
.chain(" '!\"#$%&'()*+,-./:;<=>?@\\]^_|~".chars())
|
|
.chain(std::iter::once('●'))
|
|
.chain(std::iter::once('…')),
|
|
);
|
|
|
|
if let Ok(sizes_str) = std::env::var("SLINT_FONT_SIZES") {
|
|
for custom_size_str in sizes_str.split(',') {
|
|
let custom_size = if let Ok(custom_size) = custom_size_str
|
|
.parse::<f64>()
|
|
.map(|size_as_float| (size_as_float * scale_factor) as i16)
|
|
{
|
|
custom_size
|
|
} else {
|
|
diag.push_error(
|
|
format!(
|
|
"Invalid font size '{}' specified in `SLINT_FONT_SIZES`",
|
|
custom_size_str
|
|
),
|
|
&generic_diag_location,
|
|
);
|
|
return;
|
|
};
|
|
|
|
if let Err(pos) = pixel_sizes.binary_search(&custom_size) {
|
|
pixel_sizes.insert(pos, custom_size)
|
|
}
|
|
}
|
|
}
|
|
|
|
sharedfontdb::FONT_DB.with(|db| {
|
|
embed_glyphs_with_fontdb(
|
|
compiler_config,
|
|
&db,
|
|
doc,
|
|
pixel_sizes,
|
|
characters_seen,
|
|
all_docs,
|
|
diag,
|
|
generic_diag_location,
|
|
);
|
|
})
|
|
}
|
|
|
|
fn embed_glyphs_with_fontdb<'a>(
|
|
compiler_config: &CompilerConfiguration,
|
|
fontdb: &RefCell<sharedfontdb::FontDatabase>,
|
|
doc: &Document,
|
|
pixel_sizes: Vec<i16>,
|
|
characters_seen: HashSet<char>,
|
|
all_docs: impl Iterator<Item = &'a crate::object_tree::Document> + 'a,
|
|
diag: &mut BuildDiagnostics,
|
|
generic_diag_location: Option<crate::diagnostics::SourceLocation>,
|
|
) {
|
|
let fallback_fonts = get_fallback_fonts(compiler_config, &fontdb.borrow());
|
|
|
|
let mut custom_fonts = Vec::new();
|
|
|
|
// add custom fonts
|
|
{
|
|
let mut fontdb_mut = fontdb.borrow_mut();
|
|
for doc in all_docs {
|
|
for (font_path, import_token) in doc.custom_fonts.iter() {
|
|
let face_count = fontdb_mut.faces().count();
|
|
if let Err(e) = fontdb_mut.make_mut().load_font_file(font_path) {
|
|
diag.push_error(format!("Error loading font: {}", e), import_token);
|
|
} else {
|
|
custom_fonts.extend(fontdb_mut.faces().skip(face_count).map(|info| info.id))
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
let fontdb = fontdb.borrow();
|
|
|
|
let default_font_ids = if !fontdb.default_font_family_ids.is_empty() {
|
|
fontdb.default_font_family_ids.clone()
|
|
} else {
|
|
doc.exported_roots().filter_map(|c| {
|
|
let (family, source_location) = c
|
|
.root_element
|
|
.borrow()
|
|
.bindings
|
|
.get("default-font-family")
|
|
.and_then(|binding| {
|
|
match &binding.borrow().expression {
|
|
Expression::StringLiteral(family) => {
|
|
Some((Some(family.clone()), binding.borrow().span.clone()))
|
|
}
|
|
_ => None,
|
|
}
|
|
})
|
|
.unwrap_or_default();
|
|
|
|
fontdb.query_with_family(Default::default(), family.as_deref()).or_else(|| {
|
|
if let Some(source_location) = source_location {
|
|
diag.push_error_with_span("could not find font that provides specified family, falling back to Sans-Serif".to_string(), source_location);
|
|
} else {
|
|
diag.push_error("internal error: fontdb could not determine a default font for sans-serif" .to_string(), &generic_diag_location);
|
|
};
|
|
None
|
|
})
|
|
}).collect()
|
|
};
|
|
|
|
let default_font_paths = default_font_ids
|
|
.iter()
|
|
.map(|id| {
|
|
let (source, _) =
|
|
fontdb.face_source(*id).expect("internal error: fontdb provided ids are not valid");
|
|
match source {
|
|
fontdb::Source::Binary(_) => unreachable!(),
|
|
fontdb::Source::File(path_buf) => path_buf,
|
|
fontdb::Source::SharedFile(path_buf, _) => path_buf,
|
|
}
|
|
})
|
|
.collect::<Vec<std::path::PathBuf>>();
|
|
|
|
// Map from path to family name
|
|
let mut fonts = std::collections::BTreeMap::<std::path::PathBuf, fontdb::ID>::new();
|
|
fonts.extend(default_font_paths.iter().cloned().zip(default_font_ids.iter().cloned()));
|
|
|
|
// add custom fonts
|
|
let mut custom_face_error = false;
|
|
fonts.extend(custom_fonts.iter().filter_map(|face_id| {
|
|
fontdb.face(*face_id).and_then(|face_info| {
|
|
Some((
|
|
match &face_info.source {
|
|
fontdb::Source::File(path) => path.clone(),
|
|
_ => {
|
|
diag.push_error(
|
|
"internal error: memory fonts are not supported in the compiler"
|
|
.to_string(),
|
|
&generic_diag_location,
|
|
);
|
|
custom_face_error = true;
|
|
return None;
|
|
}
|
|
},
|
|
*face_id,
|
|
))
|
|
})
|
|
}));
|
|
|
|
if custom_face_error {
|
|
return;
|
|
}
|
|
|
|
let mut embed_font_by_path_and_face_id = |path: &std::path::Path, face_id| {
|
|
let fontdue_font = match compiler_config.load_font_by_id(face_id) {
|
|
Ok(font) => font,
|
|
Err(msg) => {
|
|
diag.push_error(
|
|
format!("error loading font for embedding {}: {msg}", path.display()),
|
|
&generic_diag_location,
|
|
);
|
|
return;
|
|
}
|
|
};
|
|
|
|
let Some(Ok(metrics)) = i_slint_common::sharedfontdb::FONT_DB.with(|fontdb| {
|
|
fontdb.borrow().with_face_data(face_id, |font_data, face_index| {
|
|
i_slint_common::sharedfontdb::ttf_parser::Face::parse(font_data, face_index)
|
|
.map(|face| i_slint_common::sharedfontdb::DesignFontMetrics::new(face))
|
|
})
|
|
}) else {
|
|
diag.push_error(
|
|
format!("error parsing font for embedding {}", path.display()),
|
|
&generic_diag_location,
|
|
);
|
|
|
|
return;
|
|
};
|
|
|
|
let Some(family_name) = fontdb
|
|
.face(face_id)
|
|
.expect("must succeed as we are within face_data with same face_id")
|
|
.families
|
|
.first()
|
|
.map(|(name, _)| name.clone())
|
|
else {
|
|
diag.push_error(
|
|
format!(
|
|
"internal error: TrueType font without english family name encountered: {}",
|
|
path.display()
|
|
),
|
|
&generic_diag_location,
|
|
);
|
|
return;
|
|
};
|
|
|
|
let embedded_bitmap_font = embed_font(
|
|
&fontdb,
|
|
family_name,
|
|
Font { id: face_id, fontdue_font, metrics },
|
|
&pixel_sizes,
|
|
characters_seen.iter().cloned(),
|
|
&fallback_fonts,
|
|
);
|
|
|
|
let resource_id = doc.embedded_file_resources.borrow().len();
|
|
doc.embedded_file_resources.borrow_mut().insert(
|
|
path.to_string_lossy().into(),
|
|
crate::embedded_resources::EmbeddedResources {
|
|
id: resource_id,
|
|
kind: crate::embedded_resources::EmbeddedResourcesKind::BitmapFontData(
|
|
embedded_bitmap_font,
|
|
),
|
|
},
|
|
);
|
|
|
|
for c in doc.exported_roots() {
|
|
c.init_code.borrow_mut().font_registration_code.push(Expression::FunctionCall {
|
|
function: Box::new(Expression::BuiltinFunctionReference(
|
|
BuiltinFunction::RegisterBitmapFont,
|
|
None,
|
|
)),
|
|
arguments: vec![Expression::NumberLiteral(resource_id as _, Unit::None)],
|
|
source_location: None,
|
|
});
|
|
}
|
|
};
|
|
|
|
// Make sure to embed the default font first, because that becomes the default at run-time.
|
|
for path in default_font_paths {
|
|
if let Some(font_id) = fonts.remove(&path) {
|
|
embed_font_by_path_and_face_id(&path, font_id);
|
|
}
|
|
}
|
|
|
|
for (path, face_id) in &fonts {
|
|
embed_font_by_path_and_face_id(path, *face_id);
|
|
}
|
|
}
|
|
|
|
#[inline(never)] // workaround https://github.com/rust-lang/rust/issues/104099
|
|
fn get_fallback_fonts(
|
|
compiler_config: &CompilerConfiguration,
|
|
fontdb: &sharedfontdb::FontDatabase,
|
|
) -> Vec<Rc<fontdue::Font>> {
|
|
#[allow(unused)]
|
|
let mut fallback_families: Vec<String> = Vec::new();
|
|
|
|
#[cfg(target_os = "macos")]
|
|
{
|
|
fallback_families = ["Menlo", "Apple Symbols", "Apple Color Emoji"]
|
|
.into_iter()
|
|
.map(Into::into)
|
|
.collect::<Vec<String>>();
|
|
}
|
|
|
|
#[cfg(target_family = "windows")]
|
|
{
|
|
fallback_families = ["Segoe UI Emoji", "Segoe UI Symbol", "Arial", "Wingdings"]
|
|
.into_iter()
|
|
.map(Into::into)
|
|
.collect::<Vec<String>>();
|
|
}
|
|
|
|
#[cfg(not(any(
|
|
target_family = "windows",
|
|
target_os = "macos",
|
|
target_os = "ios",
|
|
target_arch = "wasm32",
|
|
target_os = "android"
|
|
)))]
|
|
{
|
|
fallback_families.clone_from(&fontdb.fontconfig_fallback_families);
|
|
}
|
|
|
|
let fallback_fonts = fallback_families
|
|
.iter()
|
|
.filter_map(|fallback_family| {
|
|
fontdb
|
|
.query(&fontdb::Query {
|
|
families: &[fontdb::Family::Name(fallback_family)],
|
|
..Default::default()
|
|
})
|
|
.and_then(|face_id| compiler_config.load_font_by_id(face_id).ok())
|
|
})
|
|
.collect::<Vec<_>>();
|
|
fallback_fonts
|
|
}
|
|
|
|
#[cfg(not(target_arch = "wasm32"))]
|
|
fn embed_font(
|
|
fontdb: &fontdb::Database,
|
|
family_name: String,
|
|
font: Font,
|
|
pixel_sizes: &[i16],
|
|
character_coverage: impl Iterator<Item = char>,
|
|
fallback_fonts: &[Rc<fontdue::Font>],
|
|
) -> BitmapFont {
|
|
let mut character_map: Vec<CharacterMapEntry> = character_coverage
|
|
.enumerate()
|
|
.map(|(glyph_index, code_point)| CharacterMapEntry {
|
|
code_point,
|
|
glyph_index: u16::try_from(glyph_index)
|
|
.expect("more than 65535 glyphs are not supported"),
|
|
})
|
|
.collect();
|
|
character_map.sort_by_key(|entry| entry.code_point);
|
|
|
|
let glyphs = pixel_sizes
|
|
.iter()
|
|
.map(|pixel_size| {
|
|
let mut glyph_data = Vec::new();
|
|
glyph_data.resize(character_map.len(), Default::default());
|
|
|
|
for CharacterMapEntry { code_point, glyph_index } in &character_map {
|
|
let (metrics, bitmap) = core::iter::once(&font.fontdue_font)
|
|
.chain(fallback_fonts.iter())
|
|
.find_map(|font| {
|
|
font.chars()
|
|
.contains_key(code_point)
|
|
.then(|| font.rasterize(*code_point, *pixel_size as _))
|
|
})
|
|
.unwrap_or_else(|| font.rasterize(*code_point, *pixel_size as _));
|
|
|
|
let glyph = BitmapGlyph {
|
|
x: i16::try_from(metrics.xmin).expect("large glyph x coordinate"),
|
|
y: i16::try_from(metrics.ymin).expect("large glyph y coordinate"),
|
|
width: i16::try_from(metrics.width).expect("large width"),
|
|
height: i16::try_from(metrics.height).expect("large height"),
|
|
x_advance: i16::try_from(metrics.advance_width as i64)
|
|
.expect("large advance width"),
|
|
data: bitmap,
|
|
};
|
|
glyph_data[*glyph_index as usize] = glyph;
|
|
}
|
|
|
|
BitmapGlyphs { pixel_size: *pixel_size, glyph_data }
|
|
})
|
|
.collect();
|
|
|
|
let face_info = fontdb.face(font.id).unwrap();
|
|
|
|
BitmapFont {
|
|
family_name,
|
|
character_map,
|
|
units_per_em: font.metrics.units_per_em,
|
|
ascent: font.metrics.ascent,
|
|
descent: font.metrics.descent,
|
|
x_height: font.metrics.x_height,
|
|
cap_height: font.metrics.cap_height,
|
|
glyphs,
|
|
weight: face_info.weight.0,
|
|
italic: face_info.style != fontdb::Style::Normal,
|
|
}
|
|
}
|
|
|
|
fn try_extract_font_size_from_element(elem: &ElementRc, property_name: &str) -> Option<f64> {
|
|
elem.borrow().bindings.get(property_name).and_then(|expression| {
|
|
match &expression.borrow().expression {
|
|
Expression::NumberLiteral(value, Unit::Px) => Some(*value),
|
|
_ => None,
|
|
}
|
|
})
|
|
}
|
|
|
|
pub fn collect_font_sizes_used(
|
|
component: &Rc<Component>,
|
|
scale_factor: f64,
|
|
sizes_seen: &mut Vec<i16>,
|
|
) {
|
|
let mut add_font_size = |logical_size: f64| {
|
|
let pixel_size = (logical_size * scale_factor) as i16;
|
|
match sizes_seen.binary_search(&pixel_size) {
|
|
Ok(_) => {}
|
|
Err(pos) => sizes_seen.insert(pos, pixel_size),
|
|
}
|
|
};
|
|
|
|
recurse_elem_including_sub_components(component, &(), &mut |elem, _| match elem
|
|
.borrow()
|
|
.base_type
|
|
.to_string()
|
|
.as_str()
|
|
{
|
|
"TextInput" | "Text" | "SimpleText" | "ComplexText" => {
|
|
if let Some(font_size) = try_extract_font_size_from_element(elem, "font-size") {
|
|
add_font_size(font_size)
|
|
}
|
|
}
|
|
"Dialog" | "Window" | "WindowItem" => {
|
|
if let Some(font_size) = try_extract_font_size_from_element(elem, "default-font-size") {
|
|
add_font_size(font_size)
|
|
}
|
|
}
|
|
_ => {}
|
|
});
|
|
}
|
|
|
|
pub fn scan_string_literals(component: &Rc<Component>, characters_seen: &mut HashSet<char>) {
|
|
visit_all_expressions(component, |expr, _| {
|
|
expr.visit_recursive(&mut |expr| {
|
|
if let Expression::StringLiteral(string) = expr {
|
|
characters_seen.extend(string.chars());
|
|
}
|
|
})
|
|
})
|
|
}
|