Merge tag 'Second_Life_Release#bcfda3b6-26.3' into 26.3

1 files changed, 6 insertions, 0 deletions

diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index 3e03875d03..eea0b37c43 100644
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -567,7 +567,13 @@ void LLViewerShaderMgr::setShaders()
             LLAppViewer::instance()->isSecondInstance());
     }
 
+    static LLCachedControl<U32> max_texture_index(gSavedSettings, "RenderMaxTextureIndex", 16);
+
+    // when using indexed texture rendering, leave some texture units available for shadow and reflection maps
+    static LLCachedControl<S32> reserved_texture_units(gSavedSettings, "RenderReservedTextureIndices", 14);
+
     LLGLSLShader::sIndexedTextureChannels = 4;
+        //llclamp<S32>(max_texture_index, 1, gGLManager.mNumTextureImageUnits-reserved_texture_units);
 
     reentrance = true;