From 98176481c1d0b6f8960574af1c2568085e37e433 Mon Sep 17 00:00:00 2001
From: Lars Hofhansl <larsh@apache.org>
Date: Mon, 24 Oct 2016 08:23:13 -0700
Subject: Shaders: Apply tone mapping before fog calculation.

---
 client/shaders/water_surface_shader/opengl_fragment.glsl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'client/shaders/water_surface_shader/opengl_fragment.glsl')

diff --git a/client/shaders/water_surface_shader/opengl_fragment.glsl b/client/shaders/water_surface_shader/opengl_fragment.glsl
index 8321ddf93..d910220e9 100644
--- a/client/shaders/water_surface_shader/opengl_fragment.glsl
+++ b/client/shaders/water_surface_shader/opengl_fragment.glsl
@@ -150,6 +150,10 @@ vec4 base = texture2D(baseTexture, uv).rgba;
 
 	vec4 col = vec4(color.rgb * gl_Color.rgb, 1.0); 
 
+#ifdef ENABLE_TONE_MAPPING
+	col = applyToneMapping(col);
+#endif
+
 #if MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT || MATERIAL_TYPE == TILE_MATERIAL_LIQUID_OPAQUE
 	float alpha = gl_Color.a;
 	if (fogDistance != 0.0) {
@@ -165,9 +169,5 @@ vec4 base = texture2D(baseTexture, uv).rgba;
 	col = vec4(col.rgb, base.a);
 #endif
 
-#ifdef ENABLE_TONE_MAPPING
-	gl_FragColor = applyToneMapping(col);
-#else
 	gl_FragColor = col;
-#endif
 }
-- 
cgit v1.2.3