Skip to content

Port Fontcache from Firestorm. #2758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 2, 2024
Merged

Port Fontcache from Firestorm. #2758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69d9633
Port Fontcache from Firestorm. The cache will make sure a font only g…
Nicky-D Oct 1, 2024
f2b10d0
Rename namepsace to "ll"
Nicky-D Oct 2, 2024
c68e81c
Add another static_cast<long> to make the implicit conversion from si…
Nicky-D Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
201 changes: 92 additions & 109 deletions indra/llrender/llfontfreetype.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@

FT_Render_Mode gFontRenderMode = FT_RENDER_MODE_NORMAL;

LLFontManager *gFontManagerp = NULL;
LLFontManager *gFontManagerp = nullptr;

FT_Library gFTLibrary = NULL;
FT_Library gFTLibrary = nullptr;

//static
void LLFontManager::initClass()
Expand All @@ -75,7 +75,7 @@ void LLFontManager::initClass()
void LLFontManager::cleanupClass()
{
delete gFontManagerp;
gFontManagerp = NULL;
gFontManagerp = nullptr;
}

LLFontManager::LLFontManager()
Expand Down Expand Up @@ -103,6 +103,7 @@ LLFontManager::LLFontManager()
LLFontManager::~LLFontManager()
{
FT_Done_FreeType(gFTLibrary);
unloadAllFonts();
}


Expand Down Expand Up @@ -141,12 +142,8 @@ LLFontFreetype::LLFontFreetype()
mAscender(0.f),
mDescender(0.f),
mLineHeight(0.f),
#ifdef LL_WINDOWS
pFileStream(NULL),
pFtStream(NULL),
#endif
mIsFallback(false),
mFTFace(NULL),
mFTFace(nullptr),
mRenderGlyphCount(0),
mAddGlyphCount(0),
mStyle(0),
Expand All @@ -160,62 +157,38 @@ LLFontFreetype::~LLFontFreetype()
// Clean up freetype libs.
if (mFTFace)
FT_Done_Face(mFTFace);
mFTFace = NULL;
mFTFace = nullptr;

// Delete glyph info
std::for_each(mCharGlyphInfoMap.begin(), mCharGlyphInfoMap.end(), DeletePairedPointer());
mCharGlyphInfoMap.clear();

#ifdef LL_WINDOWS
delete pFileStream; // closed by FT_Done_Face
delete pFtStream;
#endif
delete mFontBitmapCachep;
// mFallbackFonts cleaned up by LLPointer destructor
}

#ifdef LL_WINDOWS
unsigned long ft_read_cb(FT_Stream stream, unsigned long offset, unsigned char *buffer, unsigned long count) {
if (count <= 0) return count;
llifstream *file_stream = static_cast<llifstream *>(stream->descriptor.pointer);
file_stream->seekg(offset, std::ios::beg);
file_stream->read((char*)buffer, count);
return (unsigned long)file_stream->gcount();
}

void ft_close_cb(FT_Stream stream) {
llifstream *file_stream = static_cast<llifstream *>(stream->descriptor.pointer);
file_stream->close();
}
#endif

