Merge remote-tracking branch 'origin/release/2024.12-ForeverFPS' into brad/develop

 # Conflicts:
 #	indra/newview/llviewertexture.cpp

Author: brad-linden

indra/llrender/llcubemaparray.cpp

@@ -109,7 +109,7 @@ LLCubeMapArray::~LLCubeMapArray()
 {
 }
 
-void LLCubeMapArray::allocate(U32 resolution, U32 components, U32 count, bool use_mips)
+void LLCubeMapArray::allocate(U32 resolution, U32 components, U32 count, bool use_mips, bool hdr)
 {
     U32 texname = 0;
     mWidth = resolution;
@@ -128,6 +128,10 @@ void LLCubeMapArray::allocate(U32 resolution, U32 components, U32 count, bool us
     free_cur_tex_image();
 
     U32 format = components == 4 ? GL_RGBA16F : GL_RGB16F;
+    if (!hdr)
+    {
+        format = components == 4 ? GL_RGBA8 : GL_RGB8;
+    }
     U32 mip = 0;
     U32 mip_resolution = resolution;
     while (mip_resolution >= 1)

indra/llrender/llcubemaparray.h

@@ -52,7 +52,7 @@ class LLCubeMapArray : public LLRefCount
     // components - number of components per pixel
     // count - number of cube maps in the array
     // use_mips - if true, mipmaps will be allocated for this cube map array and anisotropic filtering will be used
-    void allocate(U32 res, U32 components, U32 count, bool use_mips = true);
+    void allocate(U32 res, U32 components, U32 count, bool use_mips = true, bool hdr = true);
     void bind(S32 stage);
     void unbind();
 

indra/llrender/llfontfreetype.cpp

@@ -482,7 +482,7 @@ LLFontGlyphInfo* LLFontFreetype::addGlyphFromFont(const LLFontFreetype *fontp, l
         return nullptr;
 
     llassert(!mIsFallback);
-    fontp->renderGlyph(requested_glyph_type, glyph_index);
+    fontp->renderGlyph(requested_glyph_type, glyph_index, wch);
 
     EFontGlyphType bitmap_glyph_type = EFontGlyphType::Unspecified;
     switch (fontp->mFTFace->glyph->bitmap.pixel_mode)
@@ -627,7 +627,7 @@ void LLFontFreetype::insertGlyphInfo(llwchar wch, LLFontGlyphInfo* gi) const
     }
 }
 
-void LLFontFreetype::renderGlyph(EFontGlyphType bitmap_type, U32 glyph_index) const
+void LLFontFreetype::renderGlyph(EFontGlyphType bitmap_type, U32 glyph_index, llwchar wch) const
 {
     if (mFTFace == nullptr)
         return;
@@ -642,11 +642,28 @@ void LLFontFreetype::renderGlyph(EFontGlyphType bitmap_type, U32 glyph_index) co
     FT_Error error = FT_Load_Glyph(mFTFace, glyph_index, load_flags);
     if (FT_Err_Ok != error)
     {
+        if (error == FT_Err_Out_Of_Memory)
+        {
+            LLError::LLUserWarningMsg::showOutOfMemory();
+            LL_ERRS() << "Out of memory loading glyph for character " << wch << LL_ENDL;
+        }
+
         std::string message = llformat(
-            "Error %d (%s) loading glyph %u: bitmap_type=%u, load_flags=%d",
-            error, FT_Error_String(error), glyph_index, bitmap_type, load_flags);
+            "Error %d (%s) loading wchar %u glyph %u/%u: bitmap_type=%u, load_flags=%d",
+            error, FT_Error_String(error), wch, glyph_index, mFTFace->num_glyphs, bitmap_type, load_flags);
         LL_WARNS_ONCE() << message << LL_ENDL;
         error = FT_Load_Glyph(mFTFace, glyph_index, load_flags ^ FT_LOAD_COLOR);
+        if (FT_Err_Invalid_Outline == error
+            || FT_Err_Invalid_Composite == error
+            || (FT_Err_Ok != error && LLStringOps::isEmoji(wch)))
+        {
+            glyph_index = FT_Get_Char_Index(mFTFace, '?');
+            // if '?' is not present, potentially can use last index, that's supposed to be null glyph
+            if (glyph_index > 0)
+            {
+                error = FT_Load_Glyph(mFTFace, glyph_index, load_flags ^ FT_LOAD_COLOR);
+            }
+        }
         llassert_always_msg(FT_Err_Ok == error, message.c_str());
     }
 

indra/llrender/llfontfreetype.h

@@ -164,7 +164,7 @@ class LLFontFreetype : public LLRefCount
     bool hasGlyph(llwchar wch) const;       // Has a glyph for this character
     LLFontGlyphInfo* addGlyph(llwchar wch, EFontGlyphType glyph_type) const;        // Add a new character to the font if necessary
     LLFontGlyphInfo* addGlyphFromFont(const LLFontFreetype *fontp, llwchar wch, U32 glyph_index, EFontGlyphType bitmap_type) const; // Add a glyph from this font to the other (returns the glyph_index, 0 if not found)
-    void renderGlyph(EFontGlyphType bitmap_type, U32 glyph_index) const;
+    void renderGlyph(EFontGlyphType bitmap_type, U32 glyph_index, llwchar wch) const;
     void insertGlyphInfo(llwchar wch, LLFontGlyphInfo* gi) const;
 
     std::string mName;

indra/llui/llstyle.cpp

@@ -39,7 +39,7 @@ LLStyle::Params::Params()
     readonly_color("readonly_color", LLColor4::black),
     selected_color("selected_color", LLColor4::black),
     alpha("alpha", 1.f),
-    font("font", LLFontGL::getFontMonospace()),
+    font("font", LLStyle::getDefaultFont()),
     image("image"),
     link_href("href"),
     is_link("is_link")
@@ -87,6 +87,11 @@ const LLFontGL* LLStyle::getFont() const
     return mFont;
 }
 
