godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

[TextServer] Check if texture cache is valid when loading glyph.

This commit is contained in:
Pāvels Nadtočajevs 2025-09-07 21:00:55 +03:00
parent 9edc290328
commit 82b8cd105c
No known key found for this signature in database
GPG Key ID: 8413210218EF35D2
2 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/text_server_adv/text_server_adv.cpp
View File

@ -1222,8 +1222,22 @@ bool TextServerAdvanced::_ensure_glyph(FontAdvanced *p_font_data, const Vector2i
HashMap<int32_t, FontGlyph>::Iterator E = fd->glyph_map.find(p_glyph);
if (E) {
r_glyph = E->value;
return E->value.found;
bool tx_valid = true;
if (E->value.texture_idx >= 0) {
if (E->value.texture_idx < fd->textures.size()) {
tx_valid = fd->textures[E->value.texture_idx].image.is_valid();
} else {
tx_valid = false;
}
}
if (tx_valid) {
r_glyph = E->value;
return E->value.found;
#ifdef DEBUG_ENABLED
} else {
WARN_PRINT(vformat("Invalid texture cache for glyph %x in font %s, glyph will be re-rendered. Re-import this font to regenerate textures.", glyph_index, p_font_data->font_name));
#endif
}
}
if (glyph_index == 0) { // Non graphical or invalid glyph, do not render.

18
modules/text_server_fb/text_server_fb.cpp
View File

@ -643,8 +643,22 @@ bool TextServerFallback::_ensure_glyph(FontFallback *p_font_data, const Vector2i
HashMap<int32_t, FontGlyph>::Iterator E = fd->glyph_map.find(p_glyph);
if (E) {
r_glyph = E->value;
return E->value.found;
bool tx_valid = true;
if (E->value.texture_idx >= 0) {
if (E->value.texture_idx < fd->textures.size()) {
tx_valid = fd->textures[E->value.texture_idx].image.is_valid();
} else {
tx_valid = false;
}
}
if (tx_valid) {
r_glyph = E->value;
return E->value.found;
#ifdef DEBUG_ENABLED
} else {
WARN_PRINT(vformat("Invalid texture cache for glyph %x in font %s, glyph will be re-rendered. Re-import this font to regenerate textures.", glyph_index, p_font_data->font_name));
#endif
}
}
if (glyph_index == 0) { // Non graphical or invalid glyph, do not render.