renderer: add non-bitwise alternative for u_Color and u_ColorModulateColorGen

Add non-bitwise alternative for u_Color and u_ColorModulateColorGen,
it is used on non-material system for compatibility with GLSL 1.20.

Author: illwieckz

src/engine/renderer/gl_shader.cpp

@@ -2265,8 +2265,8 @@ GLShader_generic::GLShader_generic( GLShaderManager *manager ) :
 	u_AlphaThreshold( this ),
 	u_ModelMatrix( this ),
 	u_ModelViewProjectionMatrix( this ),
-	u_ColorModulateColorGen( this ),
-	u_Color( this ),
+	u_ColorModulateColorGen_Float( this ),
+	u_Color_Float( this ),
 	u_Bones( this ),
 	u_VertexInterpolation( this ),
 	u_DepthScale( this ),
@@ -2297,8 +2297,8 @@ GLShader_genericMaterial::GLShader_genericMaterial( GLShaderManager* manager ) :
 	u_AlphaThreshold( this ),
 	u_ModelMatrix( this ),
 	u_ModelViewProjectionMatrix( this ),
-	u_ColorModulateColorGen( this ),
-	u_Color( this ),
+	u_ColorModulateColorGen_Uint( this ),
+	u_Color_Uint( this ),
 	u_DepthScale( this ),
 	u_ShowTris( this ),
 	u_MaterialColour( this ),
@@ -2332,8 +2332,8 @@ GLShader_lightMapping::GLShader_lightMapping( GLShaderManager *manager ) :
 	u_LightTiles( this ),
 	u_TextureMatrix( this ),
 	u_SpecularExponent( this ),
-	u_ColorModulateColorGen( this ),
-	u_Color( this ),
+	u_ColorModulateColorGen_Float( this ),
+	u_Color_Float( this ),
 	u_AlphaThreshold( this ),
 	u_ViewOrigin( this ),
 	u_ModelMatrix( this ),
@@ -2400,8 +2400,8 @@ GLShader_lightMappingMaterial::GLShader_lightMappingMaterial( GLShaderManager* m
 	u_LightTiles( this ),
 	u_TextureMatrix( this ),
 	u_SpecularExponent( this ),
-	u_ColorModulateColorGen( this ),
-	u_Color( this ),
+	u_ColorModulateColorGen_Uint( this ),
+	u_Color_Uint( this ),
 	u_AlphaThreshold( this ),
 	u_ViewOrigin( this ),
 	u_ModelMatrix( this ),
@@ -2459,8 +2459,8 @@ GLShader_forwardLighting_omniXYZ::GLShader_forwardLighting_omniXYZ( GLShaderMana
 	u_TextureMatrix( this ),
 	u_SpecularExponent( this ),
 	u_AlphaThreshold( this ),
-	u_ColorModulateColorGen( this ),
-	u_Color( this ),
+	u_ColorModulateColorGen_Float( this ),
+	u_Color_Float( this ),
 	u_ViewOrigin( this ),
 	u_LightOrigin( this ),
 	u_LightColor( this ),
@@ -2512,8 +2512,8 @@ GLShader_forwardLighting_projXYZ::GLShader_forwardLighting_projXYZ( GLShaderMana
 	u_TextureMatrix( this ),
 	u_SpecularExponent( this ),
 	u_AlphaThreshold( this ),
-	u_ColorModulateColorGen( this ),
-	u_Color( this ),
+	u_ColorModulateColorGen_Float( this ),
+	u_Color_Float( this ),
 	u_ViewOrigin( this ),
 	u_LightOrigin( this ),
 	u_LightColor( this ),
@@ -2576,8 +2576,8 @@ GLShader_forwardLighting_directionalSun::GLShader_forwardLighting_directionalSun
 	u_TextureMatrix( this ),
 	u_SpecularExponent( this ),
 	u_AlphaThreshold( this ),
-	u_ColorModulateColorGen( this ),
-	u_Color( this ),
+	u_ColorModulateColorGen_Float( this ),
+	u_Color_Float( this ),
 	u_ViewOrigin( this ),
 	u_LightDir( this ),
 	u_LightColor( this ),
@@ -2639,7 +2639,7 @@ GLShader_shadowFill::GLShader_shadowFill( GLShaderManager *manager ) :
 	u_LightRadius( this ),
 	u_ModelMatrix( this ),
 	u_ModelViewProjectionMatrix( this ),
-	u_Color( this ),
+	u_Color_Float( this ),
 	u_Bones( this ),
 	u_VertexInterpolation( this ),
 	GLDeformStage( this ),
@@ -2747,7 +2747,7 @@ GLShader_fogQuake3::GLShader_fogQuake3( GLShaderManager *manager ) :
 	u_FogMap( this ),
 	u_ModelMatrix( this ),
 	u_ModelViewProjectionMatrix( this ),
-	u_ColorGlobal( this ),
+	u_ColorGlobal_Float( 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_ColorGlobal_Float( this ),
 	u_FogDistanceVector( this ),
 	u_FogDepthVector( this ),
 	u_FogEyeT( this ),
@@ -2786,7 +2786,7 @@ GLShader_fogGlobal::GLShader_fogGlobal( GLShaderManager *manager ) :
 	u_DepthMap( this ),
 	u_ModelViewProjectionMatrix( this ),
 	u_UnprojectMatrix( this ),
-	u_Color( this ),
+	u_Color_Float( this ),
 	u_FogDistanceVector( this )
 {
 }