From c621589157e8b722b77803da24d3ba3f54395693 Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Fri, 29 Aug 2014 02:39:37 -0500 Subject: [PATCH] Fix 6155: OpenGL2: some shader stages remains visible through fog volumes Fix CalcFog in generic_vp.glsl to fog fogged surfaces. Now it's the same as CalcFog in fogpass_vp.glsl. Fixes shaders that use adjustColorsForFog. Impact wallmarks, blood sprites, flame textures and so on. --- code/renderergl2/glsl/generic_vp.glsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/renderergl2/glsl/generic_vp.glsl b/code/renderergl2/glsl/generic_vp.glsl index 0e5b38b4..8543ffd7 100644 --- a/code/renderergl2/glsl/generic_vp.glsl +++ b/code/renderergl2/glsl/generic_vp.glsl @@ -193,7 +193,7 @@ float CalcFog(vec3 position) float t = dot(vec4(position, 1.0), u_FogDepth); float eyeOutside = float(u_FogEyeT < 0.0); - float fogged = float(t < eyeOutside); + float fogged = float(t >= eyeOutside); t += 1e-6; t *= fogged / (t - u_FogEyeT * eyeOutside);