Remove some old unused settings, and rename mis-labeled ones to the current nomenclature

7 files changed, 8 insertions, 52 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index c1a2ca2745..864b85034e 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -8035,17 +8035,6 @@
     <key>Value</key>
     <real>0.1</real>
   </map>
-  <key>RenderMaxTextureIndex</key>
-  <map>
-    <key>Comment</key>
-    <string>Maximum texture index to use for indexed texture rendering.</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>U32</string>
-    <key>Value</key>
-    <integer>16</integer>
-  </map>
   <key>RenderMaxTextureResolution</key>
   <map>
     <key>Comment</key>
@@ -8060,7 +8049,7 @@
   <key>RenderTextureQuality</key>
   <map>
     <key>Comment</key>
-    <string>Texture quality preset: 0=Low, 1=Medium, 2=High, 3=Ultra. Drives RenderMaxTextureResolution, TexturePixelToTexelRatio, TexturePressureTightenRate, TexturePressureRelaxRate, and TextureChannelRatio* (Normal/BaseColor/Specular/Emissive). Watermarks (TextureWatermarkHigh/Low) are constant across tiers.</string>
+    <string>Texture quality preset: 0=Low, 1=Medium, 2=High, 3=Ultra. Drives RenderMaxTextureResolution, TexturePixelToTexelRatio, TexturePressureTightenRate, TexturePressureRelaxRate, and TextureChannelRatio* (Normal/BaseColor/Specular/Emissive). The pressure water marks (TexturePressureHighWater/LowWater) are constant across tiers.</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -8079,17 +8068,6 @@
         <key>Value</key>
         <integer>0</integer>
     </map>
-    <key>RenderDebugTextureBind</key>
-    <map>
-      <key>Comment</key>
-      <string>Enable texture bind performance test.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
   <key>RenderDelayCreation</key>
   <map>
     <key>Comment</key>
@@ -9406,17 +9384,6 @@
     <key>Value</key>
     <integer>64</integer>
   </map>
-  <key>RenderReservedTextureIndices</key>
-  <map>
-    <key>Comment</key>
-    <string>Count of texture indices to reserve for shadow and reflection maps when using indexed texture rendering.  Probably only want to set from the login screen.</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>S32</string>
-    <key>Value</key>
-    <integer>14</integer>
-  </map>
   <key>RenderResolutionDivisor</key>
   <map>
     <key>Comment</key>
@@ -11937,10 +11904,10 @@
       <key>Value</key>
       <real>1.0</real>
     </map>
-    <key>TextureWatermarkHigh</key>
+    <key>TexturePressureHighWater</key>
     <map>
       <key>Comment</key>
-      <string>High watermark as a fraction of the VRAM budget. When used VRAM crosses this, the global pixel:texel ratio tightens (backs off detail). Held at 0.90 - it's a physical "crossed the budget" threshold, not a tier preference.</string>
+      <string>High water mark as a fraction of the VRAM budget. When used VRAM crosses this, the global pixel:texel ratio tightens (backs off detail) at TexturePressureTightenRate. Held at 0.90 - it's a physical "crossed the budget" threshold, not a tier preference.</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -11948,10 +11915,10 @@
       <key>Value</key>
       <real>0.90</real>
     </map>
-    <key>TextureWatermarkLow</key>
+    <key>TexturePressureLowWater</key>
     <map>
       <key>Comment</key>
-      <string>Low watermark as a fraction of the VRAM budget. When used VRAM drops below this, the global pixel:texel ratio relaxes (restores detail). The band between low and high is the hysteresis zone where the ratio holds steady - wide enough to prevent sawtooth.</string>
+      <string>Low water mark as a fraction of the VRAM budget. When used VRAM drops below this, the global pixel:texel ratio relaxes (restores detail) at TexturePressureRelaxRate. The band between low and high is the hysteresis zone where the ratio holds steady - wide enough to prevent sawtooth.</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt
index f05f77c222..72e0f43c0e 100644
--- a/indra/newview/featuretable.txt
+++ b/indra/newview/featuretable.txt
@@ -68,7 +68,6 @@ RenderShadowDetail			1	2
 RenderUseStreamVBO			1	1
 RenderFSAAType			    1	2
 RenderFSAASamples			1	3