bool LLFontFreetype::loadFace(const std::string& filename, F32 point_size, F32 vert_dpi, F32 horz_dpi, bool is_fallback, S32 face_n)
{
// Don't leak face objects. This is also needed to deal with
// changed font file names.
if (mFTFace)
{
FT_Done_Face(mFTFace);
mFTFace = NULL;
mFTFace = nullptr;
}

int error;
#ifdef LL_WINDOWS
error = ftOpenFace(filename, face_n);
#else
error = FT_New_Face( gFTLibrary,
filename.c_str(),
0,
&mFTFace);
#endif
FT_Open_Args openArgs;
memset( &openArgs, 0, sizeof( openArgs ) );
openArgs.memory_base = gFontManagerp->loadFont( filename, openArgs.memory_size );

if( !openArgs.memory_base )
return false;

openArgs.flags = FT_OPEN_MEMORY;
int error = FT_Open_Face( gFTLibrary, &openArgs, 0, &mFTFace );

if (error)
{
#ifdef LL_WINDOWS
clearFontStreams();
#endif
return false;
}

mIsFallback = is_fallback;
F32 pixels_per_em = (point_size / 72.f)*vert_dpi; // Size in inches * dpi
Expand All @@ -230,10 +203,8 @@ bool LLFontFreetype::loadFace(const std::string& filename, F32 point_size, F32 v
{
// Clean up freetype libs.
FT_Done_Face(mFTFace);
#ifdef LL_WINDOWS
clearFontStreams();
#endif
mFTFace = NULL;

mFTFace = nullptr;
return false;
}

Expand Down Expand Up @@ -289,73 +260,30 @@ S32 LLFontFreetype::getNumFaces(const std::string& filename)
if (mFTFace)
{
FT_Done_Face(mFTFace);
mFTFace = NULL;
mFTFace = nullptr;
}

S32 num_faces = 1;

#ifdef LL_WINDOWS
int error = ftOpenFace(filename, 0);
FT_Open_Args openArgs;
memset( &openArgs, 0, sizeof( openArgs ) );
openArgs.memory_base = gFontManagerp->loadFont( filename, openArgs.memory_size );
if( !openArgs.memory_base )
return 0;
openArgs.flags = FT_OPEN_MEMORY;
int error = FT_Open_Face( gFTLibrary, &openArgs, 0, &mFTFace );

if (error)
{
return 0;
}
else
{
num_faces = mFTFace->num_faces;
}

FT_Done_Face(mFTFace);
clearFontStreams();
mFTFace = NULL;
#endif
mFTFace = nullptr;

return num_faces;
}

#ifdef LL_WINDOWS
S32 LLFontFreetype::ftOpenFace(const std::string& filename, S32 face_n)
{
S32 error = -1;
pFileStream = new llifstream(filename, std::ios::binary);
if (pFileStream->is_open())
{
std::streampos beg = pFileStream->tellg();
pFileStream->seekg(0, std::ios::end);
std::streampos end = pFileStream->tellg();
std::size_t file_size = end - beg;
pFileStream->seekg(0, std::ios::beg);

pFtStream = new LLFT_Stream();
pFtStream->base = 0;
pFtStream->pos = 0;
pFtStream->size = static_cast<unsigned long>(file_size);
pFtStream->descriptor.pointer = pFileStream;
pFtStream->read = ft_read_cb;
pFtStream->close = ft_close_cb;

FT_Open_Args args;
args.flags = FT_OPEN_STREAM;
args.stream = (FT_StreamRec*)pFtStream;
error = FT_Open_Face(gFTLibrary, &args, face_n, &mFTFace);
}
return error;
}

void LLFontFreetype::clearFontStreams()
{
if (pFileStream)
{
pFileStream->close();
}
delete pFileStream;
delete pFtStream;
pFileStream = NULL;
pFtStream = NULL;
}
#endif

void LLFontFreetype::addFallbackFont(const LLPointer<LLFontFreetype>& fallback_font,
const char_functor_t& functor)
{
Expand All @@ -379,7 +307,7 @@ F32 LLFontFreetype::getDescenderHeight() const

F32 LLFontFreetype::getXAdvance(llwchar wch) const
{
if (mFTFace == NULL)
if (mFTFace == nullptr)
return 0.0;

// Return existing info only if it is current
Expand All @@ -403,15 +331,15 @@ F32 LLFontFreetype::getXAdvance(llwchar wch) const

F32 LLFontFreetype::getXAdvance(const LLFontGlyphInfo* glyph) const
{
if (mFTFace == NULL)
if (mFTFace == nullptr)
return 0.0;

return glyph->mXAdvance;
}

F32 LLFontFreetype::getXKerning(llwchar char_left, llwchar char_right) const
{
if (mFTFace == NULL)
if (mFTFace == nullptr)
return 0.0;

//llassert(!mIsFallback);
Expand All @@ -430,7 +358,7 @@ F32 LLFontFreetype::getXKerning(llwchar char_left, llwchar char_right) const

F32 LLFontFreetype::getXKerning(const LLFontGlyphInfo* left_glyph_info, const LLFontGlyphInfo* right_glyph_info) const
{
if (mFTFace == NULL)
if (mFTFace == nullptr)
return 0.0;

U32 left_glyph = left_glyph_info ? left_glyph_info->mGlyphIndex : 0;
Expand All @@ -453,7 +381,7 @@ LLFontGlyphInfo* LLFontFreetype::addGlyph(llwchar wch, EFontGlyphType glyph_type
{
if (!mFTFace)
{
return NULL;
return nullptr;
}

llassert(!mIsFallback);
Expand Down Expand Up @@ -544,14 +472,14 @@ LLFontGlyphInfo* LLFontFreetype::addGlyph(llwchar wch, EFontGlyphType glyph_type
{
return addGlyphFromFont(this, wch, glyph_index, glyph_type);
}
return NULL;
return nullptr;
}

LLFontGlyphInfo* LLFontFreetype::addGlyphFromFont(const LLFontFreetype *fontp, llwchar wch, U32 glyph_index, EFontGlyphType requested_glyph_type) const
{
LL_PROFILE_ZONE_SCOPED;
if (mFTFace == NULL)
return NULL;
if (mFTFace == nullptr)
return nullptr;

llassert(!mIsFallback);
fontp->renderGlyph(requested_glyph_type, glyph_index);
Expand Down Expand Up @@ -604,7 +532,7 @@ LLFontGlyphInfo* LLFontFreetype::addGlyphFromFont(const LLFontFreetype *fontp, l
{
U8 *buffer_data = fontp->mFTFace->glyph->bitmap.buffer;
S32 buffer_row_stride = fontp->mFTFace->glyph->bitmap.pitch;
U8 *tmp_graydata = NULL;
U8 *tmp_graydata = nullptr;

if (fontp->mFTFace->glyph->bitmap.pixel_mode
== FT_PIXEL_MODE_MONO)
Expand Down Expand Up @@ -701,7 +629,7 @@ void LLFontFreetype::insertGlyphInfo(llwchar wch, LLFontGlyphInfo* gi) const

void LLFontFreetype::renderGlyph(EFontGlyphType bitmap_type, U32 glyph_index) const
{
if (mFTFace == NULL)
if (mFTFace == nullptr)
return;

FT_Int32 load_flags = FT_LOAD_FORCE_AUTOHINT;
Expand Down Expand Up @@ -886,3 +814,58 @@ void LLFontFreetype::setSubImageLuminanceAlpha(U32 x, U32 y, U32 bitmap_num, U32
}
}


namespace ll
{
namespace fonts
{
class LoadedFont
{
public:
LoadedFont( std::string aName , std::string const &aAddress, std::size_t aSize )
: mAddress( aAddress )
{
mName = aName;
mSize = aSize;
mRefs = 1;
}
std::string mName;
std::string mAddress;
std::size_t mSize;
U32 mRefs;
};
}
}

U8 const* LLFontManager::loadFont( std::string const &aFilename, long &a_Size)
{
a_Size = 0;
std::map< std::string, std::shared_ptr<ll::fonts::LoadedFont> >::iterator itr = m_LoadedFonts.find( aFilename );
if( itr != m_LoadedFonts.end() )
{
++itr->second->mRefs;
// A possible overflow cannot happen here, as it is asserted that the size is less than std::numeric_limits<long>::max() a few lines below.
a_Size = static_cast<long>(itr->second->mSize);
return reinterpret_cast<U8 const*>(itr->second->mAddress.c_str());
}

auto strContent = LLFile::getContents(aFilename);

if( strContent.empty() )
return nullptr;

// For fontconfig a type of long is required, std::string::size() returns size_t. I think it is safe to limit this to 2GiB and not support fonts that huge (can that even be a thing?)
llassert_always( strContent.size() < std::numeric_limits<long>::max() );

a_Size = static_cast<long>(strContent.size());

auto pCache = std::make_shared<ll::fonts::LoadedFont>( aFilename, strContent, a_Size );
itr = m_LoadedFonts.insert( std::make_pair( aFilename, pCache ) ).first;

return reinterpret_cast<U8 const*>(itr->second->mAddress.c_str());
}

void LLFontManager::unloadAllFonts()
{
m_LoadedFonts.clear();
}
Loading
Loading