Make GL_VertexAttribPointers() static since it's not used anywhere else

Author: VReaperV

src/engine/renderer/tr_backend.cpp

@@ -615,6 +615,61 @@ void GL_State( uint32_t stateBits )
 	glState.glStateBits ^= diff;
 }
 
+static void GL_VertexAttribPointers( uint32_t attribBits, const bool settingUpVAO ) {
+	uint32_t i;
+
+	if ( !glState.currentVBO )
+	{
+		Sys::Error( "GL_VertexAttribPointers: no VBO bound" );
+	}
+
+	GLIMP_LOGCOMMENT( "--- GL_VertexAttribPointers( %s ) ---", glState.currentVBO->name );
+
+	if ( glConfig2.vboVertexSkinningAvailable && tess.vboVertexSkinning )
+	{
+		attribBits |= ATTR_BONE_FACTORS;
+	}
+
+	for ( i = 0; i < ATTR_INDEX_MAX; i++ )
+	{
+		uint32_t bit = BIT( i );
+		uint32_t frame = 0;
+		uintptr_t base = 0;
+
+		if( glState.currentVBO == tess.vbo ) {
+			base = tess.vertexBase * sizeof( shaderVertex_t );
+		}
+
+		if ( ( attribBits & bit ) != 0 &&
+		     ( !( glState.vertexAttribPointersSet & bit ) ||
+		       tess.vboVertexAnimation ||
+		       glState.currentVBO == tess.vbo || settingUpVAO || glState.currentVBO->dynamicVAO ) )
+		{
+			const vboAttributeLayout_t *layout = &glState.currentVBO->attribs[ i ];
+
+			GLIMP_LOGCOMMENT( "glVertexAttribPointer( %s )", attributeNames[ i ] );
+
+			if ( ( ATTR_INTERP_BITS & bit ) && glState.vertexAttribsInterpolation > 0 )
+			{
+				frame = glState.vertexAttribsNewFrame;
+			}
+			else
+			{
+				frame = glState.vertexAttribsOldFrame;
+			}
+
+			if ( !( glState.currentVBO->attribBits & bit ) )
+			{
+				Log::Warn( "GL_VertexAttribPointers: %s does not have %s",
+				           glState.currentVBO->name, attributeNames[ i ] );
+			}
+
+			glVertexAttribPointer( i, layout->numComponents, layout->componentType, layout->normalize, layout->stride, BUFFER_OFFSET( layout->ofs + ( frame * layout->frameOffset + base ) ) );
+			glState.vertexAttribPointersSet |= bit;
+		}
+	}
+}
+
 void GL_VertexAttribsState( uint32_t stateBits, const bool settingUpVAO )
 {
 	uint32_t diff;
@@ -673,61 +728,6 @@ void GL_VertexAttribsState( uint32_t stateBits, const bool settingUpVAO )
 	}
 }
 
-void GL_VertexAttribPointers( uint32_t attribBits, const bool settingUpVAO ) {
-	uint32_t i;
-
-	if ( !glState.currentVBO )
-	{
-		Sys::Error( "GL_VertexAttribPointers: no VBO bound" );
-	}
-
-	GLIMP_LOGCOMMENT( "--- GL_VertexAttribPointers( %s ) ---", glState.currentVBO->name );
-
-	if ( glConfig2.vboVertexSkinningAvailable && tess.vboVertexSkinning )
-	{
-		attribBits |= ATTR_BONE_FACTORS;
-	}
-
-	for ( i = 0; i < ATTR_INDEX_MAX; i++ )
-	{
-		uint32_t bit = BIT( i );
-		uint32_t frame = 0;
-		uintptr_t base = 0;
-
-		if( glState.currentVBO == tess.vbo ) {
-			base = tess.vertexBase * sizeof( shaderVertex_t );
-		}
-
-		if ( ( attribBits & bit ) != 0 &&
-		     ( !( glState.vertexAttribPointersSet & bit ) ||
-		       tess.vboVertexAnimation ||
-		       glState.currentVBO == tess.vbo || settingUpVAO || glState.currentVBO->dynamicVAO ) )
-		{
-			const vboAttributeLayout_t *layout = &glState.currentVBO->attribs[ i ];
-
-			GLIMP_LOGCOMMENT( "glVertexAttribPointer( %s )", attributeNames[ i ] );
-
-			if ( ( ATTR_INTERP_BITS & bit ) && glState.vertexAttribsInterpolation > 0 )
-			{
-				frame = glState.vertexAttribsNewFrame;
-			}
-			else
-			{
-				frame = glState.vertexAttribsOldFrame;
-			}
-
-			if ( !( glState.currentVBO->attribBits & bit ) )
-			{
-				Log::Warn( "GL_VertexAttribPointers: %s does not have %s",
-				           glState.currentVBO->name, attributeNames[ i ] );
-			}
-
-			glVertexAttribPointer( i, layout->numComponents, layout->componentType, layout->normalize, layout->stride, BUFFER_OFFSET( layout->ofs + ( frame * layout->frameOffset + base ) ) );
-			glState.vertexAttribPointersSet |= bit;
-		}
-	}
-}
-
 static GLint GL_ToSRGB( GLint internalFormat, bool isSRGB )
 {
 	if ( !isSRGB )

src/engine/renderer/tr_local.h

@@ -2924,7 +2924,6 @@ inline bool checkGLErrors()
 
 	void GL_State( uint32_t stateVector );
 	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 );