+const LLFontGL* LLStyle::getDefaultFont()
+{
+    return LLFontGL::getFontMonospace();
+}
+
 void LLStyle::setLinkHREF(const std::string& href)
 {
     mLink = href;

indra/llui/llstyle.h

@@ -79,6 +79,7 @@ class LLStyle : public LLRefCount
 
     void setFont(const LLFontGL* font);
     const LLFontGL* getFont() const;
+    static const LLFontGL* getDefaultFont();
 
     const std::string& getLinkHREF() const { return mLink; }
     void setLinkHREF(const std::string& href);

indra/llui/lltextbase.cpp

@@ -1461,7 +1461,8 @@ void LLTextBase::onVisibilityChange( bool new_visibility )
 //virtual
 void LLTextBase::setValue(const LLSD& value )
 {
-    setText(value.asString());
+    static const LLStyle::Params input_params = LLStyle::Params();
+    setText(value.asString(), input_params);
 }
 
 //virtual
@@ -3930,8 +3931,7 @@ bool LLInlineViewSegment::getDimensionsF32(S32 first_char, S32 num_chars, F32& w
         if (mForceNewLine)
         {
             // Chat, string can't be smaller then font height even if it is empty
-            LLStyleSP s(new LLStyle(LLStyle::Params().visible(true)));
-            height = s->getFont()->getLineHeight();
+            height = LLStyle::getDefaultFont()->getLineHeight();
 
             return true; // new line
         }
@@ -3995,9 +3995,7 @@ void LLInlineViewSegment::linkToDocument(LLTextBase* editor)
 
 LLLineBreakTextSegment::LLLineBreakTextSegment(S32 pos):LLTextSegment(pos,pos+1)
 {
-    LLStyleSP s( new LLStyle(LLStyle::Params().visible(true)));
-
-    mFontHeight = s->getFont()->getLineHeight();
+    mFontHeight = LLStyle::getDefaultFont()->getLineHeight();
 }
 LLLineBreakTextSegment::LLLineBreakTextSegment(LLStyleConstSP style,S32 pos):LLTextSegment(pos,pos+1)
 {

indra/llui/lltextbox.cpp

@@ -159,7 +159,8 @@ LLSD LLTextBox::getValue() const
 bool LLTextBox::setTextArg( const std::string& key, const LLStringExplicit& text )
 {
     mText.setArg(key, text);
-    LLTextBase::setText(mText.getString());
+    static const LLStyle::Params input_params = LLStyle::Params();
+    LLTextBase::setText(mText.getString(), input_params);
 
     return true;
 }

indra/llwindow/llwindowwin32.cpp

@@ -45,6 +45,7 @@
 #include "llstring.h"
 #include "lldir.h"
 #include "llsdutil.h"
+#include "llsys.h"
 #include "llglslshader.h"
 #include "llthreadsafequeue.h"
 #include "stringize.h"
@@ -4669,6 +4670,23 @@ void LLWindowWin32::LLWindowWin32Thread::checkDXMem()
 
                     // Alternatively use GetDesc from below to get adapter's memory
                     UINT64 budget_mb = info.Budget / (1024 * 1024);
+                    if (gGLManager.mIsIntel)
+                    {
+                        U32Megabytes phys_mb = gSysMemory.getPhysicalMemoryKB();
+                        LL_WARNS() << "Physical memory: " << phys_mb << " MB" << LL_ENDL;
+
+                        if (phys_mb > 0)
+                        {
+                            // Intel uses 'shared' vram, cap it to 25% of total memory
+                            // Todo: consider caping all adapters at least to 50% ram
+                            budget_mb = llmin(budget_mb, (UINT64)(phys_mb * 0.25));
+                        }
+                        else
+                        {
+                            // if no data available, cap to 2Gb
+                            budget_mb = llmin(budget_mb, (UINT64)2048);
+                        }
+                    }
                     if (gGLManager.mVRAM < (S32)budget_mb)
                     {
                         gGLManager.mVRAM = (S32)budget_mb;

indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl

@@ -150,7 +150,7 @@ vec3 calcPointLightOrSpotLight(vec3 light_col, vec3 diffuse, vec3 v, vec3 n, vec
         float amb_da = 0.0;//ambiance;
         if (da > 0)
         {
-            lit = max(da * dist_atten,0.0);
+            lit = clamp(da * dist_atten, 0.0, 1.0);
             col = lit * light_col * diffuse;
             amb_da += (da*0.5+0.5) * ambiance;
         }