fixup: fixes

Author: illwieckz

src/engine/renderer/gl_shader.h

@@ -3707,7 +3707,7 @@ struct colorModulation_t {
 	float colorGen = 0.0f;
 	float alphaGen = 0.0f;
 	float lightFactor = 1.0f;
-	bool isLightStyle = false;
+	bool useVertexLightFactor = false;
 	bool alphaAddOne = true;
 };
 
@@ -3722,13 +3722,13 @@ static colorModulation_t ColorModulateColorGen(
 	switch ( colorGen )
 	{
 		case colorGen_t::CGEN_VERTEX:
-			colorModulation.alphaAddOne = false;;
+			colorModulation.alphaAddOne = false;
 
 			if ( vertexOverbright )
 			{
 				// vertexOverbright is only needed for non-lightmapped cases. When there is a
 				// lightmap, this is done by multiplying with the overbright-scaled white image
-				colorModulation.isLightStyle = true;
+				colorModulation.useVertexLightFactor = true;
 				colorModulation.lightFactor = tr.mapLightFactor;
 			}
 			else
@@ -3738,7 +3738,7 @@ static colorModulation_t ColorModulateColorGen(
 			break;
 
 		case colorGen_t::CGEN_ONE_MINUS_VERTEX:
-			colorModulation.alphaAddOne = false;;
+			colorModulation.alphaAddOne = false;
 			colorModulation.colorGen = -1.0f;
 			break;
 
@@ -3800,7 +3800,7 @@ class u_ColorModulateColorGen_Float :
 		vec4_t colorModulate_Float;
 		colorModulate_Float[ 0 ] = colorModulation.colorGen;
 		colorModulate_Float[ 1 ] = colorModulation.lightFactor;
-		colorModulate_Float[ 1 ] *= colorModulation.isLightStyle ? -1.0f : 1.0f;
+		colorModulate_Float[ 1 ] *= colorModulation.useVertexLightFactor ? -1.0f : 1.0f;
 		colorModulate_Float[ 2 ] = colorModulation.alphaAddOne;
 		colorModulate_Float[ 3 ] = colorModulation.alphaGen;
 
@@ -3859,7 +3859,7 @@ class u_ColorModulateColorGen_Uint :
 			<< Util::ordinal( ColorModulate_Bit::ALPHA_MINUS_ONE );
 		colorModulate_Uint |= colorModulation.alphaAddOne
 			<< Util::ordinal( ColorModulate_Bit::ALPHA_ADD_ONE );
-		colorModulate_Uint |= colorModulation.isLightStyle
+		colorModulate_Uint |= colorModulation.useVertexLightFactor
 			<< Util::ordinal( ColorModulate_Bit::IS_LIGHT_STYLE );
 		colorModulate_Uint |= uint32_t( colorModulation.lightFactor )
 			<< Util::ordinal( ColorModulate_Bit::LIGHTFACTOR_BIT0 );

src/engine/renderer/glsl_source/common.glsl

@@ -99,21 +99,22 @@ vec4 ColorModulateToColor( const in colorModulatePack colorMod )
 	return vec4( rgb, rgb, rgb, alpha );
 }
 
-struct modBits_t {
+struct ModBits_t
+{
 	bool alphaAddOne;
-	bool isLightStyle;
+	bool useVertexLightFactor;
 };
 
-modBits_t ColorModulateToBits( const in colorModulatePack colorMod )
+ModBits_t ColorModulateToBits( const in colorModulatePack colorMod )
 {
-	modBits_t modBits;
+	ModBits_t modBits;
 
 #if defined(HAVE_EXT_gpu_shader4)
 	modBits.alphaAddOne = bool( ( colorMod >> 4u ) & 1u );
-	modBits.isLightStyle = bool( ( colorMod >> 27u ) & 1u );
+	modBits.useVertexLightFactor = bool( ( colorMod >> 27u ) & 1u );
 #else
 	modBits.alphaAddOne = colorMod.b != 0;
-	modBits.isLightStyle = colorMod.g < 0;
+	modBits.useVertexLightFactor = colorMod.g < 0;
 #endif
 
 	return modBits;
@@ -155,13 +156,13 @@ void ColorModulateColor_lightFactor(
 	inout vec4 color )
 {
 	vec4 colorModulation = ColorModulateToColor( colorMod );
-	modBits_t modBits = ColorModulateToBits( colorMod );
+	ModBits_t modBits = ColorModulateToBits( colorMod );
 	float lightFactor = ColorModulateToLightFactor( colorMod );
 
 	// This is used to skip vertex colours if the colorMod doesn't need them.
 	color.a = modBits.alphaAddOne ? 1.0 : color.a;
 
-	colorModulation.rgb += vec3( modBits.isLightStyle ? lightFactor : 0 );
+	colorModulation.rgb += vec3( modBits.useVertexLightFactor ? lightFactor : 0 );
 
 	vec4 unpackedColor = UnpackColor( packedColor );