SL-17763: Cleanup legacy to use ambiance utility

1 files changed, 2 insertions, 20 deletions

diff --git a/indra/newview/app_settings/shaders/class3/deferred/spotLightF.glsl b/indra/newview/app_settings/shaders/class3/deferred/spotLightF.glsl
index 308d045a9b..062062f976 100644
--- a/indra/newview/app_settings/shaders/class3/deferred/spotLightF.glsl
+++ b/indra/newview/app_settings/shaders/class3/deferred/spotLightF.glsl
@@ -92,18 +92,6 @@ void initMaterial( vec3 diffuse, vec3 packedORM, out float alphaRough, out vec3
 vec3 srgb_to_linear(vec3 c);
 vec4 texture2DLodSpecular(vec2 tc, float lod);
 
-vec4 texture2DLodAmbient(sampler2D projectionMap, vec2 tc, float lod)
-{
-    vec4 ret = texture2DLod(projectionMap, tc, lod);
-    ret.rgb = srgb_to_linear(ret.rgb);
-
-    vec2 dist = tc-vec2(0.5);
-    float d = dot(dist,dist);
-    ret *= min(clamp((0.25-d)/0.25, 0.0, 1.0), 1.0);
-
-    return ret;
-}
-
 vec4 getPosition(vec2 pos_screen);
 
 void main()
@@ -240,14 +228,8 @@ void main()
                 amb_da += (nl*0.5+0.5) /* * (1.0-shadow) */ * proj_ambiance;
             }
 
-            //float diff = clamp((proj_range-proj_focus)/proj_range, 0.0, 1.0);
-            vec4 amb_plcol = texture2DLodAmbient(projectionMap, proj_tc.xy, proj_lod);
-
-            amb_da += (nl*nl*0.5+0.5) /* * (1.0-shadow) */ * proj_ambiance;
-            amb_da *= dist_atten * noise;
-            amb_da = min(amb_da, 1.0-lit);
-
-            final_color += amb_da*color.rgb*diffuse.rgb*amb_plcol.rgb*amb_plcol.a;
+            vec3 amb_rgb = getProjectedLightAmbiance( amb_da, dist_atten, lit, nl, noise, proj_tc.xy );
+            final_color += diffuse.rgb*amb_rgb;
         }
 
         if (spec.a > 0.0)