diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-11-11 01:55:26 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-11-11 01:55:26 +0200 |
| commit | 32df877cd73b5b6a3672d0159c982077a4b67a9d (patch) | |
| tree | 3db2802f0ab39f2d7b1264e2ac1d3599f1a3bd5a /indra/llrender | |
| parent | eccc9057d9d9799d3d5056bdfe255bd9e5e2be6a (diff) | |
| parent | e028ae4f023420bedd4e4106f4749e700a14c3cc (diff) | |
Merge branch 'develop' into marchcat/c-develop
# Conflicts:
# indra/newview/llvoavatar.cpp
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llfontvertexbuffer.cpp | 4 | ||||
| -rw-r--r-- | indra/llrender/llfontvertexbuffer.h | 2 | ||||
| -rw-r--r-- | indra/llrender/llgl.cpp | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/indra/llrender/llfontvertexbuffer.cpp b/indra/llrender/llfontvertexbuffer.cpp index 963aab7121..5bd1ca5eed 100644 --- a/indra/llrender/llfontvertexbuffer.cpp +++ b/indra/llrender/llfontvertexbuffer.cpp @@ -144,6 +144,8 @@ S32 LLFontVertexBuffer::render( || mLastShadow != shadow // ex: buttons change shadow state || mLastScaleX != LLFontGL::sScaleX || mLastScaleY != LLFontGL::sScaleY + || mLastVertDPI != LLFontGL::sVertDPI + || mLastHorizDPI != LLFontGL::sHorizDPI || mLastOrigin != LLFontGL::sCurOrigin) { genBuffers(fontp, text, begin_offset, x, y, color, halign, valign, @@ -196,6 +198,8 @@ void LLFontVertexBuffer::genBuffers( mLastScaleX = LLFontGL::sScaleX; mLastScaleY = LLFontGL::sScaleY; + mLastVertDPI = LLFontGL::sVertDPI; + mLastHorizDPI = LLFontGL::sHorizDPI; mLastOrigin = LLFontGL::sCurOrigin; if (right_x) diff --git a/indra/llrender/llfontvertexbuffer.h b/indra/llrender/llfontvertexbuffer.h index 59cb536b74..af195dfff9 100644 --- a/indra/llrender/llfontvertexbuffer.h +++ b/indra/llrender/llfontvertexbuffer.h @@ -115,6 +115,8 @@ private: // LLFontGL's statics F32 mLastScaleX = 1.f; F32 mLastScaleY = 1.f; + F32 mLastVertDPI = 0.f; + F32 mLastHorizDPI = 0.f; LLCoordGL mLastOrigin; static bool sEnableBufferCollection; diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index 9209cdcb51..7bc9124ac1 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -2750,7 +2750,7 @@ void LLGLUserClipPlane::setPlane(F32 a, F32 b, F32 c, F32 d) if(cplane[2] < 0) cplane *= -1; - glm::mat4 suffix; + glm::mat4 suffix = glm::identity<glm::mat4>(); suffix = glm::row(suffix, 2, cplane); glm::mat4 newP = suffix * P; gGL.matrixMode(LLRender::MM_PROJECTION); |