Only bind the GL buffers once per map

Less useless API calls, though for lightMapping shader on entities, which uses the core renderer at all times, this is till not the case.

Author: VReaperV

src/engine/renderer/GeometryOptimiser.cpp

@@ -716,6 +716,8 @@ std::vector<MaterialSurface> OptimiseMapGeometryMaterial( world_t* world, bspSur
 	materialSystem.GeneratePortalBoundingSpheres();
 	materialSystem.GenerateWorldCommandBuffer( processedMaterialSurfaces );
 
+	materialSystem.BindBuffers();
+
 	vertexAttributeSpec_t attrs[] {
 		{ ATTR_INDEX_POSITION, GL_FLOAT, GL_FLOAT, &vertices[0].xyz, 3, sizeof( *vertices ), 0 },
 		{ ATTR_INDEX_COLOR, GL_UNSIGNED_BYTE, GL_UNSIGNED_BYTE, &vertices[0].lightColor, 4, sizeof( *vertices ), ATTR_OPTION_NORMALIZE },

src/engine/renderer/Material.cpp

@@ -725,6 +725,36 @@ void MaterialSystem::GenerateWorldCommandBuffer( std::vector<MaterialSurface>& s
 	GL_CheckErrors();
 }
 
+void MaterialSystem::BindBuffers() {
+	materialsUBO.BindBufferBase();
+	texDataBuffer.BindBufferBase( texDataBufferType, texDataBindingPoint );
+	lightMapDataUBO.BindBufferBase();
+
+	if ( glConfig2.realtimeLighting ) {
+		// UBOs are actually completely independent of shaders since we set the binding points explicitly here
+		gl_lightMappingShaderMaterial->SetUniformBlock_Lights( tr.dlightUBO );
+	}
+
+	culledCommandsBuffer.BindBuffer( GL_DRAW_INDIRECT_BUFFER );
+	atomicCommandCountersBuffer.BindBuffer( GL_PARAMETER_BUFFER_ARB );
+
+	atomicCommandCountersBuffer.BindBufferBase( GL_SHADER_STORAGE_BUFFER, Util::ordinal( BufferBind::COMMAND_COUNTERS_STORAGE ) );
+
+	surfaceDescriptorsSSBO.BindBufferBase();
+	surfaceCommandsSSBO.BindBufferBase();
+	culledCommandsBuffer.BindBufferBase( GL_SHADER_STORAGE_BUFFER );
+	surfaceBatchesUBO.BindBufferBase();
+	atomicCommandCountersBuffer.BindBufferBase( GL_ATOMIC_COUNTER_BUFFER );
+
+	if ( totalPortals > 0 ) {
+		portalSurfacesSSBO.BindBufferBase();
+	}
+
+	if ( r_materialDebug.Get() ) {
+		debugSSBO.BindBufferBase();
+	}
+}
+
 void MaterialSystem::GenerateDepthImages( const int width, const int height, imageParams_t imageParms ) {
 	imageParms.bits ^= ( IF_NOPICMIP | IF_PACKED_DEPTH24_STENCIL8 );
 	imageParms.bits |= IF_ONECOMP32F;
@@ -812,8 +842,6 @@ void BindShaderLightMapping( Material* material ) {
 	}
 
 	if ( glConfig2.realtimeLighting ) {
-		gl_lightMappingShaderMaterial->SetUniformBlock_Lights( tr.dlightUBO );
-
 		// bind u_LightTiles
 		gl_lightMappingShaderMaterial->SetUniform_LightTilesBindless(
 			GL_BindToTMU( BIND_LIGHTTILES, tr.lighttileRenderImage )
@@ -1471,14 +1499,10 @@ void MaterialSystem::UpdateDynamicSurfaces() {
 }
 
 void MaterialSystem::UpdateFrameData() {
-	atomicCommandCountersBuffer.BindBufferBase( GL_SHADER_STORAGE_BUFFER, Util::ordinal( BufferBind::COMMAND_COUNTERS_STORAGE ) );
-
 	gl_clearSurfacesShader->BindProgram( 0 );
 	gl_clearSurfacesShader->SetUniform_Frame( nextFrame );
 	gl_clearSurfacesShader->DispatchCompute( MAX_VIEWS, 1, 1 );
 
-	atomicCommandCountersBuffer.UnBindBufferBase( GL_SHADER_STORAGE_BUFFER, Util::ordinal( BufferBind::COMMAND_COUNTERS_STORAGE ) );
-
 	GL_CheckErrors();
 }
 
@@ -1530,29 +1554,15 @@ void MaterialSystem::DepthReduction() {
 
 		glMemoryBarrier( GL_SHADER_IMAGE_ACCESS_BARRIER_BIT );
 	}
+
+	GL_CheckErrors();
 }
 
 void MaterialSystem::CullSurfaces() {
 	if ( r_gpuOcclusionCulling.Get() ) {
 		DepthReduction();
 	}
 
-	surfaceDescriptorsSSBO.BindBufferBase();
-	surfaceCommandsSSBO.BindBufferBase();
-	culledCommandsBuffer.BindBufferBase( GL_SHADER_STORAGE_BUFFER );
-	surfaceBatchesUBO.BindBufferBase();
-	atomicCommandCountersBuffer.BindBufferBase( GL_ATOMIC_COUNTER_BUFFER );
-
-	if ( totalPortals > 0 ) {
-		portalSurfacesSSBO.BindBufferBase();
-	}
-
-	if ( r_materialDebug.Get() ) {
-		debugSSBO.BindBufferBase();
-	}
-
-	GL_CheckErrors();
-
 	for ( uint32_t view = 0; view < frames[nextFrame].viewCount; view++ ) {
 		vec3_t origin;
 		frustum_t* frustum = &frames[nextFrame].viewFrames[view].frustum;
@@ -1623,20 +1633,6 @@ void MaterialSystem::CullSurfaces() {
 		gl_processSurfacesShader->DispatchCompute( totalBatchCount, 1, 1 );
 	}
 
-	surfaceDescriptorsSSBO.UnBindBufferBase();
-	surfaceCommandsSSBO.UnBindBufferBase();
-	culledCommandsBuffer.UnBindBufferBase( GL_SHADER_STORAGE_BUFFER );
-	surfaceBatchesUBO.UnBindBufferBase();
-	atomicCommandCountersBuffer.UnBindBufferBase( GL_ATOMIC_COUNTER_BUFFER );
-
-	if ( totalPortals > 0 ) {
-		portalSurfacesSSBO.UnBindBufferBase();
-	}
-
-	if ( r_materialDebug.Get() ) {
-		debugSSBO.UnBindBufferBase();
-	}
-
 	GL_CheckErrors();
 }
 
@@ -1855,7 +1851,6 @@ void MaterialSystem::AddPortalSurfaces() {
 		return;
 	}
 
-	portalSurfacesSSBO.BindBufferBase();
 	PortalSurface* portalSurfs = ( PortalSurface* ) portalSurfacesSSBO.GetCurrentAreaData();
 	viewCount = 0;
 	// This will recursively find potentially visible portals in each view based on the data read back from the GPU
@@ -1894,8 +1889,6 @@ void MaterialSystem::RenderMaterials( const shaderSort_t fromSort, const shaderS
 		frameStart = false;
 	}
 
-	materialsUBO.BindBufferBase();
-
 	geometryCache.Bind();
 
 	for ( MaterialPack& materialPack : materialPacks ) {
@@ -2026,13 +2019,6 @@ void MaterialSystem::RenderMaterial( Material& material, const uint32_t viewID )
 	}
 	material.texturesResident = true;
 
-	culledCommandsBuffer.BindBuffer( GL_DRAW_INDIRECT_BUFFER );
-
-	atomicCommandCountersBuffer.BindBuffer( GL_PARAMETER_BUFFER_ARB );
-
-	texDataBuffer.BindBufferBase( texDataBufferType, texDataBindingPoint );
-	lightMapDataUBO.BindBufferBase();
-
 	if ( r_showGlobalMaterials.Get() && material.sort != 0
 		&& ( material.shaderBinder == BindShaderLightMapping || material.shaderBinder == BindShaderGeneric3D ) ) {
 		vec3_t color;
@@ -2143,13 +2129,6 @@ void MaterialSystem::RenderMaterial( Material& material, const uint32_t viewID )
 		}
 	}
 
-	culledCommandsBuffer.UnBindBuffer( GL_DRAW_INDIRECT_BUFFER );
-
-	atomicCommandCountersBuffer.UnBindBuffer( GL_PARAMETER_BUFFER_ARB );
-
-	texDataBuffer.UnBindBufferBase( texDataBufferType, texDataBindingPoint );
-	lightMapDataUBO.UnBindBufferBase();
-
 	if ( material.usePolygonOffset ) {
 		glDisable( GL_POLYGON_OFFSET_FILL );
 	}

src/engine/renderer/Material.h

@@ -364,6 +364,8 @@ class MaterialSystem {
 	void InitGLBuffers();
 	void FreeGLBuffers();
 
+	void BindBuffers();
+
 	uint32_t GetTexDataSize() const {
 		return texData.size();
 	}