summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/app_settings/shaders/class1/environment/terrainWaterF.glsl8
1 files changed, 0 insertions, 8 deletions
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;
}