summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2019-06-28 11:07:44 -0700
committerGraham Linden <graham@lindenlab.com>2019-06-28 11:07:44 -0700
commit4e796ce8982e4e64e91a221c4acd78099c5bf58d (patch)
treea077fd52ab8d9362ed4bcabb8dda14065b2de3b0 /indra
parentc1697079937eade10765353039b4801d029c72fa (diff)
SL-9928
Take out angular atten on additive too.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl4
-rw-r--r--indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl4
2 files changed, 2 insertions, 6 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
index f9fe091124..0d180e5798 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
@@ -176,9 +176,7 @@ vec3 post_env = color.rgb;
if (norm.w < 1)
{
#if !defined(SUNLIGHT_KILL)
- //additive *= spec.a;
- float additive_angular_atten = max(0.0, dot(light_dir, normalize(pos.xyz)));
- color = atmosFragLighting(color, additive * additive_angular_atten, atten);
+ color = atmosFragLighting(color, additive, atten);
color = scaleSoftClipFrag(color);
#endif
}
diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
index d1b49d8820..eeab6ed03d 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
@@ -185,9 +185,7 @@ vec3 post_env = color.rgb;
{
#if !defined(SUNLIGHT_KILL)
vec3 p = normalize(pos.xyz);
- //additive *= spec.a;
- float additive_angular_atten = max(0.0, dot(light_dir.xyz, p.xyz));
- color = atmosFragLighting(color, additive * additive_angular_atten, atten);
+ color = atmosFragLighting(color, additive, atten);
color = scaleSoftClipFrag(color);
#endif
}