DRTVWR-559 Add RenderAutomaticReflectionProbes control. Tweak automatic exposure.

3 files changed, 7 insertions, 9 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index d6af39f97e..5ffd610fba 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10367,7 +10367,7 @@
     <key>Type</key>
     <string>U32</string>
     <key>Value</key>
-    <real>1</real>
+    <real>2</real>
   </map>
   <key>RenderExposure</key>
   <map>
@@ -10403,18 +10403,17 @@
     <key>Value</key>
     <real>0</real>
   </map>
-  <key>RenderReflectionProbeTextureHackID</key>
+  <key>RenderAutomaticReflectionProbes</key>
   <map>
     <key>Comment</key>
-    <string>HACK -- Any object with a diffuse texture with this ID will be treated as a user override reflection probe. (default is "Violet Info Hub" photo from Library)</string>
+    <string>Automatic reflection probes control.  0 - disable, 1 - Terrain/water only, 2- Terrain/water + objects.  Requires restart.</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
-    <string>String</string>
+    <string>S32</string>
     <key>Value</key>
-    <string>6b186931-05da-eafa-a3ed-a012a33bbfb6</string>
+    <integer>2</integer>
   </map>
-  
   <key>RenderReflectionRes</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/app_settings/shaders/class1/deferred/exposureF.glsl b/indra/newview/app_settings/shaders/class1/deferred/exposureF.glsl
index ff37f9e4b3..b325f55576 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/exposureF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/exposureF.glsl
@@ -46,7 +46,7 @@ float lum(vec3 col)
 
 void main() 
 {
-    float step = 1.0/32.0;
+    float step = 1.0/16.0;
 
     float start = step;
     float end = 1.0-step;
@@ -82,7 +82,7 @@ void main()
 
     float L = lum(col);
 
-    float s = clamp(0.1/L, 0.5, 2.0);
+    float s = clamp(0.1/L, 0.5, 2.5);
 
     float prev = texture(exposureMap, vec2(0.5,0.5)).r;
     s = mix(prev, s, min(dt*2.0, 0.04));
diff --git a/indra/newview/app_settings/shaders/class1/deferred/postDeferredGammaCorrect.glsl b/indra/newview/app_settings/shaders/class1/deferred/postDeferredGammaCorrect.glsl
index 4ac1ff9368..221de0b095 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/postDeferredGammaCorrect.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/postDeferredGammaCorrect.glsl
@@ -125,7 +125,6 @@ vec3 toneMap(vec3 color)
     // this factor is based on the exposure correction of Krzysztof Narkowicz in his
     // implemetation of ACES tone mapping
     color *= 1.0/0.6;
-    //color /= 0.6;
     color = toneMapACES_Hill(color);
 #endif