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();
 

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

@@ -1345,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 );
 			}
@@ -1600,7 +1606,7 @@ void GLShaderManager::PostProcessGlobalUniforms() {
 	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 );
 
@@ -1609,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 );
 
@@ -2245,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 );

src/engine/renderer/glsl_source/fogGlobal_fp.glsl

@@ -24,6 +24,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #insert common
 
+#define DEPTHMAP_GLSL
+
 uniform sampler2D	u_ColorMap; // fog texture
 uniform sampler2D	u_DepthMap;
 
@@ -40,6 +42,8 @@ out vec4 outputColor;
 
 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/generic_fp.glsl

@@ -36,6 +36,8 @@ IN(smooth) vec2		var_TexCoords;
 IN(smooth) vec4		var_Color;
 
 #if defined(USE_DEPTH_FADE)
+	#define DEPTHMAP_GLSL
+
 IN(smooth) float        var_FadeDepth;
 uniform sampler2D       u_DepthMap;
 #endif

src/engine/renderer/glsl_source/lightMapping_fp.glsl

@@ -27,6 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #insert reliefMapping_fp
 
 #define LIGHTMAPPING_GLSL
+#define LIGHTGRID_GLSL
 
 uniform sampler2D	u_DiffuseMap;
 uniform sampler2D	u_MaterialMap;

src/engine/renderer/glsl_source/lighttile_fp.glsl

@@ -34,6 +34,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /* lighttile_fp.glsl */
 
