diff options
author | Runitai Linden <davep@lindenlab.com> | 2020-03-13 12:58:47 -0500 |
---|---|---|
committer | Runitai Linden <davep@lindenlab.com> | 2020-03-13 12:58:47 -0500 |
commit | 0a0cfcf2ef92375f099ed91f009db1ebf2d410c0 (patch) | |
tree | 427af0404ca8721fc763d4eeb77a9dc6e36dd1b0 /indra/newview/app_settings/shaders/class3 | |
parent | 56dcbc3cf1d76a4f3f8a6b3c18aa20e29a5e72d7 (diff) |
SL-12233 Fix for disagreement between fullbright implementations with ALM on and off.
Diffstat (limited to 'indra/newview/app_settings/shaders/class3')
-rw-r--r-- | indra/newview/app_settings/shaders/class3/windlight/transportF.glsl | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class3/windlight/transportF.glsl b/indra/newview/app_settings/shaders/class3/windlight/transportF.glsl index 18705f785f..aa7dbc39ce 100644 --- a/indra/newview/app_settings/shaders/class3/windlight/transportF.glsl +++ b/indra/newview/app_settings/shaders/class3/windlight/transportF.glsl @@ -49,10 +49,15 @@ vec3 atmosTransport(vec3 light) return atmosTransportFrag(light, getAdditiveColor(), getAtmosAttenuation()); } -vec3 fullbrightAtmosTransport(vec3 light) +vec3 fullbrightAtmosTransportFrag(vec3 light, vec3 additive, vec3 atten) { float brightness = dot(light.rgb, vec3(0.33333)); - return atmosTransportFrag(light * 0.5, getAdditiveColor() * (brightness * 0.5 + 0.5), getAtmosAttenuation()); + return atmosTransportFrag(light * 0.5, additive * (brightness * 0.5 + 0.5), atten); +} + +vec3 fullbrightAtmosTransport(vec3 light) +{ + return atmosTransportFrag(light, getAdditiveColor(), getAtmosAttenuation()); } vec3 fullbrightShinyAtmosTransport(vec3 light) |