Minor fix-ups

Author: VReaperV

src/engine/renderer/GeometryCache.cpp

@@ -33,6 +33,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 // GeometryCache.cpp
 
+#include "common/Common.h"
+
 #include "GeometryCache.h"
 
 #include "tr_local.h"
@@ -59,9 +61,6 @@ void GeometryCache::FreeGLBuffers() {
 	VAO.DelVAO();
 }
 
-void GeometryCache::Free() {
-}
-
 void GeometryCache::AllocBuffers() {
 	VBO.BufferData( mapVerticesNumber * 8, nullptr, GL_STATIC_DRAW );
 
@@ -89,7 +88,7 @@ void GeometryCache::AddMapGeometry( const uint32_t verticesNumber, const uint32_
 	for ( const vertexAttributeSpec_t* spec = attrBegin; spec < attrEnd; spec++ ) {
 		vboAttributeLayout_t& attr = VAO.attrs[spec->attrIndex];
 
-		CopyVertexAttribute( attr, *spec, mapVerticesNumber, ( byte* ) VBOVerts );
+		R_CopyVertexAttribute( attr, *spec, mapVerticesNumber, ( byte* ) VBOVerts );
 	}
 	VBO.UnmapBuffer();
 

src/engine/renderer/GeometryCache.h

@@ -46,8 +46,6 @@ class GeometryCache {
 	void InitGLBuffers();
 	void FreeGLBuffers();
 
-	void Free();
-
 	void AllocBuffers();
 	void AddMapGeometry( const uint32_t verticesNumber, const uint32_t indicesNumber,
 		const vertexAttributeSpec_t* attrBegin,

src/engine/renderer/gl_shader.h

@@ -1552,7 +1552,6 @@ class GLVAO {
 		for ( const vertexAttributeSpec_t* spec = attrBegin; spec < attrEnd; spec++ ) {
 			vboAttributeLayout_t& attr = attrs[spec->attrIndex];
 			ASSERT_NQ( spec->numComponents, 0U );
-			// vbo->attribBits |= 1 << spec->attrIndex;
 			attr.componentType = spec->componentStorageType;
 			if ( attr.componentType == GL_HALF_FLOAT && !glConfig2.halfFloatVertexAvailable ) {
 				attr.componentType = GL_FLOAT;
@@ -1561,7 +1560,7 @@ class GLVAO {
 			attr.normalize = spec->attrOptions & ATTR_OPTION_NORMALIZE ? GL_TRUE : GL_FALSE;
 
 			attr.ofs = ofs;
-			ofs += attr.numComponents * ComponentSize( attr.componentType );
+			ofs += attr.numComponents * R_ComponentSize( attr.componentType );
 			ofs = ( ofs + 3 ) & ~3; // 4 is minimum alignment for any vertex attribute
 
 			enabledAttrs |= 1 << spec->attrIndex;

src/engine/renderer/tr_local.h

@@ -3716,8 +3716,8 @@ inline bool checkGLErrors()
 
 	============================================================
 	*/
-	uint32_t ComponentSize( GLenum type );
-	void CopyVertexAttribute( const vboAttributeLayout_t& attrib, const vertexAttributeSpec_t& spec,
+	uint32_t R_ComponentSize( GLenum type );
+	void R_CopyVertexAttribute( const vboAttributeLayout_t& attrib, const vertexAttributeSpec_t& spec,
 		uint32_t count, byte* interleavedData );
 
 	VBO_t *R_CreateStaticVBO(

src/engine/renderer/tr_vbo.cpp

@@ -75,7 +75,7 @@ static void R_SetVBOAttributeLayouts( VBO_t *vbo )
 	}
 }
 
-uint32_t ComponentSize( GLenum type )
+uint32_t R_ComponentSize( GLenum type )
 {
 	switch ( type )
 	{
@@ -91,7 +91,7 @@ uint32_t ComponentSize( GLenum type )
 		return 4;
 	}
 
-	Sys::Error( "VBO ComponentSize: unknown type %d", type );
+	Sys::Error( "VBO R_ComponentSize: unknown type %d", type );
 }
 
 #if defined( GL_ARB_buffer_storage ) && defined( GL_ARB_sync )
@@ -209,7 +209,7 @@ VBO_t *R_CreateDynamicVBO( const char *name, int numVertexes, uint32_t stateBits
 	return vbo;
 }
 
-void CopyVertexAttribute(
+void R_CopyVertexAttribute(
 	const vboAttributeLayout_t &attrib, const vertexAttributeSpec_t &spec,
 	uint32_t count, byte *interleavedData )
 {
@@ -226,7 +226,7 @@ void CopyVertexAttribute(
 
 	if ( attrib.componentType == spec.componentInputType )
 	{
-		uint32_t size = attrib.numComponents * ComponentSize( attrib.componentType );
+		uint32_t size = attrib.numComponents * R_ComponentSize( attrib.componentType );
 
 		for ( uint32_t v = count; ; )
 		{
@@ -333,7 +333,7 @@ VBO_t *R_CreateStaticVBO(
 
 		uint32_t &ofs = spec->attrOptions & ATTR_OPTION_HAS_FRAMES ? ofsFrameful : ofsFrameless;
 		attrib.ofs = ofs;
-		ofs += attrib.numComponents * ComponentSize( attrib.componentType );
+		ofs += attrib.numComponents * R_ComponentSize( attrib.componentType );
 		ofs = ( ofs + 3 ) & ~3; // 4 is minimum alignment for any vertex attribute
 	}
 
@@ -353,12 +353,12 @@ VBO_t *R_CreateStaticVBO(
 			attrib.stride = ofsFrameful;
 			attrib.frameOffset = numVerts * ofsFrameful;
 			attrib.ofs += framelessSize;
-			CopyVertexAttribute( attrib, *spec, numVerts * numFrames, interleavedData );
+			R_CopyVertexAttribute( attrib, *spec, numVerts * numFrames, interleavedData );
 		}
 		else
 		{
 			attrib.stride = ofsFrameless;
-			CopyVertexAttribute( attrib, *spec, numVerts, interleavedData );
+			R_CopyVertexAttribute( attrib, *spec, numVerts, interleavedData );
 		}
 	}