Fix global fog texture with PushBuffer

Author: VReaperV

src/engine/renderer/gl_shader.cpp

@@ -2747,7 +2747,7 @@ GLShader_fogQuake3Material::GLShader_fogQuake3Material() :
 GLShader_fogGlobal::GLShader_fogGlobal() :
 	GLShader( "fogGlobal", ATTR_POSITION,
 		false, "screenSpace", "fogGlobal" ),
-	u_ColorMap( this ),
+	u_FogMap( this ),
 	u_DepthMap( this ),
 	u_UnprojectMatrix( this ),
 	u_Color_Float( this ),
@@ -2758,7 +2758,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/gl_shader.h

@@ -3517,7 +3517,7 @@ class GLShader_fogQuake3Material :
 
 class GLShader_fogGlobal :
 	public GLShader,
-	public u_ColorMap,
+	public u_FogMap,
 	public u_DepthMap,
 	public u_UnprojectMatrix,
 	public u_Color_Float,

src/engine/renderer/glsl_source/fogGlobal_fp.glsl

@@ -25,9 +25,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #insert common
 
 #define DEPTHMAP_GLSL
+#define FOGMAP_GLSL
 
-uniform sampler2D	u_ColorMap; // fog texture
-uniform sampler2D	u_DepthMap;
+uniform sampler2D u_FogMap;
+uniform sampler2D u_DepthMap;
 
 uniform colorPack u_Color;
 
@@ -57,7 +58,7 @@ void	main()
 	// st.s = vertexDistanceToCamera;
 	st.t = 1.0;
 
-	vec4 color = texture2D(u_ColorMap, st);
+	vec4 color = texture2D( u_FogMap, st );
 
 	outputColor = UnpackColor( u_Color ) * color;
 }

src/engine/renderer/glsl_source/fogQuake3_fp.glsl

@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 /* fogQuake3_fp.glsl */
 
-#define FOGQUAKE3_GLSL
+#define FOGMAP_GLSL
 
 uniform sampler2D u_FogMap;
 

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 );

src/engine/renderer/tr_backend.cpp

@@ -1396,9 +1396,9 @@ void RB_RenderGlobalFog()
 
 	gl_fogGlobalShader->SetUniform_UnprojectMatrix( backEnd.viewParms.unprojectionMatrix );
 
-	// bind u_ColorMap
-	gl_fogGlobalShader->SetUniform_ColorMapBindless(
-		GL_BindToTMU( 0, tr.fogImage ) 
+	// bind u_FogMap
+	gl_fogGlobalShader->SetUniform_FogMapBindless(
+		GL_BindToTMU( 0, tr.fogImage )
 	);
 
 	// bind u_DepthMap