Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #106833 from avnotaklu/window-scaling-breaking-on-font-data-freed

Browse source 
Remove freed up FontForSize data from `oversampling_levels`
This commit is contained in:
Thaddeus Crews 2025-05-28 09:47:40 -05:00
commit 698dd2ade4
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/text_server_adv/text_server_adv.cpp
View file

@ -397,6 +397,12 @@ void TextServerAdvanced::_free_rid(const RID &p_rid) {
MutexLock ftlock(ft_mutex);
FontAdvanced *fd = font_owner.get_or_null(p_rid);
for (const KeyValue<Vector2i, FontForSizeAdvanced *> &ffsd : fd->cache) {
OversamplingLevel *ol = oversampling_levels.getptr(ffsd.value->viewport_oversampling);
if (ol != nullptr) {
ol->fonts.erase(ffsd.value);
}
}
{
MutexLock lock(fd->mutex);
font_owner.free(p_rid);

6
modules/text_server_fb/text_server_fb.cpp
View file

@ -121,6 +121,12 @@ void TextServerFallback::_free_rid(const RID &p_rid) {
MutexLock ftlock(ft_mutex);
FontFallback *fd = font_owner.get_or_null(p_rid);
for (const KeyValue<Vector2i, FontForSizeFallback *> &ffsd : fd->cache) {
OversamplingLevel *ol = oversampling_levels.getptr(ffsd.value->viewport_oversampling);
if (ol != nullptr) {
ol->fonts.erase(ffsd.value);
}
}
{
MutexLock lock(fd->mutex);
font_owner.free(p_rid);