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.

2 files changed, 9 insertions, 4 deletions

diff --git a/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl
index 0f6bf38388..275bc829a7 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl
@@ -211,8 +211,10 @@ void main()
 			dlit = color.rgb * plcol.rgb * plcol.a;
 			
 			col = dlit*lit*diff_tex*shadow;
-			amb_da += (da*0.5)*(1.0-shadow)*proj_ambiance;
-			amb_da = min(amb_da,shadow);
+            amb_da += (da*0.5) * proj_ambiance;
+            amb_da += (da*da*0.5 + 0.5) * proj_ambiance;
+			//amb_da += (da*0.5)*(1.0-shadow)*proj_ambiance;
+			//amb_da = min(amb_da,shadow);
 		}
 		
 		//float diff = clamp((proj_range-proj_focus)/proj_range, 0.0, 1.0);
diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
index 415c894a43..d220bda332 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
@@ -120,7 +120,7 @@ void main()
     
         calcFragAtmospherics(pos.xyz, ambocc, sunlit, amblit, additive, atten);
 
-        float ambient = min(abs(da), 1.0);
+        float ambient = abs(da);
         ambient *= 0.5;
         ambient *= ambient;
         ambient = 1.0 - ambient * smoothstep(0.0, 0.3, scol);
@@ -155,6 +155,8 @@ void main()
             col = mix(col.rgb, refcol, envIntensity); 
         }
                 
+
+vec3 a = col.rgb;
         if (norm.w < 0.5)
         {
             col = mix(atmosFragLighting(col, additive, atten), fullbrightAtmosTransportFrag(col, additive, atten), diffuse.a);
@@ -166,8 +168,9 @@ void main()
             col = fogged.rgb;
             bloom = fogged.a;
         #endif
-    }
 
+//col.rgb = a;
+    }
     frag_color.rgb = col.rgb;
     frag_color.a = bloom;
 }