-RenderMaxTextureIndex		1	16
 RenderGLContextCoreProfile         1   1
 RenderGLMultiThreadedTextures      1   0
 RenderGLMultiThreadedMedia         1   1
diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt
index d8d4f08429..a39c64510f 100644
--- a/indra/newview/featuretable_linux.txt
+++ b/indra/newview/featuretable_linux.txt
@@ -66,7 +66,6 @@ RenderDeferredSSAO			1	1
 RenderUseAdvancedAtmospherics 1 0
 RenderShadowDetail			1	2
 RenderFSAASamples			1	16
-RenderMaxTextureIndex		1	16
 RenderMirrors				1	1
 
 //
@@ -491,7 +490,6 @@ RenderVBOEnable				1	0
 
 list OpenGLPre30
 RenderDeferred				0	0
-RenderMaxTextureIndex		1	1
 
 list Intel
 RenderAnisotropic			1	0
diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt
index b11fa28c48..ebfe45d9ea 100644
--- a/indra/newview/featuretable_mac.txt
+++ b/indra/newview/featuretable_mac.txt
@@ -65,7 +65,6 @@ RenderShadowDetail			1	2
 RenderUseStreamVBO			1	1
 RenderFSAAType			    1	2
 RenderFSAASamples			1	3
-RenderMaxTextureIndex		1	16
 RenderGLContextCoreProfile         1   1
 RenderGLMultiThreadedTextures      1   1
 RenderGLMultiThreadedMedia         1   1
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index e2af54539a..dd2357ae8f 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -138,7 +138,7 @@ namespace
     //    floor (down to 0 = deepest mips), so there is no per-tier minimum.
     //  - the channel ratios coarsen specular/emissive/normal relative to base
     //    color (each is a multiplier on the global ratio).
-    // The watermarks (TextureWatermarkHigh/Low) are NOT tiered - they're a
+    // The pressure water marks (TexturePressureHighWater/LowWater) are NOT tiered - they're a
     // physical "crossed the budget" threshold (0.90 / 0.70), constant across
     // tiers. Lower tiers start blurrier (lower R_max) and tighten faster.
     //                            max_res  Rmax   tight  relax  N      BC     S      E
@@ -884,7 +884,6 @@ void settings_setup_listeners()
     setting_setup_signal_listener(gSavedSettings, "OctreeMaxNodeCapacity", handleRepartition);
     setting_setup_signal_listener(gSavedSettings, "OctreeAlphaDistanceFactor", handleRepartition);
     setting_setup_signal_listener(gSavedSettings, "OctreeAttachmentSizeFactor", handleRepartition);
-    setting_setup_signal_listener(gSavedSettings, "RenderMaxTextureIndex", handleSetShaderChanged);
     setting_setup_signal_listener(gSavedSettings, "RenderUIBuffer", handleWindowResized);
     setting_setup_signal_listener(gSavedSettings, "RenderDepthOfField", handleReleaseGLBufferChanged);
     setting_setup_signal_listener(gSavedSettings, "RenderFSAAType", handleReleaseGLBufferChanged);
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index 27865f7598..255317ce80 100644
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -561,13 +561,7 @@ 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;
 
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index baf5874507..42cf91b43b 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -547,8 +547,8 @@ void LLViewerTexture::updateClass()
     // raises every texture's desired discard, which is what actually evicts.
     {
         static LLCachedControl<F32> ratio_max(gSavedSettings, "TexturePixelToTexelRatio", 1.0f);
-        static LLCachedControl<F32> wm_high(gSavedSettings, "TextureWatermarkHigh", 0.90f);
-        static LLCachedControl<F32> wm_low(gSavedSettings, "TextureWatermarkLow", 0.70f);
+        static LLCachedControl<F32> wm_high(gSavedSettings, "TexturePressureHighWater", 0.90f);
+        static LLCachedControl<F32> wm_low(gSavedSettings, "TexturePressureLowWater", 0.70f);
         static LLCachedControl<F32> tighten_rate(gSavedSettings, "TexturePressureTightenRate", 0.30f);
         static LLCachedControl<F32> relax_rate(gSavedSettings, "TexturePressureRelaxRate", 0.10f);