Use tess.vboVertexAnimation instead of glState.vertexAttribsInterpolation to check for vertex animation

Author: VReaperV

src/engine/renderer/GeometryOptimiser.cpp

@@ -129,9 +129,6 @@ void MarkShaderBuild( const shader_t* shader, const int lightMapNum, const bool
 
 	tess.vboVertexSkinning = vertexSkinning;
 	tess.vboVertexAnimation = vertexAnimation;
-	/* Fuck knows why there are 2 different ways of setting the vertex animation global (through tess and through glState),
-	but that's what we have */
-	glState.vertexAttribsInterpolation = vertexAnimation ? 1.0f : 0.0f;
 
 	for ( const shaderStage_t* pStage = shader->stages; pStage < shader->lastStage; pStage++ ) {
 		pStage->shaderBuildMarker( pStage );
@@ -142,7 +139,6 @@ void MarkShaderBuild( const shader_t* shader, const int lightMapNum, const bool
 
 	tess.vboVertexSkinning = false;
 	tess.vboVertexAnimation = false;
-	glState.vertexAttribsInterpolation = 0.0f;
 }
 
 static void CoreResetSurfaceViewCounts( bspSurface_t** rendererSurfaces, int numSurfaces ) {

src/engine/renderer/tr_backend.cpp

@@ -677,7 +677,7 @@ void GL_VertexAttribPointers( uint32_t attribBits )
 
 		if ( ( attribBits & bit ) != 0 &&
 		     ( !( glState.vertexAttribPointersSet & bit ) ||
-		       glState.vertexAttribsInterpolation >= 0 ||
+		       tess.vboVertexAnimation ||
 		       glState.currentVBO == tess.vbo ) )
 		{
 			const vboAttributeLayout_t *layout = &glState.currentVBO->attribs[ i ];

src/engine/renderer/tr_shade.cpp

@@ -876,12 +876,12 @@ void ProcessShaderReflection( const shaderStage_t* pStage ) {
 	gl_reflectionShader->SetReliefMapping( pStage->enableReliefMapping );
 
 	gl_reflectionShader->SetVertexSkinning( glConfig2.vboVertexSkinningAvailable && tess.vboVertexSkinning );
-	gl_reflectionShader->SetVertexAnimation( glState.vertexAttribsInterpolation > 0 );
+	gl_reflectionShader->SetVertexAnimation( tess.vboVertexAnimation );
 }
 
 void ProcessShaderHeatHaze( const shaderStage_t* ) {
 	gl_heatHazeShader->SetVertexSkinning( glConfig2.vboVertexSkinningAvailable && tess.vboVertexSkinning );
-	gl_heatHazeShader->SetVertexAnimation( glState.vertexAttribsInterpolation > 0 );
+	gl_heatHazeShader->SetVertexAnimation( tess.vboVertexAnimation );
 }
 
 void ProcessShaderLiquid( const shaderStage_t* pStage ) {
@@ -900,7 +900,7 @@ void ProcessShaderLiquid( const shaderStage_t* pStage ) {
 
 void ProcessShaderFog( const shaderStage_t* ) {
 	gl_heatHazeShader->SetVertexSkinning( glConfig2.vboVertexSkinningAvailable && tess.vboVertexSkinning );
-	gl_heatHazeShader->SetVertexAnimation( glState.vertexAttribsInterpolation > 0 );
+	gl_heatHazeShader->SetVertexAnimation( tess.vboVertexAnimation );
 }
 
 void Render_NONE( shaderStage_t * )
@@ -1300,7 +1300,7 @@ static void Render_shadowFill( shaderStage_t *pStage )
 	GL_State( stateBits );
 
 	gl_shadowFillShader->SetVertexSkinning( glConfig2.vboVertexSkinningAvailable && tess.vboVertexSkinning );
-	gl_shadowFillShader->SetVertexAnimation( glState.vertexAttribsInterpolation > 0 );
+	gl_shadowFillShader->SetVertexAnimation( tess.vboVertexAnimation );
 
 	gl_shadowFillShader->SetMacro_LIGHT_DIRECTIONAL( backEnd.currentLight->l.rlType == refLightType_t::RL_DIRECTIONAL );
 
@@ -1374,7 +1374,7 @@ static void Render_forwardLighting_DBS_omni( shaderStage_t *pStage,
 
 	// choose right shader program ----------------------------------
 	gl_forwardLightingShader_omniXYZ->SetVertexSkinning( glConfig2.vboVertexSkinningAvailable && tess.vboVertexSkinning );
-	gl_forwardLightingShader_omniXYZ->SetVertexAnimation( glState.vertexAttribsInterpolation > 0 );
+	gl_forwardLightingShader_omniXYZ->SetVertexAnimation( tess.vboVertexAnimation );
 
 	gl_forwardLightingShader_omniXYZ->SetHeightMapInNormalMap( pStage->hasHeightMapInNormalMap );
 
@@ -1549,7 +1549,7 @@ static void Render_forwardLighting_DBS_proj( shaderStage_t *pStage,
 
 	// choose right shader program ----------------------------------
 	gl_forwardLightingShader_projXYZ->SetVertexSkinning( glConfig2.vboVertexSkinningAvailable && tess.vboVertexSkinning );
-	gl_forwardLightingShader_projXYZ->SetVertexAnimation( glState.vertexAttribsInterpolation > 0 );
+	gl_forwardLightingShader_projXYZ->SetVertexAnimation( tess.vboVertexAnimation );
 
 	gl_forwardLightingShader_projXYZ->SetHeightMapInNormalMap( pStage->hasHeightMapInNormalMap );
 
@@ -1725,7 +1725,7 @@ static void Render_forwardLighting_DBS_directional( shaderStage_t *pStage, trRef
 
 	// choose right shader program ----------------------------------
 	gl_forwardLightingShader_directionalSun->SetVertexSkinning( glConfig2.vboVertexSkinningAvailable && tess.vboVertexSkinning );
-	gl_forwardLightingShader_directionalSun->SetVertexAnimation( glState.vertexAttribsInterpolation > 0 );
+	gl_forwardLightingShader_directionalSun->SetVertexAnimation( tess.vboVertexAnimation );
 
 	gl_forwardLightingShader_directionalSun->SetHeightMapInNormalMap( pStage->hasHeightMapInNormalMap );