From 0f4aa87caca779d77c19dfef06fe8a276f7d0eb6 Mon Sep 17 00:00:00 2001
From: Rye <rye@lindenlab.com>
Date: Mon, 10 Feb 2025 16:11:39 -0500
Subject: Vectorize LLRender UI scale and offset stack to resolve perf hotspot
 on arm

---
 indra/llrender/llrender.h | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'indra/llrender/llrender.h')

diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h
index 7b6bd4198b..9e68c2dcd1 100644
--- a/indra/llrender/llrender.h
+++ b/indra/llrender/llrender.h
@@ -43,6 +43,7 @@
 #include "llglheaders.h"
 #include "llmatrix4a.h"
 #include "glm/mat4x4.hpp"
+#include <boost/align/aligned_allocator.hpp>
 
 #include <array>
 #include <list>
@@ -227,13 +228,9 @@ protected:
     S32                 mIndex;
     U32                 mCurrTexture;
     eTextureType        mCurrTexType;
-    S32                 mCurrColorScale;
-    S32                 mCurrAlphaScale;
     bool                mHasMipMaps;
 
     void debugTextureUnit(void);
-    void setColorScale(S32 scale);
-    void setAlphaScale(S32 scale);
     GLint getTextureSource(eTextureBlendSrc src);
     GLint getTextureSourceType(eTextureBlendSrc src, bool isAlpha = false);
 };
@@ -526,8 +523,8 @@ private:
     eBlendFactor mCurrBlendAlphaSFactor;
     eBlendFactor mCurrBlendAlphaDFactor;
 
-    std::vector<LLVector3> mUIOffset;
-    std::vector<LLVector3> mUIScale;
+    std::vector<LLVector4a, boost::alignment::aligned_allocator<LLVector4a, 16> > mUIOffset;
+    std::vector<LLVector4a, boost::alignment::aligned_allocator<LLVector4a, 16> > mUIScale;
 };
 
 extern F32 gGLModelView[16];
-- 
cgit v1.3


From 99ce597b54a9180cff0f8907e94833257b77e263 Mon Sep 17 00:00:00 2001
From: Rye <rye@alchemyviewer.org>
Date: Thu, 27 Feb 2025 19:28:01 -0500
Subject: Fix texture filtering and address mode not updating for vast majority
 of textures when dirtied

---
 indra/llrender/llrender.cpp | 22 +++++++++++++++++++---
 indra/llrender/llrender.h   |  4 ++++
 2 files changed, 23 insertions(+), 3 deletions(-)

(limited to 'indra/llrender/llrender.h')

diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index c26e9b15b8..4f646cdc33 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -207,6 +207,12 @@ void LLTexUnit::bindFast(LLTexture* texture)
     }
     glBindTexture(sGLTextureType[gl_tex->getTarget()], mCurrTexture);
     mHasMipMaps = gl_tex->mHasMipMaps;
+    if (gl_tex->mTexOptionsDirty)
+    {
+        gl_tex->mTexOptionsDirty = false;
+        setTextureAddressModeFast(gl_tex->mAddressMode);
+        setTextureFilteringOptionFast(gl_tex->mFilterOption);
+    }
 }
 
 bool LLTexUnit::bind(LLTexture* texture, bool for_rendering, bool forceBind)
@@ -461,11 +467,16 @@ void LLTexUnit::setTextureAddressMode(eTextureAddressMode mode)
 
     activate();
 
-    glTexParameteri (sGLTextureType[mCurrTexType], GL_TEXTURE_WRAP_S, sGLAddressMode[mode]);
-    glTexParameteri (sGLTextureType[mCurrTexType], GL_TEXTURE_WRAP_T, sGLAddressMode[mode]);
+    setTextureAddressModeFast(mode);
+}
+
+void LLTexUnit::setTextureAddressModeFast(eTextureAddressMode mode)
+{
+    glTexParameteri(sGLTextureType[mCurrTexType], GL_TEXTURE_WRAP_S, sGLAddressMode[mode]);
+    glTexParameteri(sGLTextureType[mCurrTexType], GL_TEXTURE_WRAP_T, sGLAddressMode[mode]);
     if (mCurrTexType == TT_CUBE_MAP)
     {
-        glTexParameteri (GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_R, sGLAddressMode[mode]);
+        glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_R, sGLAddressMode[mode]);
     }
 }
 
@@ -475,6 +486,11 @@ void LLTexUnit::setTextureFilteringOption(LLTexUnit::eTextureFilterOptions optio
 
     gGL.flush();
 
+    setTextureFilteringOptionFast(option);
+}
+
+void LLTexUnit::setTextureFilteringOptionFast(LLTexUnit::eTextureFilterOptions option)
+{
     if (option == TFO_POINT)
     {
         glTexParameteri(sGLTextureType[mCurrTexType], GL_TEXTURE_MAG_FILTER, GL_NEAREST);
diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h
index 9e68c2dcd1..755aee4bd6 100644
--- a/indra/llrender/llrender.h
+++ b/indra/llrender/llrender.h
@@ -208,11 +208,15 @@ public:
     // Warning: this stays set for the bound texture forever,
     // make sure you want to permanently change the address mode  for the bound texture.
     void setTextureAddressMode(eTextureAddressMode mode);
+    // MUST already be active and bound
+    void setTextureAddressModeFast(eTextureAddressMode mode);
 
     // Sets the filtering options used to sample the texture
     // Warning: this stays set for the bound texture forever,
     // make sure you want to permanently change the filtering for the bound texture.
     void setTextureFilteringOption(LLTexUnit::eTextureFilterOptions option);
+    // MUST already be active and bound
+    void setTextureFilteringOptionFast(LLTexUnit::eTextureFilterOptions option);
 
     static U32 getInternalType(eTextureType type);
 
-- 
cgit v1.3