Add the remaining code for the global UBO in PushBuffer

Post-process shaders to actually add the `globalUniformBlock`, add `SetConstUniforms()` and `SetFrameUniforms()` functions to the core and material system renderers, and add the supporting glsl code.

Author: VReaperV

src/engine/renderer/GLMemory.cpp

@@ -117,6 +117,10 @@ void GLStagingBuffer::FlushAll() {
 	FlushStagingCopyQueue();
 }
 
+bool GLStagingBuffer::Active() const {
+	return buffer.id;
+}
+
 void GLStagingBuffer::InitGLBuffer() {
 	buffer.GenBuffer();
 
@@ -136,6 +140,10 @@ void GLStagingBuffer::FreeGLBuffer() {
 
 void PushBuffer::InitGLBuffers() {
 	globalUBO.GenBuffer();
+
+	globalUBO.BufferStorage( pushBuffer.constUniformsSize + pushBuffer.frameUniformsSize, 1, nullptr );
+
+	globalUBO.BindBufferBase();
 }
 
 void PushBuffer::FreeGLBuffers() {

src/engine/renderer/GLMemory.h

@@ -173,6 +173,7 @@ class GLBuffer {
 
 	void DelBuffer() {
 		glDeleteBuffers( 1, &id );
+		id = 0;
 		mapped = false;
 	}
 
@@ -301,6 +302,8 @@ class GLStagingBuffer {
 	void FlushStagingCopyQueue();
 	void FlushAll();
 
+	bool Active() const;
+
 	void InitGLBuffer();
 	void FreeGLBuffer();
 

src/engine/renderer/Material.cpp

@@ -1495,6 +1495,22 @@ void MaterialSystem::UpdateDynamicSurfaces() {
 	GL_CheckErrors();
 }
 
+void MaterialSystem::SetConstUniforms() {
+	globalUBOProxy->SetUniform_SurfaceDescriptorsCount( surfaceDescriptorsCount );
+	uint32_t globalWorkGroupX = surfaceDescriptorsCount % MAX_COMMAND_COUNTERS == 0 ?
+		surfaceDescriptorsCount / MAX_COMMAND_COUNTERS : surfaceDescriptorsCount / MAX_COMMAND_COUNTERS + 1;
+
+	globalUBOProxy->SetUniform_FirstPortalGroup( globalWorkGroupX );
+	globalUBOProxy->SetUniform_TotalPortals( totalPortals );
+}
+
+void MaterialSystem::SetFrameUniforms() {
+	globalUBOProxy->SetUniform_Frame( nextFrame );
+
+	globalUBOProxy->SetUniform_UseFrustumCulling( r_gpuFrustumCulling.Get() );
+	globalUBOProxy->SetUniform_UseOcclusionCulling( r_gpuOcclusionCulling.Get() );
+}
+
 void MaterialSystem::UpdateFrameData() {
 	gl_clearSurfacesShader->BindProgram( 0 );
 	gl_clearSurfacesShader->SetUniform_Frame( nextFrame );

src/engine/renderer/Material.h

@@ -359,6 +359,8 @@ class MaterialSystem {
 
 	void StartFrame();
 	void EndFrame();
+	void SetConstUniforms();
+	void SetFrameUniforms();
 
 	void GenerateDepthImages( const int width, const int height, imageParams_t imageParms );
 

src/engine/renderer/gl_shader.cpp

@@ -268,10 +268,6 @@ void GLShaderManager::FreeAll() {
 	{
 		_shaderBuildQueue.pop();
 	}
-
-	if ( glConfig2.pushBufferAvailable ) {
-		pushBuffer.FreeGLBuffers();
-	}
 }
 
 void GLShaderManager::UpdateShaderProgramUniformLocations( GLShader* shader, ShaderProgramDescriptor* shaderProgram ) const {
@@ -1349,6 +1345,12 @@ void GLShaderManager::InitShader( GLShader* shader ) {
 			ShaderDescriptor* desc = FindShader( shader->_name, shaderType.mainText, shaderType.GLType, shaderType.headers,
 				uniqueMacros, compileMacros, true );
 
+			if ( desc && glConfig2.pushBufferAvailable ) {
+				desc->shaderSource = RemoveUniformsFromShaderText( desc->shaderSource, shader->_pushUniforms );
+
+				desc->shaderSource.insert( shaderType.offset, globalUniformBlock );
+			}
+
 			if ( desc && glConfig2.usingMaterialSystem && shader->_useMaterialSystem ) {
 				desc->shaderSource = ShaderPostProcess( shader, desc->shaderSource, shaderType.offset );
 			}
@@ -1581,14 +1583,6 @@ void GLShaderManager::GenerateUniformStructDefinesText( const std::vector<GLUnif
 }
 
 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;
@@ -1600,11 +1594,19 @@ void GLShaderManager::PostProcessGlobalUniforms() {
 	* #define uniformx globalUniforms.uniformx
 	*/
 
+	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;
+
 	GLuint size;
 	GLuint padding;
 	std::vector<GLUniform*>* uniforms = &( ( GLShader* ) globalUBOProxy )->_uniforms;
 	std::vector<GLUniform*> constUniforms =
-		ProcessUniforms( GLUniform::CONST, GLUniform::CONST, false, *uniforms, size, padding );
+		ProcessUniforms( GLUniform::CONST, GLUniform::CONST, !glConfig2.usingBindlessTextures, *uniforms, size, padding );
 
 	GenerateUniformStructDefinesText( constUniforms, padding, 0, "globalUniforms", uniformStruct, uniformDefines );
 
@@ -1613,7 +1615,7 @@ void GLShaderManager::PostProcessGlobalUniforms() {
 	pushBuffer.constUniformsSize = size + padding;
 
 	std::vector<GLUniform*> frameUniforms =
-		ProcessUniforms( GLUniform::FRAME, GLUniform::FRAME, false, *uniforms, size, padding );
+		ProcessUniforms( GLUniform::FRAME, GLUniform::FRAME, !glConfig2.usingBindlessTextures, *uniforms, size, padding );
 
 	GenerateUniformStructDefinesText( frameUniforms, padding, paddingCount, "globalUniforms", uniformStruct, uniformDefines );
 
@@ -1633,12 +1635,6 @@ void GLShaderManager::PostProcessGlobalUniforms() {
 	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
@@ -2255,7 +2251,7 @@ void GLShader::PostProcessUniforms() {
 	if ( glConfig2.pushBufferAvailable && !pushSkip ) {
 		GLuint unused;
 		_pushUniforms = gl_shaderManager.ProcessUniforms( GLUniform::CONST, GLUniform::FRAME,
-			false, _uniforms, unused, unused );
+			!glConfig2.usingBindlessTextures, _uniforms, unused, unused );
 	}
 }
 

src/engine/renderer/gl_shader.h

@@ -554,9 +554,9 @@ class GLUniformSampler : protected GLUniform {
 			if ( glConfig2.pushBufferAvailable && _updateType <= FRAME ) {
 				return;
 			}
-		}
 
 		glUniformHandleui64ARB( GetLocation(), currentValueBindless );
+		}
 	}
 
 	uint32_t* WriteToBuffer( uint32_t* buffer ) override {

src/engine/renderer/glsl_source/cameraEffects_fp.glsl

@@ -22,6 +22,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 /* cameraEffects_fp.glsl */
 
+#define CAMERAEFFECTS_GLSL
+
 uniform sampler2D u_CurrentMap;
 
 #if defined(r_colorGrading)
@@ -53,6 +55,8 @@ DECLARE_OUTPUT(vec4)
 
 void main()
 {
+	#insert material_fp
+
 	// calculate the screen texcoord in the 0.0 to 1.0 range
 	vec2 st = gl_FragCoord.st / r_FBufSize;
 

src/engine/renderer/glsl_source/depthReduction_cp.glsl

@@ -34,6 +34,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /* depthReduction_cp.glsl */
 
+#define DEPTHMAP_GLSL
+
 #insert common_cp
 
 // Keep this to 8x8 because we don't want extra shared mem etc. to be allocated, and to minimize wasted lanes
@@ -48,6 +50,8 @@ uniform uint u_ViewHeight;
 uniform bool u_InitialDepthLevel;
 
 void main() {
+    #insert material_fp
+
     const uint globalInvocationID = GLOBAL_INVOCATION_ID;
 
     const ivec2 position = ivec2( gl_GlobalInvocationID.xy );

src/engine/renderer/glsl_source/depthtile1_fp.glsl

@@ -34,6 +34,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /* depthtile1_fp.glsl */
 
+#define DEPTHMAP_GLSL
+
 uniform sampler2D u_DepthMap;
 IN(flat) vec3 unprojectionParams;
 
@@ -63,6 +65,8 @@ float min16(in vec4 data0, in vec4 data1, in vec4 data2, in vec4 data3)
 }
 void	main()
 {
+  #insert material_fp
+
   vec2 st = gl_FragCoord.st * 4.0 * pixelScale;
   vec4 depth[4], mask[4];
 

src/engine/renderer/glsl_source/depthtile2_fp.glsl

@@ -34,6 +34,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /* depthtile2_fp.glsl */
 
+#define DEPTHTILE1_GLSL
+
 uniform sampler2D u_DepthTile1;
 
 #if __VERSION__ > 120
@@ -44,6 +46,8 @@ out vec4 outputColor;
 
 void	main()
 {
+  #insert material_fp
+
   vec2 st = gl_FragCoord.st * r_tileStep;
   float x, y;
   vec4 accum = vec4( 0.0, 99999.0, 0.0, 0.0 );