Fix global fog texture with PushBuffer

Author: VReaperV

src/engine/renderer/gl_shader.cpp

@@ -2730,7 +2730,7 @@ GLShader_fogGlobal::GLShader_fogGlobal() :
 
 void GLShader_fogGlobal::SetShaderProgramUniforms( ShaderProgramDescriptor *shaderProgram )
 {
-	glUniform1i( glGetUniformLocation( shaderProgram->id, "u_ColorMap" ), 0 );
+	glUniform1i( glGetUniformLocation( shaderProgram->id, "u_FogMap" ), 0 );
 	glUniform1i( glGetUniformLocation( shaderProgram->id, "u_DepthMap" ), 1 );
 }
 

src/engine/renderer/glsl_source/fogGlobal_fp.glsl

@@ -25,7 +25,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #insert common
 #insert fogEquation_fp
 
-uniform sampler2D	u_DepthMap;
+#define DEPTHMAP_GLSL
+
+uniform sampler2D u_DepthMap;
 
 uniform colorPack u_Color;
 

src/engine/renderer/glsl_source/fogQuake3_fp.glsl

@@ -24,8 +24,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #insert fogEquation_fp
 
-#define FOGQUAKE3_GLSL
-
 uniform float u_FogEyeT;
 
 IN(smooth) float var_FogPlaneDistance;

src/engine/renderer/glsl_source/material_fp.glsl

@@ -52,9 +52,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		sampler3D u_ColorMap3D = sampler3D( u_ColorMap3D_initial );
 	#endif // !CAMERAEFFECTS_GLSL
 
-	#if defined(FOGQUAKE3_GLSL)
+	#if defined(FOGMAP_GLSL)
 		sampler2D u_FogMap = sampler2D( u_FogMap_initial );
-	#endif // !FOGQUAKE3_GLSL
+	#endif // !FOGMAP_GLSL
 
 	#if defined(LIQUID_GLSL)
 		sampler2D u_PortalMap = sampler2D( u_PortalMap_initial );