renderer: deduplicate u_Color and u_ColorGlobal

Author: illwieckz

src/engine/renderer/Material.cpp

@@ -1059,7 +1059,7 @@ void BindShaderFog( Material* material ) {
 	gl_fogQuake3ShaderMaterial->SetUniform_FogDepthVector( fogDepthVector );
 	gl_fogQuake3ShaderMaterial->SetUniform_FogEyeT( eyeT );
 
-	gl_fogQuake3ShaderMaterial->SetUniform_ColorGlobal( fog->color );
+	gl_fogQuake3ShaderMaterial->SetUniform_Color( fog->color );
 
 	gl_fogQuake3ShaderMaterial->SetUniform_ModelMatrix( backEnd.orientation.transformMatrix );
 	gl_fogQuake3ShaderMaterial->SetUniform_ModelViewProjectionMatrix( glState.modelViewProjectionMatrix[glState.stackIndex] );

src/engine/renderer/gl_shader.cpp

@@ -2747,7 +2747,7 @@ GLShader_fogQuake3::GLShader_fogQuake3( GLShaderManager *manager ) :
 	u_FogMap( this ),
 	u_ModelMatrix( this ),
 	u_ModelViewProjectionMatrix( this ),
-	u_ColorGlobal( this ),
+	u_Color( this ),
 	u_Bones( this ),
 	u_VertexInterpolation( this ),
 	u_FogDistanceVector( this ),
@@ -2769,7 +2769,7 @@ GLShader_fogQuake3Material::GLShader_fogQuake3Material( GLShaderManager* manager
 	u_FogMap( this ),
 	u_ModelMatrix( this ),
 	u_ModelViewProjectionMatrix( this ),
-	u_ColorGlobal( this ),
+	u_Color( this ),
 	u_FogDistanceVector( this ),
 	u_FogDepthVector( this ),
 	u_FogEyeT( this ),

src/engine/renderer/gl_shader.h

@@ -3057,18 +3057,6 @@ class u_Color :
 	}
 };
 
-class u_ColorGlobal :
-	GLUniform1ui {
-	public:
-	u_ColorGlobal( GLShader* shader ) :
-		GLUniform1ui( shader, "u_ColorGlobal", true ) {
-	}
-
-	void SetUniform_ColorGlobal( const Color::Color& color ) {
-		this->SetValue( packUnorm4x8( color.ToArray() ) );
-	}
-};
-
 class u_Frame :
 	GLUniform1ui {
 	public:
@@ -4329,7 +4317,7 @@ class GLShader_fogQuake3 :
 	public u_FogMap,
 	public u_ModelMatrix,
 	public u_ModelViewProjectionMatrix,
-	public u_ColorGlobal,
+	public u_Color,
 	public u_Bones,
 	public u_VertexInterpolation,
 	public u_FogDistanceVector,
@@ -4349,7 +4337,7 @@ class GLShader_fogQuake3Material :
 	public u_FogMap,
 	public u_ModelMatrix,
 	public u_ModelViewProjectionMatrix,
-	public u_ColorGlobal,
+	public u_Color,
 	public u_FogDistanceVector,
 	public u_FogDepthVector,
 	public u_FogEyeT,

src/engine/renderer/glsl_source/fogQuake3_vp.glsl

@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 uniform float		u_Time;
 
 uniform vec4 u_ColorModulate;
-uniform uint u_ColorGlobal;
+uniform uint u_Color;
 uniform mat4		u_ModelMatrix;
 uniform mat4		u_ModelViewProjectionMatrix;
 
@@ -58,7 +58,7 @@ void	main()
 
 	VertexFetch( position, LB, color, texCoord, lmCoord );
 
-	color = /* color * u_ColorModulate + */ unpackUnorm4x8( u_ColorGlobal );
+	color = /* color * u_ColorModulate + */ unpackUnorm4x8( u_Color );
 
 	DeformVertex( position,
 		      LB.normal,

src/engine/renderer/tr_shade.cpp

@@ -2272,7 +2272,7 @@ void Render_fog( shaderStage_t* pStage )
 	gl_fogQuake3Shader->SetUniform_FogEyeT( eyeT );
 
 	// u_Color
-	gl_fogQuake3Shader->SetUniform_ColorGlobal( fog->color );
+	gl_fogQuake3Shader->SetUniform_Color( fog->color );
 
 	gl_fogQuake3Shader->SetUniform_ModelMatrix( backEnd.orientation.transformMatrix );
 	gl_fogQuake3Shader->SetUniform_ModelViewProjectionMatrix( glState.modelViewProjectionMatrix[ glState.stackIndex ] );