SL-10664, SL-10666

Fix up culling issues from perf work and fix Depth of Field rendering to get depth values properly.

Baseline for performance work.

1 files changed, 7 insertions, 1 deletions

diff --git a/indra/newview/app_settings/shaders/class2/windlight/gammaF.glsl b/indra/newview/app_settings/shaders/class2/windlight/gammaF.glsl
index e985c50c67..c0439006f7 100644
--- a/indra/newview/app_settings/shaders/class2/windlight/gammaF.glsl
+++ b/indra/newview/app_settings/shaders/class2/windlight/gammaF.glsl
@@ -26,12 +26,17 @@
 
 
 uniform vec4 gamma;
+uniform int no_atmo;
 
 vec3 getAtmosAttenuation();
 vec3 getAdditiveColor();
 
 vec3 scaleSoftClipFrag(vec3 light)
 {
+    if (no_atmo == 1)
+    {
+        return light;
+    }
     //soft clip effect:
     light = 1. - clamp(light, vec3(0.), vec3(1.));
     light = 1. - pow(light, gamma.xxx);
@@ -45,7 +50,8 @@ vec3 scaleSoftClip(vec3 light)
 
 vec3 fullbrightScaleSoftClipFrag(vec3 light, vec3 add, vec3 atten)
 {
-    return mix(scaleSoftClipFrag(light.rgb), add, atten);
+    //return mix(scaleSoftClipFrag(light.rgb), add, atten);
+    return scaleSoftClipFrag(light.rgb);
 }
 
 vec3 fullbrightScaleSoftClip(vec3 light)