Set vertex colour attr correctly with material system

Author: VReaperV

src/engine/renderer/Material.cpp

@@ -1272,6 +1272,12 @@ void ProcessMaterialGeneric3D( Material* material, shaderStage_t* pStage, drawSu
 	material->tcGen_Lightmap = pStage->tcGen_Lightmap;
 	material->deformIndex = pStage->deformIndex;
 
+	colorGen_t rgbGen = SetRgbGen( pStage );
+	alphaGen_t alphaGen = SetAlphaGen( pStage );
+
+	material->useAttrColor = rgbGen == colorGen_t::CGEN_VERTEX || rgbGen == colorGen_t::CGEN_ONE_MINUS_VERTEX
+		|| alphaGen == alphaGen_t::AGEN_VERTEX || alphaGen == alphaGen_t::AGEN_ONE_MINUS_VERTEX;
+
 	gl_generic3DShaderMaterial->SetTCGenEnvironment( pStage->tcGen_Environment );
 	gl_generic3DShaderMaterial->SetTCGenLightmap( pStage->tcGen_Lightmap );
 
@@ -1299,6 +1305,12 @@ void ProcessMaterialLightMapping( Material* material, shaderStage_t* pStage, dra
 
 	DAEMON_ASSERT( !( enableDeluxeMapping && enableGridDeluxeMapping ) );
 
+	colorGen_t rgbGen = SetRgbGen( pStage );
+	alphaGen_t alphaGen = SetAlphaGen( pStage );
+
+	material->useAttrColor = rgbGen == colorGen_t::CGEN_VERTEX || rgbGen == colorGen_t::CGEN_ONE_MINUS_VERTEX
+		|| alphaGen == alphaGen_t::AGEN_VERTEX || alphaGen == alphaGen_t::AGEN_ONE_MINUS_VERTEX;
+
 	material->enableDeluxeMapping = enableDeluxeMapping;
 	material->enableGridLighting = enableGridLighting;
 	material->enableGridDeluxeMapping = enableGridDeluxeMapping;
@@ -2142,6 +2154,12 @@ void MaterialSystem::RenderMaterial( Material& material, const uint32_t viewID )
 
 	backEnd.currentEntity = &tr.worldEntity;
 
+	if ( material.useAttrColor ) {
+		material.shader->AddVertexAttribBit( ATTR_COLOR );
+	} else {
+		material.shader->DelVertexAttribBit( ATTR_COLOR );
+	}
+
 	GL_State( stateBits );
 	if ( material.usePolygonOffset ) {
 		glEnable( GL_POLYGON_OFFSET_FILL );

src/engine/renderer/Material.h

@@ -108,6 +108,8 @@ struct Material {
 	bool enableSpecularMapping;
 	bool enablePhysicalMapping;
 
+	bool useAttrColor = false;
+
 	cullType_t cullType;
 
 	uint32_t sort;
@@ -126,7 +128,8 @@ struct Material {
 
 	bool operator==( const Material& other ) {
 		return program == other.program && stateBits == other.stateBits && vbo == other.vbo && ibo == other.ibo
-			&& fog == other.fog && cullType == other.cullType && usePolygonOffset == other.usePolygonOffset;
+			&& fog == other.fog && cullType == other.cullType && usePolygonOffset == other.usePolygonOffset
+			&& useAttrColor == other.useAttrColor;
 	}
 
 	void AddTexture( Texture* texture ) {