From: kwolekr <kwolekr@minetest.net>
Date: Sun, 28 Apr 2013 03:04:52 +0000 (-0400)
Subject: Actually fix shader3 alpha this time
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=d7395cd2aba86f5b15cdce3be2ec141f88f95ab6;p=zefram%2Fminetest%2Fminetest_engine.git

Actually fix shader3 alpha this time
---

diff --git a/client/shaders/test_shader_3/opengl_fragment.glsl b/client/shaders/test_shader_3/opengl_fragment.glsl
index e42fef6e..535774c1 100644
--- a/client/shaders/test_shader_3/opengl_fragment.glsl
+++ b/client/shaders/test_shader_3/opengl_fragment.glsl
@@ -8,17 +8,18 @@ void main (void)
 {
 	vec4 col = texture2D(myTexture, vec2(gl_TexCoord[0]));
 	col *= gl_Color;
+	float a = col.a;
 	col = col * col; // SRGB -> Linear
-	col *= 1.8;
-	col.a = 1.0 - exp(1.0 - col.a) / exp(1.0);
+	col *= 1.8;
 	col.r = 1.0 - exp(1.0 - col.r) / exp(1.0);
 	col.g = 1.0 - exp(1.0 - col.g) / exp(1.0);
-	col.b = 1.0 - exp(1.0 - col.b) / exp(1.0);
-	col = sqrt(col); // Linear -> SRGB
-	float a = col.a;
+	col.b = 1.0 - exp(1.0 - col.b) / exp(1.0);
+	col = sqrt(col); // Linear -> SRGB
+
 	if(fogDistance != 0.0){
 		float d = max(0.0, min(vPosition.z / fogDistance * 1.5 - 0.6, 1.0));
 		a = mix(a, 0.0, d);
-	}
+	}
+
 	gl_FragColor = vec4(col.r, col.g, col.b, a);
 }