Fix per-frag fullbright soft clip convenience funcs to include additive and atten args.

4 files changed, 4 insertions, 5 deletions

diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
index 1b0a1b5d84..c5d317ad37 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
@@ -78,7 +78,7 @@ vec3 decode_normal (vec2 enc);
 
 void calcFragAtmospherics(vec3 inPositionEye, float ambFactor, out vec3 sunlit, out vec3 amblit, out vec3 additive, out vec3 atten);
 vec3 atmosFragLighting(vec3 l, vec3 additive, vec3 atten);
-vec3 fullbrightScaleSoftClipFrag(vec3 l);
+vec3 fullbrightScaleSoftClipFrag(vec3 l, vec3 add, vec3 atten);
 vec3 scaleSoftClipFrag(vec3 l);
 
 vec3 atmosTransportFrag(vec3 light, vec3 additive, vec3 atten);
@@ -166,7 +166,7 @@ void main()
         if (norm.w < 0.5)
         {
             col = mix(atmosFragLighting(col, additive, atten), fullbrightAtmosTransportFrag(col, additive, atten), diffuse.a);
-            col = mix(scaleSoftClipFrag(col), fullbrightScaleSoftClipFrag(col), diffuse.a);
+            col = mix(scaleSoftClipFrag(col), fullbrightScaleSoftClipFrag(col, additive, atten), diffuse.a);
         }
 
         #ifdef WATER_FOG
diff --git a/indra/newview/app_settings/shaders/class2/windlight/gammaF.glsl b/indra/newview/app_settings/shaders/class2/windlight/gammaF.glsl
index ac7c57747e..143bafc9c9 100644
--- a/indra/newview/app_settings/shaders/class2/windlight/gammaF.glsl
+++ b/indra/newview/app_settings/shaders/class2/windlight/gammaF.glsl
@@ -47,7 +47,7 @@ vec3 scaleSoftClip(vec3 light)
     return scaleSoftClipFrag(light);
 }
 
-vec3 fullbrightScaleSoftClipFrag(vec3 light) {
+vec3 fullbrightScaleSoftClipFrag(vec3 light, vec3 add, vec3 atten) {
     return scaleSoftClipFrag(light.rgb); 
 }
 
diff --git a/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
index b84d3efbaa..ed06e5a6ac 100644
--- a/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
@@ -77,7 +77,6 @@ vec3 GetSkyLuminance(vec3 camPos, vec3 view_dir, float shadow_length, vec3 dir,
 vec3 GetSkyLuminanceToPoint(vec3 camPos, vec3 pos, float shadow_length, vec3 dir, out vec3 transmittance);
 
 vec3 scaleSoftClipFrag(vec3 c);
-vec3 fullbrightScaleSoftClipFrag(vec3 c);
 vec3 srgb_to_linear(vec3 cs);
 vec3 linear_to_srgb(vec3 cl);
 vec3 decode_normal (vec2 enc);
diff --git a/indra/newview/app_settings/shaders/class3/windlight/gammaF.glsl b/indra/newview/app_settings/shaders/class3/windlight/gammaF.glsl
index 709d9cbc0a..a7d76052bb 100644
--- a/indra/newview/app_settings/shaders/class3/windlight/gammaF.glsl
+++ b/indra/newview/app_settings/shaders/class3/windlight/gammaF.glsl
@@ -43,7 +43,7 @@ vec3 scaleSoftClip(vec3 light) {
 	return scaleSoftClipFrag(light);
 }
 
-vec3 fullbrightScaleSoftClipFrag(vec3 light)
+vec3 fullbrightScaleSoftClipFrag(vec3 light, vec3 add, vec3 atten)
 {
 	return scaleSoftClipFrag(light.rgb);
 }