diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-02-24 17:19:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-24 17:19:55 -0500 |
| commit | 62cf4781af0363c551a2e09710682cad57bdf294 (patch) | |
| tree | 78d884577e9b6d158fb430eefeff08f3121e4617 /indra/llrender/llfontvertexbuffer.cpp | |
| parent | 3dde346975526d7830886a112b654bd12adfd662 (diff) | |
| parent | 5b968b7209d5e104e4b6152b8fc0fbbb37d1674a (diff) | |
Merge branch 'release/2024.12-ForeverFPS' into geenz/eep-setting-fixes
Diffstat (limited to 'indra/llrender/llfontvertexbuffer.cpp')
| -rw-r--r-- | indra/llrender/llfontvertexbuffer.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llrender/llfontvertexbuffer.cpp b/indra/llrender/llfontvertexbuffer.cpp index b53a841a87..a223509d30 100644 --- a/indra/llrender/llfontvertexbuffer.cpp +++ b/indra/llrender/llfontvertexbuffer.cpp @@ -148,7 +148,7 @@ S32 LLFontVertexBuffer::render( || mLastHorizDPI != LLFontGL::sHorizDPI || mLastOrigin != LLFontGL::sCurOrigin || mLastResGeneration != LLFontGL::sResolutionGeneration - || mLastFontGlyphCount != fontp->getKnownGlyphCount()) + || mLastFontCacheGen != fontp->getCacheGeneration()) { genBuffers(fontp, text, begin_offset, x, y, color, halign, valign, style, shadow, max_chars, max_pixels, right_x, use_ellipses, use_color); @@ -180,6 +180,9 @@ void LLFontVertexBuffer::genBuffers( { // todo: add a debug build assert if this triggers too often for to long? mBufferList.clear(); + // Save before rendreing, it can change mid-render, + // so will need to rerender previous characters + mLastFontCacheGen = fontp->getCacheGeneration(); gGL.beginList(&mBufferList); mChars = fontp->render(text, begin_offset, x, y, color, halign, valign, @@ -204,7 +207,6 @@ void LLFontVertexBuffer::genBuffers( mLastHorizDPI = LLFontGL::sHorizDPI; mLastOrigin = LLFontGL::sCurOrigin; mLastResGeneration = LLFontGL::sResolutionGeneration; - mLastFontGlyphCount = fontp->getKnownGlyphCount(); if (right_x) { |