+#define DEPTHTILE2_GLSL
+
 IN(smooth) vec2 vPosition;
 
 struct Light {
@@ -96,6 +98,8 @@ vec3 ProjToView( vec2 inp ) {
 }
 
 void main() {
+	#insert material_fp
+
 	vec2 minmax = texture2D( u_DepthTile2, 0.5 * vPosition + 0.5 ).xy;
 
 	float minx = vPosition.x - r_tileStep.x;

src/engine/renderer/glsl_source/liquid_fp.glsl

@@ -27,6 +27,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #insert reliefMapping_fp
 
 #define LIQUID_GLSL
+#define DEPTHMAP_GLSL
+#define LIGHTGRID_GLSL
 
 uniform sampler2D	u_CurrentMap;
 uniform sampler2D	u_PortalMap;

src/engine/renderer/glsl_source/material_fp.glsl

@@ -46,6 +46,47 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    in the beginning of main() once
    Any texture samplers should be passed to functions from main() or other functions */
 
+#ifdef HAVE_ARB_bindless_texture
+
+	#if defined(CAMERAEFFECTS_GLSL)
+		sampler3D u_ColorMap3D = sampler3D( u_ColorMap3D_initial );
+	#endif // !CAMERAEFFECTS_GLSL
+
+	#if defined(FOGQUAKE3_GLSL)
+		sampler2D u_FogMap = sampler2D( u_FogMap_initial );
+	#endif // !FOGQUAKE3_GLSL
+
+	#if defined(LIQUID_GLSL)
+		sampler2D u_PortalMap = sampler2D( u_PortalMap_initial );
+	#endif // !LIQUID_GLSL
+
+	#if defined(DEPTHMAP_GLSL)
+		sampler2D u_DepthMap = sampler2D( u_DepthMap_initial );
+	#endif // !DEPTHMAP_GLSL
+
+	#if defined(DEPTHTILE1_GLSL)
+		sampler2D u_DepthTile1 = sampler2D( u_DepthTile1_initial );
+	#endif // !DEPTHTILE1_GLSL
+
+	#if defined(DEPTHTILE2_GLSL)
+		sampler2D u_DepthTile2 = sampler2D( u_DepthTile2_initial );
+	#endif // !DEPTHTILE2_GLSL
+	
+	#if defined(DEPTHREDUCTION_GLSL)
+		sampler2D depthTextureInitial = sampler2D( depthTextureInitial_initial );
+	#endif // !DEPTHREDUCTION_GLSL
+
+	#if defined(COMPUTELIGHT_GLSL)
+		usampler3D u_LightTiles = usampler3D( u_LightTiles_initial );
+	#endif // !COMPUTELIGHT_GLSL
+
+	#if defined(LIGHTGRID_GLSL)
+		sampler3D u_LightGrid1 = sampler3D( u_LightGrid1_initial );
+		sampler3D u_LightGrid2 = sampler3D( u_LightGrid2_initial );
+	#endif // !LIGHTGRID_GLSL
+
+#endif // !HAVE_ARB_bindless_texture
+
 #if defined(USE_MATERIAL_SYSTEM)
 
 	#ifdef HAVE_ARB_bindless_texture

src/engine/renderer/glsl_source/motionblur_fp.glsl

@@ -22,6 +22,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 /* motionblur_fp.glsl */
 
+#define DEPTHMAP_GLSL
+
 uniform sampler2D	u_ColorMap;
 uniform sampler2D	u_DepthMap;
 
@@ -35,6 +37,8 @@ out vec4 outputColor;
 
 void	main()
 {
+	#insert material_fp
+
 	vec4 color = vec4( 0.0 );
 
 	// calculate the screen texcoord in the 0.0 to 1.0 range

src/engine/renderer/glsl_source/ssao_fp.glsl

@@ -22,6 +22,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 /* ssao_fp.glsl */
 
+#define DEPTHMAP_GLSL
+
 uniform sampler2D u_DepthMap;
 uniform vec3 u_UnprojectionParams;
 
@@ -85,6 +87,8 @@ vec4 offsets[] = vec4[6](
 
 void	main()
 {
+	#insert material_fp
+
 	vec2 st = gl_FragCoord.st * pixelScale;
 	vec4 occlusion = vec4( 0.0 );
 	vec4 total = vec4( 0.0 );

src/engine/renderer/tr_backend.cpp

@@ -2652,6 +2652,41 @@ static void RB_RenderPostProcess()
 	GL_CheckErrors();
 }
 
+static void SetFrameUniforms() {
+	// This can happen with glsl_restart/vid_restart in R_SyncRenderThread()
+	if ( !stagingBuffer.Active() ) {
+		return;
+	}
+
+	GLIMP_LOGCOMMENT( "--- SetFrameUniforms ---" );
+
+	uint32_t* data = pushBuffer.MapGlobalUniformData( GLUniform::FRAME );
+
+	globalUBOProxy->SetUniform_blurVec( backEnd.refdef.blurVec );
+	globalUBOProxy->SetUniform_numLights( backEnd.refdef.numLights );
+
+	globalUBOProxy->SetUniform_ColorModulate( backEnd.viewParms.gradingWeights );
+	globalUBOProxy->SetUniform_InverseGamma( 1.0f / r_gamma->value );
+
+	const bool tonemap = r_toneMapping.Get() && r_highPrecisionRendering.Get() && glConfig2.textureFloatAvailable;
+	if ( tonemap ) {
+		vec4_t tonemapParms{ r_toneMappingContrast.Get(), r_toneMappingHighlightsCompressionSpeed.Get() };
+		ComputeTonemapParams( tonemapParms[0], tonemapParms[1], r_toneMappingHDRMax.Get(),
+			r_toneMappingDarkAreaPointHDR.Get(), r_toneMappingDarkAreaPointLDR.Get(), tonemapParms[2], tonemapParms[3] );
+		globalUBOProxy->SetUniform_TonemapParms( tonemapParms );
+		globalUBOProxy->SetUniform_TonemapExposure( r_toneMappingExposure.Get() );
+	}
+	globalUBOProxy->SetUniform_Tonemap( tonemap );
+
+	if ( glConfig2.usingMaterialSystem ) {
+		materialSystem.SetFrameUniforms();
+	}
+
+	globalUBOProxy->WriteUniformsToBuffer( data, GLShader::PUSH, GLUniform::FRAME );
+
+	pushBuffer.PushGlobalUniforms();
+}
+
 /*
 ============================================================================
 
@@ -3630,6 +3665,11 @@ void RB_ExecuteRenderCommands( const void *data )
 
 
 	materialSystem.frameStart = true;
+
+	if ( glConfig2.pushBufferAvailable ) {
+		SetFrameUniforms();
+	}
+
 	while ( cmd != nullptr )
 	{
 		cmd = cmd->ExecuteSelf();