summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2019-11-25 15:03:09 -0700
committerDave Houlton <euclid@lindenlab.com>2019-11-25 15:03:09 -0700
commit41330f4a39e996fbcd4afa931973127a4abbcf86 (patch)
tree5b88a90a473e3ab6f9e75a9f48c2caa811eae1a0 /indra/newview
parent24920de799c8e2dd26854923c7a10fc4a551dd5d (diff)
Roll back commit 41531
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/app_settings/shaders/class2/windlight/transportF.glsl9
1 files changed, 1 insertions, 8 deletions
diff --git a/indra/newview/app_settings/shaders/class2/windlight/transportF.glsl b/indra/newview/app_settings/shaders/class2/windlight/transportF.glsl
index a06f4f22ad..d2d839ed05 100644
--- a/indra/newview/app_settings/shaders/class2/windlight/transportF.glsl
+++ b/indra/newview/app_settings/shaders/class2/windlight/transportF.glsl
@@ -51,14 +51,7 @@ vec3 atmosTransport(vec3 light)
vec3 fullbrightAtmosTransport(vec3 light)
{
float brightness = dot(light.rgb * 0.5, vec3(0.3333)) + 0.1;
- vec3 attenColor = atmosTransportFrag(light * 0.5, getAdditiveColor() * brightness, getAtmosAttenuation());
-
- // attenColor is an accurate fog-attenuated result for any brightness
- // But, the pre-EEP shader included a brightness-indexed lerp to a non-attenuated version
- // of the color - effectively a fog 'burn-through' for very bright pixels. To more closely
- // match the pre-EEP behavior, we'll also lerp to the pre-EEP color, based on overall brightness
- float preEepBright = dot(light.rgb, vec3(0.3333));
- retun mix(attenColor, (light.rgb + getAdditiveColor().rgb) * (2.0 - preEepBright), preEepBright * preEepBright);
+ return atmosTransportFrag(light * 0.5, getAdditiveColor() * brightness, getAtmosAttenuation());
}
vec3 fullbrightShinyAtmosTransport(vec3 light)