tess.settingUpVAO -> GL_VertexAttribsState() arg

Author: VReaperV

src/engine/renderer/tr_backend.cpp

@@ -615,12 +615,12 @@ void GL_State( uint32_t stateBits )
 	glState.glStateBits ^= diff;
 }
 
-void GL_VertexAttribsState( uint32_t stateBits )
+void GL_VertexAttribsState( uint32_t stateBits, const bool settingUpVAO )
 {
 	uint32_t diff;
 	uint32_t i;
 
-	if ( !tess.settingUpVAO && glState.currentVBO && !glState.currentVBO->dynamicVAO ) {
+	if ( !settingUpVAO && glState.currentVBO && !glState.currentVBO->dynamicVAO ) {
 		glState.currentVBO->VAO.Bind();
 		return;
 	}
@@ -630,9 +630,9 @@ void GL_VertexAttribsState( uint32_t stateBits )
 		stateBits |= ATTR_BONE_FACTORS;
 	}
 
-	GL_VertexAttribPointers( stateBits );
+	GL_VertexAttribPointers( stateBits, settingUpVAO );
 
-	if ( !tess.settingUpVAO && backEnd.currentVAO != backEnd.defaultVAO ) {
+	if ( !settingUpVAO && backEnd.currentVAO != backEnd.defaultVAO ) {
 		return;
 	}
 
@@ -673,8 +673,7 @@ void GL_VertexAttribsState( uint32_t stateBits )
 	}
 }
 
-void GL_VertexAttribPointers( uint32_t attribBits )
-{
+void GL_VertexAttribPointers( uint32_t attribBits, const bool settingUpVAO ) {
 	uint32_t i;
 
 	if ( !glState.currentVBO )
@@ -702,7 +701,7 @@ void GL_VertexAttribPointers( uint32_t attribBits )
 		if ( ( attribBits & bit ) != 0 &&
 		     ( !( glState.vertexAttribPointersSet & bit ) ||
 		       tess.vboVertexAnimation ||
-		       glState.currentVBO == tess.vbo || tess.settingUpVAO || glState.currentVBO->dynamicVAO ) )
+		       glState.currentVBO == tess.vbo || settingUpVAO || glState.currentVBO->dynamicVAO ) )
 		{
 			const vboAttributeLayout_t *layout = &glState.currentVBO->attribs[ i ];
 

src/engine/renderer/tr_local.h

@@ -2923,8 +2923,8 @@ inline bool checkGLErrors()
 	void GL_PolygonOffset( float factor, float units );
 
 	void GL_State( uint32_t stateVector );
-	void GL_VertexAttribsState( uint32_t stateBits );
-	void GL_VertexAttribPointers( uint32_t attribBits );
+	void GL_VertexAttribsState( uint32_t stateBits, const bool settingUpVAO = false );
+	void GL_VertexAttribPointers( uint32_t attribBits, const bool settingUpVAO );
 	void GL_Cull( cullType_t cullType );
 void GL_TexImage2D( GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *data, bool isSRGB );
 void GL_TexImage3D( GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *data, bool isSRGB );
@@ -3126,8 +3126,6 @@ void GLimp_LogComment_( std::string comment );
 		// enabled when an MD3 VBO is used
 		bool    vboVertexAnimation;
 
-		bool settingUpVAO = false;
-
 		// This can be thought of a "flush" function for the vertex buffer.
 		// Which function depends on backend mode and also the shader.
 		void ( *stageIteratorFunc )();

src/engine/renderer/tr_vbo.cpp

@@ -453,9 +453,7 @@ void SetupVAOBuffers( VBO_t* VBO, const IBO_t* IBO, const uint32_t stateBits,
 
 	R_BindVBO( VBO );
 
-	tess.settingUpVAO = true;
-	GL_VertexAttribsState( stateBits );
-	tess.settingUpVAO = false;
+	GL_VertexAttribsState( stateBits, true );
 
 	if ( IBO ) {
 		VAO->SetIndexBuffer( IBO->indexesVBO );