Use VAOs to switch most vertex formats

Faster since all of the required VAOs are prerecorded into each `VBO_t`. The exceptions are the default VAO, which switches its vertex arrays on/off, and md3 VAOs, because they require respecifying vertex attributes when animation frames change.

Author: VReaperV

src/engine/renderer/GLMemory.h

@@ -219,14 +219,14 @@ class GLVAO {
 	vboAttributeLayout_t attrs[ATTR_INDEX_MAX];
 	uint32_t enabledAttrs;
 
-	GLVAO( const GLuint newVBOBindingPoint ) :
+	GLVAO( const GLuint newVBOBindingPoint = 0 ) :
 		VBOBindingPoint( newVBOBindingPoint ) {
 	}
 
 	~GLVAO() = default;
 
 	void Bind() {
-		glBindVertexArray( id );
+		GL_BindVAO( id );
 	}
 
 	void SetAttrs( const vertexAttributeSpec_t* attrBegin, const vertexAttributeSpec_t* attrEnd ) {
@@ -271,6 +271,11 @@ class GLVAO {
 		glVertexArrayElementBuffer( id, buffer.id );
 	}
 
+	// For compatibility with IBO_t
+	void SetIndexBuffer( const GLuint bufferID ) {
+		glVertexArrayElementBuffer( id, bufferID );
+	}
+
 	void GenVAO() {
 		glGenVertexArrays( 1, &id );
 	}
@@ -281,7 +286,7 @@ class GLVAO {
 
 	private:
 	GLuint id;
-	const GLuint VBOBindingPoint;
+	GLuint VBOBindingPoint;
 	GLuint stride;
 };
 

src/engine/renderer/GLUtils.h

@@ -36,6 +36,8 @@ extern glconfig2_t glConfig2;
 
 void GL_CheckErrors_( const char *filename, int line );
 
+void GL_BindVAO( const GLuint id );
+
 #define GL_CheckErrors() do { if ( !glConfig.smpActive ) GL_CheckErrors_( __FILE__, __LINE__ ); } while ( false )
 
 #endif // GLUTILS_H

src/engine/renderer/GeometryCache.cpp

@@ -92,5 +92,5 @@ void GeometryCache::AddMapGeometry( const uint32_t verticesNumber, const uint32_
 
 	stagingBuffer.FlushAll();
 
-	glBindVertexArray( backEnd.currentVAO );
+	GL_BindVAO( backEnd.defaultVAO );
 }

src/engine/renderer/Material.cpp

@@ -1897,7 +1897,7 @@ void MaterialSystem::RenderMaterials( const shaderSort_t fromSort, const shaderS
 		}
 	}
 
-	glBindVertexArray( backEnd.currentVAO );
+	GL_BindVAO( backEnd.defaultVAO );
 
 	// Draw the skybox here because we skipped R_AddWorldSurfaces()
 	const bool environmentFogDraw = ( fromSort <= shaderSort_t::SS_ENVIRONMENT_FOG ) && ( toSort >= shaderSort_t::SS_ENVIRONMENT_FOG );

src/engine/renderer/VBO.h

@@ -28,6 +28,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "common/Common.h"
 #include "GL/glew.h"
 
+#include "GLMemory.h"
 #include "VertexSpecification.h"
 #include "tr_types.h"
 
@@ -47,6 +48,9 @@ struct VBO_t
 	vboLayout_t layout;
 	uint32_t attribBits; // Which attributes it has. Mostly for detecting errors
 	GLenum usage;
+
+	GLVAO VAO;
+	bool dynamicVAO = false;
 };
 
 struct IBO_t
@@ -67,6 +71,9 @@ VBO_t* R_CreateStaticVBO(
 
 IBO_t* R_CreateStaticIBO( const char* name, glIndex_t* indexes, int numIndexes );
 
+void SetupVAOBuffers( VBO_t* VBO, const IBO_t* IBO, const uint32_t stateBits,
+	GLVAO* VAO );
+
 void  R_BindVBO( VBO_t* vbo );
 void  R_BindNullVBO();
 

src/engine/renderer/tr_backend.cpp

@@ -144,6 +144,13 @@ void GL_BindNullProgram()
 	}
 }
 
+void GL_BindVAO( const GLuint id ) {
+	if ( backEnd.currentVAO != id ) {
+		glBindVertexArray( id );
+		backEnd.currentVAO = id;
+	}
+}
+
 void GL_SelectTexture( int unit )
 {
 	if ( glState.currenttmu == unit )
@@ -613,14 +620,27 @@ void GL_VertexAttribsState( uint32_t stateBits )
 	uint32_t diff;
 	uint32_t i;
 
+	if ( !tess.settingUpVAO && glState.currentVBO && !glState.currentVBO->dynamicVAO ) {
+		glState.currentVBO->VAO.Bind();
+		return;
+	}
+
 	if ( glConfig2.vboVertexSkinningAvailable && tess.vboVertexSkinning )
 	{
 		stateBits |= ATTR_BONE_FACTORS;
 	}
 
 	GL_VertexAttribPointers( stateBits );
 
-	diff = stateBits ^ glState.vertexAttribsState;
+	if ( !tess.settingUpVAO && backEnd.currentVAO != backEnd.defaultVAO ) {
+		return;
+	}
+
+	diff = stateBits;
+
+	if ( backEnd.currentVAO == backEnd.defaultVAO ) {
+		diff ^= glState.vertexAttribsState;
+	}
 
 	if ( !diff )
 	{
@@ -648,7 +668,9 @@ void GL_VertexAttribsState( uint32_t stateBits )
 		}
 	}
 
