Add PostProcessGlobalUniforms()

This will set `GLShaderManager.globalUniformBlock` to the struct + defines text, which will be the same for all shaders.

Author: VReaperV

src/engine/renderer/gl_shader.cpp

@@ -268,6 +268,10 @@ void GLShaderManager::FreeAll() {
 	{
 		_shaderBuildQueue.pop();
 	}
+
+	if ( glConfig2.pushBufferAvailable ) {
+		pushBuffer.FreeGLBuffers();
+	}
 }
 
 void GLShaderManager::UpdateShaderProgramUniformLocations( GLShader* shader, ShaderProgramDescriptor* shaderProgram ) const {
@@ -1275,8 +1279,6 @@ std::string GLShaderManager::BuildShaderText( const std::string& mainShaderText,
 void GLShaderManager::InitShader( GLShader* shader ) {
 	const int start = Sys::Milliseconds();
 
-	shader->PostProcessUniforms();
-
 	shader->_uniformStorageSize = 0;
 	for ( std::size_t i = 0; i < shader->_uniforms.size(); i++ ) {
 		GLUniform* uniform = shader->_uniforms[i];
@@ -1578,6 +1580,67 @@ void GLShaderManager::GenerateUniformStructDefinesText( const std::vector<GLUnif
 	uniformDefines += "\n";
 }
 
+void GLShaderManager::PostProcessGlobalUniforms() {
+	std::string uniformStruct = "\nstruct GlobalUniforms {\n";
+	std::string uniformBlock = "layout(std140, binding = "
+		+ std::to_string( BufferBind::GLOBAL_DATA )
+		+ ") uniform globalUBO {\n"
+		+ "GlobalUniforms globalUniforms;\n"
+		+ "};\n\n";
+	std::string uniformDefines;
+
+	/* Generate the struct and defines in the form of:
+	* struct GlobalUniforms {
+	*   type uniform0;
+	*   type uniform1;
+	*   ..
+	*   type uniformn;
+	* }
+	*
+	* #define uniformx globalUniforms.uniformx
+	*/
+
+	GLuint size;
+	GLuint padding;
+	std::vector<GLUniform*>* uniforms = &( ( GLShader* ) globalUBOProxy )->_uniforms;
+	std::vector<GLUniform*> constUniforms =
+		ProcessUniforms( GLUniform::CONST, GLUniform::CONST, false, *uniforms, size, padding );
+
+	GenerateUniformStructDefinesText( constUniforms, padding, 0, "globalUniforms", uniformStruct, uniformDefines );
+
+	uint32_t paddingCount = padding;
+
+	pushBuffer.constUniformsSize = size + padding;
+
+	std::vector<GLUniform*> frameUniforms =
+		ProcessUniforms( GLUniform::FRAME, GLUniform::FRAME, false, *uniforms, size, padding );
+	
+	GenerateUniformStructDefinesText( frameUniforms, padding, paddingCount, "globalUniforms", uniformStruct, uniformDefines );
+
+	pushBuffer.frameUniformsSize = size + padding;
+
+	uniformStruct += "};\n\n";
+
+	globalUniformBlock = uniformStruct + uniformBlock + uniformDefines;
+
+	uniforms = &( ( GLShader* ) globalUBOProxy )->_pushUniforms;
+	uniforms->clear();
+
+	for ( GLUniform* uniform : constUniforms ) {
+		uniforms->push_back( uniform );
+	}
+
+	for ( GLUniform* uniform : frameUniforms ) {
+		uniforms->push_back( uniform );
+	}
+
+	pushBuffer.InitGLBuffers();
+
+	pushBuffer.globalUBO.BufferStorage( pushBuffer.constUniformsSize + pushBuffer.frameUniformsSize, 1, nullptr );
+
+	pushBuffer.globalUBO.BindBufferBase();
+}
+
 // This will generate all the extra code for material system shaders
 std::string GLShaderManager::ShaderPostProcess( GLShader *shader, const std::string& shaderText, const uint32_t offset ) {
 	if ( !shader->std430Size ) {

src/engine/renderer/gl_shader.h

@@ -390,6 +390,8 @@ class GLShaderManager {
 	GLHeader GLWorldHeader;
 	GLHeader GLEngineConstants;
 
+	std::string globalUniformBlock;
+
 	GLShaderManager() {}
 	~GLShaderManager();
 
@@ -411,6 +413,9 @@ class GLShaderManager {
 		}
 
 		shader = new T();
+
+		shader->PostProcessUniforms();
+
 		_shaders.emplace_back( shader );
 		_shaderBuildQueue.push( shader );
 	}
@@ -437,6 +442,8 @@ class GLShaderManager {
 	void BuildAll( const bool buildOnlyMarked );
 	void FreeAll();
 
+	void PostProcessGlobalUniforms();
+
 	void BindBuffers();
 private:
 	struct InfoLogEntry {

src/engine/renderer/tr_shade.cpp

@@ -375,6 +375,7 @@ static void GLSL_InitGPUShadersOrError()
 		gl_fxaaShader->MarkProgramForBuilding( 0 );
 	}
 
+	gl_shaderManager.PostProcessGlobalUniforms();
 	gl_shaderManager.InitShaders();
 
 	if ( r_lazyShaders.Get() == 0 )