diff options
author | Graham Linden <graham@lindenlab.com> | 2019-03-29 15:56:59 -0700 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2019-03-29 15:56:59 -0700 |
commit | cb7d07e0ca9041d76de2c99ae9bbee7f10e89856 (patch) | |
tree | bfaa44615e4ec882fe78f4d46ca242437ea5c63e /indra/newview | |
parent | 12495d46a43b7d8a47ca8f304b15cf055eb86433 (diff) |
SL-10844, SL-10584
Add Geenz doings to the contribs list.
Fix per-frag atmospherics to use sRGB conversion.
Update ref to new KDU package.
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/app_settings/shaders/class2/windlight/atmosphericsF.glsl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class2/windlight/atmosphericsF.glsl b/indra/newview/app_settings/shaders/class2/windlight/atmosphericsF.glsl index 14af657e67..7bfdb9f753 100644 --- a/indra/newview/app_settings/shaders/class2/windlight/atmosphericsF.glsl +++ b/indra/newview/app_settings/shaders/class2/windlight/atmosphericsF.glsl @@ -46,6 +46,7 @@ uniform mat3 ssao_effect_mat; uniform int no_atmo; uniform float sun_moon_glow_factor; +vec3 srgb_to_linear(vec3 c); vec3 scaleSoftClipFrag(vec3 light); vec3 atmosFragLighting(vec3 light, vec3 additive, vec3 atten) @@ -151,7 +152,7 @@ void calcFragAtmospherics(vec3 inPositionEye, float ambFactor, out vec3 sunlit, + tmpAmbient)); //brightness of surface both sunlight and ambient - sunlit = vec3(sunlight * .5); + sunlit = srgb_to_linear(sunlight.rgb); amblit = vec3(tmpAmbient * .25); additive = normalize(additive); additive *= vec3(1.0 - exp(-temp2.z * distance_multiplier)) * 0.5; |