diff options
author | Graham Linden <graham@lindenlab.com> | 2019-01-03 16:21:07 -0800 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2019-01-03 16:21:07 -0800 |
commit | 01da53764bebc99fd692b3eb68f8520c6cfa2a97 (patch) | |
tree | 396221299d0b702c39985c51df4e8c7f9db8b753 /indra/newview/app_settings/shaders/class2/deferred | |
parent | 30fc38603a6031f1f9ed1b4f33beca9e469b5ed3 (diff) |
Fix per-frag fullbright soft clip convenience funcs to include additive and atten args.
Diffstat (limited to 'indra/newview/app_settings/shaders/class2/deferred')
-rw-r--r-- | indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl | 4 |
1 files changed, 2 insertions, 2 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 |