From 63ecb7325e77bf3ca568788a4557045054a4520b Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Thu, 23 May 2019 15:47:02 -0700 Subject: SL-11260 part deux Tamp down more view-dependent refraction map fail. --- .../app_settings/shaders/class1/environment/terrainWaterF.glsl | 8 -------- 1 file changed, 8 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/app_settings/shaders/class1/environment/terrainWaterF.glsl b/indra/newview/app_settings/shaders/class1/environment/terrainWaterF.glsl index ddbe3ebe10..937f38842f 100644 --- a/indra/newview/app_settings/shaders/class1/environment/terrainWaterF.glsl +++ b/indra/newview/app_settings/shaders/class1/environment/terrainWaterF.glsl @@ -39,8 +39,6 @@ uniform sampler2D detail_2; uniform sampler2D detail_3; uniform sampler2D alpha_ramp; -vec3 atmosLighting(vec3 light); - vec4 applyWaterFog(vec4 color); void main() @@ -58,12 +56,6 @@ void main() float alphaFinal = texture2D(alpha_ramp, vary_texcoord1.zw).a; vec4 outColor = mix( mix(color3, color2, alpha2), mix(color1, color0, alpha1), alphaFinal ); - /// Add WL Components - outColor.rgb *= vertex_color.rgb; - - // SL-11260... - //outColor.rgb = atmosLighting(outColor.rgb); - outColor = applyWaterFog(outColor); frag_color = outColor; } -- cgit v1.2.3