-	glState.vertexAttribsState = stateBits;
+	if ( backEnd.currentVAO == backEnd.defaultVAO ) {
+		glState.vertexAttribsState = stateBits;
+	}
 }
 
 void GL_VertexAttribPointers( uint32_t attribBits )
@@ -680,7 +702,7 @@ void GL_VertexAttribPointers( uint32_t attribBits )
 		if ( ( attribBits & bit ) != 0 &&
 		     ( !( glState.vertexAttribPointersSet & bit ) ||
 		       tess.vboVertexAnimation ||
-		       glState.currentVBO == tess.vbo ) )
+		       glState.currentVBO == tess.vbo || tess.settingUpVAO || glState.currentVBO->dynamicVAO ) )
 		{
 			const vboAttributeLayout_t *layout = &glState.currentVBO->attribs[ i ];
 

src/engine/renderer/tr_bsp.cpp

@@ -815,6 +815,11 @@ static void FinishSkybox() {
 							  3, 4, 7,  3, 0, 4 }; // Back
 
 	surface->ibo = R_CreateStaticIBO( "skybox_IBO", indexes, surface->numTriangles * 3 );
+
+	SetupVAOBuffers( surface->vbo, surface->ibo,
+		ATTR_POSITION,
+		&surface->vbo->VAO );
+
 	skybox->surface = ( surfaceType_t* ) surface;
 
 	tr.skybox = skybox;
@@ -2735,6 +2740,11 @@ static void R_CreateWorldVBO() {
 		"staticWorld_VBO", std::begin( attrs ), std::end( attrs ), numVerts );
 	s_worldData.ibo = R_CreateStaticIBO( "staticWorld_IBO", vboIdxs, numTriangles * 3 );
 
+	SetupVAOBuffers( s_worldData.vbo, s_worldData.ibo,
+		ATTR_POSITION | ATTR_COLOR
+		| ATTR_QTANGENT | ATTR_TEXCOORD,
+		&s_worldData.vbo->VAO );
+
 	ri.Hunk_FreeTempMemory( vboIdxs );
 	ri.Hunk_FreeTempMemory( vboVerts );
 

src/engine/renderer/tr_init.cpp

@@ -373,8 +373,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 		}
 
 		if ( glConfig2.glCoreProfile ) {
-			glGenVertexArrays( 1, &backEnd.currentVAO );
-			glBindVertexArray( backEnd.currentVAO );
+			glGenVertexArrays( 1, &backEnd.defaultVAO );
+			GL_BindVAO( backEnd.defaultVAO );
 		}
 
 		GL_CheckErrors();
@@ -1485,7 +1485,7 @@ ScreenshotCmd screenshotPNGRegistration("screenshotPNG", ssFormat_t::SSF_PNG, "p
 			GLSL_ShutdownGPUShaders();
 			if( glConfig2.glCoreProfile ) {
 				glBindVertexArray( 0 );
-				glDeleteVertexArrays( 1, &backEnd.currentVAO );
+				glDeleteVertexArrays( 1, &backEnd.defaultVAO );
 			}
 
 			GLimp_Shutdown();

src/engine/renderer/tr_local.h

@@ -2190,7 +2190,8 @@ enum class ssaoMode {
 		Color::Color32Bit color2D;
 		trRefEntity_t     entity2D; // currentEntity will point at this when doing 2D rendering
 		int               currentMainFBO;
-		GLuint            currentVAO;
+		GLuint currentVAO;
+		GLuint defaultVAO;
 	};
 
 	struct visTest_t
@@ -3108,6 +3109,8 @@ 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_model_iqm.cpp

@@ -858,6 +858,11 @@ bool R_LoadIQModel( model_t *mod, const void *buffer, int filesize,
 		// create IBO
 		ibo = R_CreateStaticIBO( ( "IQM surface IBO " + name ).c_str(),
 		                         ( glIndex_t* )IQModel->triangles, IQModel->num_triangles * 3 );
+
+		SetupVAOBuffers( vbo, ibo, 
+			ATTR_BONE_FACTORS | ATTR_POSITION | ATTR_QTANGENT | ATTR_TEXCOORD
+			| ATTR_COLOR,
+			&vbo->VAO );
 	} else {
 		vbo = nullptr;
 		ibo = nullptr;