Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-16 20:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed an issue where using fallback fonts at very low resolutions could lead to a crash.

Browse source
This commit is contained in:
Leon Styhre 2021-12-14 17:12:39 +01:00
parent 5fd2c86c7d
commit ab92a4135a
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
es-core/src/resources/Font.cpp
View file

@ -141,10 +141,23 @@ void Font::unloadTextures()
Font::FontTexture::FontTexture(const int mSize)
{
textureId = 0;
// I'm not entirely sure if the 16 and 6 constants are correct, but they seem to provide
// This is a hack to add some extra texture size when running at very low resolutions. If not
// doing this, the use of fallback fonts (such as Japanese characters) could result in the
// texture not fitting the glyphs which would crash the application.
int extraTextureSize{0};
const float screenSizeModifier =
std::min(Renderer::getScreenWidthModifier(), Renderer::getScreenHeightModifier());
if (screenSizeModifier < 0.2f)
extraTextureSize += 6;
if (screenSizeModifier < 0.45f)
extraTextureSize += 4;
// It's not entirely clear if the 18 and 6 constants are correct, but they seem to provide
// a texture buffer large enough to hold the fonts (otherwise the application would crash).
// This logic is obviously a hack though and needs to be properly reviewed and improved.
textureSize = glm::ivec2{mSize * 16, mSize * 6};
textureSize = glm::ivec2{mSize * (18 + extraTextureSize), mSize * (6 + extraTextureSize / 2)};
writePos = glm::ivec2{};
rowHeight = 0;
}