Merge branch 'release/2025.04' into rye/forevermac

4 files changed, 56 insertions, 24 deletions

diff --git a/indra/llrender/llcubemaparray.cpp b/indra/llrender/llcubemaparray.cpp
index d0a97dc2c6..998b57217d 100644
--- a/indra/llrender/llcubemaparray.cpp
+++ b/indra/llrender/llcubemaparray.cpp
@@ -105,6 +105,36 @@ LLCubeMapArray::LLCubeMapArray()
 
 }
 
+LLCubeMapArray::LLCubeMapArray(LLCubeMapArray& lhs, U32 width, U32 count) : mTextureStage(0)
+{
+    mWidth = width;
+    mCount = count;
+
+    // Allocate a new cubemap array with the same criteria as the incoming cubemap array
+    allocate(mWidth, lhs.mImage->getComponents(), count, lhs.mImage->getUseMipMaps(), lhs.mHDR);
+
+    // Copy each cubemap from the incoming array to the new array
+    U32 min_count = std::min(count, lhs.mCount);
+    for (U32 i = 0; i < min_count * 6; ++i)
+    {
+        U32 src_resolution = lhs.mWidth;
+        U32 dst_resolution = mWidth;
+        {
+            GLint components = GL_RGB;
+            if (mImage->getComponents() == 4)
+                components = GL_RGBA;
+            GLint format = GL_RGB;
+
+            // Handle different resolutions by scaling the image
+            LLPointer<LLImageRaw> src_image = new LLImageRaw(lhs.mWidth, lhs.mWidth, lhs.mImage->getComponents());
+            glGetTexImage(GL_TEXTURE_CUBE_MAP_ARRAY, 0, components, GL_UNSIGNED_BYTE, src_image->getData());
+
+            LLPointer<LLImageRaw> scaled_image = src_image->scaled(mWidth, mWidth);
+            glTexSubImage3D(GL_TEXTURE_CUBE_MAP_ARRAY, 0, 0, 0, i, mWidth, mWidth, 1, components, GL_UNSIGNED_BYTE, scaled_image->getData());
+        }
+    }
+}
+
 LLCubeMapArray::~LLCubeMapArray()
 {
 }
@@ -115,6 +145,8 @@ void LLCubeMapArray::allocate(U32 resolution, U32 components, U32 count, bool us
     mWidth = resolution;
     mCount = count;
 
+    mHDR = hdr;
+
     LLImageGL::generateTextures(1, &texname);
 
     mImage = new LLImageGL(resolution, resolution, components, use_mips);
diff --git a/indra/llrender/llcubemaparray.h b/indra/llrender/llcubemaparray.h
index bfc72a321d..6b4288cb23 100644
--- a/indra/llrender/llcubemaparray.h
+++ b/indra/llrender/llcubemaparray.h
@@ -36,6 +36,7 @@ class LLCubeMapArray : public LLRefCount
 {
 public:
     LLCubeMapArray();
+    LLCubeMapArray(LLCubeMapArray& lhs, U32 width, U32 count);
 
     static GLenum sTargets[6];
 
@@ -73,4 +74,5 @@ protected:
     U32 mWidth = 0;
     U32 mCount = 0;
     S32 mTextureStage;
+    bool mHDR;
 };
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index 2be2bfbf7e..d13b98e274 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -1217,28 +1217,9 @@ bool LLGLManager::initGL()
     }
 #endif
 
-#if LL_WINDOWS
-    if (mVRAM < 256)
-    {
-        // Something likely went wrong using the above extensions
-        // try WMI first and fall back to old method (from dxdiag) if all else fails
-        // Function will check all GPUs WMI knows of and will pick up the one with most
-        // memory. We need to check all GPUs because system can switch active GPU to
-        // weaker one, to preserve power when not under load.
-        U32 mem = LLDXHardware::getMBVideoMemoryViaWMI();
-        if (mem != 0)
-        {
-            mVRAM = mem;
-            LL_WARNS("RenderInit") << "VRAM Detected (WMI):" << mVRAM<< LL_ENDL;
-        }
-    }
-#endif
-
     if (mVRAM < 256 && old_vram > 0)
     {
         // fall back to old method
-        // Note: on Windows value will be from LLDXHardware.
-        // Either received via dxdiag or via WMI by id from dxdiag.
         mVRAM = old_vram;
     }
 
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp
index 66f38c9281..b062eca132 100644
--- a/indra/llrender/llglslshader.cpp
+++ b/indra/llrender/llglslshader.cpp
@@ -1250,23 +1250,40 @@ S32 LLGLSLShader::disableTexture(S32 uniform, LLTexUnit::eTextureType mode)
         llassert(false);
         return -1;
     }
+
     S32 index = mTexture[uniform];
-    if (index != -1 && gGL.getTexUnit(index)->getCurrType() != LLTexUnit::TT_NONE)
+    if (index < 0)
+    {
+        // Invalid texture index - nothing to disable
+        return index;
+    }
+
+    LLTexUnit* tex_unit = gGL.getTexUnit(index);
+    if (!tex_unit)
     {
-        if (gDebugGL && gGL.getTexUnit(index)->getCurrType() != mode)
+        // Invalid texture unit
+        LL_WARNS_ONCE("Shader") << "Invalid texture unit at index: " << index << LL_ENDL;
+        return index;
+    }
+
+    LLTexUnit::eTextureType curr_type = tex_unit->getCurrType();
+    if (curr_type != LLTexUnit::TT_NONE)
+    {
+        if (gDebugGL && curr_type != mode)
         {
             if (gDebugSession)
             {
-                gFailLog << "Texture channel " << index << " texture type corrupted." << std::endl;
+                gFailLog << "Texture channel " << index << " texture type corrupted. Expected: " << mode << ", Found: " << curr_type << std::endl;
                 ll_fail("LLGLSLShader::disableTexture failed");
             }
             else
             {
-                LL_ERRS() << "Texture channel " << index << " texture type corrupted." << LL_ENDL;
+                LL_ERRS() << "Texture channel " << index << " texture type corrupted. Expected: " << mode << ", Found: " << curr_type << LL_ENDL;
             }
         }
-        gGL.getTexUnit(index)->disable();
+        tex_unit->disable();
     }
+
     return index;
 }