2 files changed, 27 insertions, 8 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 5217e88a59..81fed560bb 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10402,9 +10402,31 @@
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
-    <integer>8</integer>
+    <real>8</real>
   </map>
-
+  <key>RenderTonemapper</key>
+  <map>
+    <key>Comment</key>
+    <string>Which tone mapping function to use (0 - Linear, 1 - ACES Narkowicz, 2 - ACES Hill)</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>U32</string>
+    <key>Value</key>
+    <real>1</real>
+  </map>
+  <key>RenderExposure</key>
+  <map>
+    <key>Comment</key>
+    <string>Exposure value to send to tonemapper.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>1</real>
+  </map>
+  
   <key>RenderReflectionProbeDrawDistance</key>
   <map>
     <key>Comment</key>
@@ -10414,7 +10436,7 @@
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
-    <real>64</real>
+    <integer>64</integer>
   </map>
   <key>RenderReflectionProbeAmbiance</key>
   <map>
diff --git a/indra/newview/app_settings/shaders/class1/deferred/postDeferredGammaCorrect.glsl b/indra/newview/app_settings/shaders/class1/deferred/postDeferredGammaCorrect.glsl
index e0e975faf0..f0e940eb5f 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/postDeferredGammaCorrect.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/postDeferredGammaCorrect.glsl
@@ -127,14 +127,11 @@ vec3 toneMapACES_Hill(vec3 color)
     return color;
 }
 
-
-#define TONEMAP_ACES_NARKOWICZ
-//#define TONEMAP_ACES_HILL_EXPOSURE_BOOST
-float u_Exposure = 1;
+uniform float exposure;
 
 vec3 toneMap(vec3 color)
 {
-    color *= u_Exposure;
+    color *= exposure;
 
 #ifdef TONEMAP_ACES_NARKOWICZ
     color = toneMapACES_Narkowicz(color);