Bind the u_Lights UBO only once if GL_ARB_shading_language_420pack is available

Author: VReaperV

src/engine/renderer/Material.cpp

@@ -730,11 +730,6 @@ void MaterialSystem::BindBuffers() {
 	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 );
 

src/engine/renderer/gl_shader.cpp

@@ -1181,6 +1181,10 @@ void GLShaderManager::BuildAll( const bool buildOnlyMarked ) {
 		cacheLoadCount, cacheLoadTime, cacheSaveCount, cacheSaveTime );
 }
 
+void GLShaderManager::BindBuffers() {
+	glBindBufferBase( GL_UNIFORM_BUFFER, BufferBind::LIGHTS, tr.dlightUBO );
+}
+
 std::string GLShaderManager::ProcessInserts( const std::string& shaderText ) const {
 	std::string out;
 	std::istringstream shaderTextStream( shaderText );

src/engine/renderer/gl_shader.h

@@ -368,6 +368,8 @@ class GLShaderManager {
 	bool BuildPermutation( GLShader* shader, int macroIndex, int deformIndex, const bool buildOneShader );
 	void BuildAll( const bool buildOnlyMarked );
 	void FreeAll();
+
+	void BindBuffers();
 private:
 	struct InfoLogEntry {
 		int line;
@@ -1261,7 +1263,6 @@ class GLUniformBlock
 
 	void SetBuffer( GLuint buffer ) {
 		if ( glConfig2.shadingLanguage420PackAvailable ) {
-			glBindBufferBase( GL_UNIFORM_BUFFER, _bindingPoint, buffer );
 			return;
 		}
 

src/engine/renderer/tr_init.cpp

@@ -1540,6 +1540,10 @@ ScreenshotCmd screenshotPNGRegistration("screenshotPNG", ssFormat_t::SSF_PNG, "p
 			GLSL_FinishGPUShaders();
 		}
 
+		if ( glConfig2.shadingLanguage420PackAvailable ) {
+			gl_shaderManager.BindBuffers();
+		}
+
 		/* TODO: Move this into a loading step and don't render it to the screen
 		For now though do it here to avoid the ugly square rendering appearing on top of the loading screen */
 		if ( glConfig2.reflectionMappingAvailable ) {