diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-06-11 13:03:06 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-06-11 13:03:06 -0700 |
| commit | 653133b9c035e7c34563b199e991189ca3046092 (patch) | |
| tree | b5d7b99fc3cacb7f887263edf744463006d9eb1a /indra/newview/app_settings/shaders/class1/environment | |
| parent | c15baecbfbc9baffdeb6ec53b7e4090470514657 (diff) | |
SL-11370, SL-11372, SL-11337
Fix culling on Low+ water reflection pass.
Make Mid+ / High use class1 deferred sky again (no rainbows, but faster!).
Fix setting of cloud color for deferred sky/cloud shaders.
Put water reflections back in wrong colorspace for consistency with release.
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/environment')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/environment/waterF.glsl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/app_settings/shaders/class1/environment/waterF.glsl b/indra/newview/app_settings/shaders/class1/environment/waterF.glsl index f033c0e7c4..4e550b8284 100644 --- a/indra/newview/app_settings/shaders/class1/environment/waterF.glsl +++ b/indra/newview/app_settings/shaders/class1/environment/waterF.glsl @@ -150,11 +150,9 @@ void main() //mix with reflection // Note we actually want to use just df1, but multiplying by 0.999999 gets around and nvidia compiler bug - color.rgb = mix(fb.rgb, refcol.rgb, df1 * 0.4 + 0.6); + color.rgb = mix(fb.rgb, refcol.rgb, df1 * 0.9999999); color.rgb += spec * specular; - - //color.rgb = atmosTransport(color.rgb); - color.rgb = scaleSoftClip(color.rgb * 0.5); + color.a = spec * sunAngle2; #if defined(WATER_EDGE) |