Add the remaining code for the global UBO in PushBuffer

VReaperV · VReaperV · commit 00aaab47fbdb · 2025-08-18T08:55:24.000+03:00
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.
diff --git a/src/engine/renderer/GLMemory.cpp b/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();
 
diff --git a/src/engine/renderer/GLMemory.h b/src/engine/renderer/GLMemory.h
@@ -175,6 +175,7 @@ class GLBuffer {
 
 	void DelBuffer() {
 		glDeleteBuffers( 1, &id );
+		id = 0;
 		mapped = false;
 	}
 
@@ -303,6 +304,8 @@ class GLStagingBuffer {
 	void FlushStagingCopyQueue();
 	void FlushAll();
 
+	bool Active() const;
+
 	void InitGLBuffer();
 	void FreeGLBuffer();
 
diff --git a/src/engine/renderer/Material.cpp b/src/engine/renderer/Material.cpp
@@ -1495,9 +1495,24 @@ 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 );
 	gl_clearSurfacesShader->DispatchCompute( MAX_VIEWS, 1, 1 );
 
 	GL_CheckErrors();
@@ -1582,15 +1597,9 @@ void MaterialSystem::CullSurfaces() {
 		uint32_t globalWorkGroupX = surfaceDescriptorsCount % MAX_COMMAND_COUNTERS == 0 ?
 			surfaceDescriptorsCount / MAX_COMMAND_COUNTERS : surfaceDescriptorsCount / MAX_COMMAND_COUNTERS + 1;
 		GL_Bind( depthImage );
-		gl_cullShader->SetUniform_Frame( nextFrame );
 		gl_cullShader->SetUniform_ViewID( view );
-		gl_cullShader->SetUniform_SurfaceDescriptorsCount( surfaceDescriptorsCount );
-		gl_cullShader->SetUniform_UseFrustumCulling( r_gpuFrustumCulling.Get() );
-		gl_cullShader->SetUniform_UseOcclusionCulling( r_gpuOcclusionCulling.Get() );
 		gl_cullShader->SetUniform_CameraPosition( origin );
 		gl_cullShader->SetUniform_ModelViewMatrix( viewMatrix );
-		gl_cullShader->SetUniform_FirstPortalGroup( globalWorkGroupX );
-		gl_cullShader->SetUniform_TotalPortals( totalPortals );
 		gl_cullShader->SetUniform_ViewWidth( depthImage->width );
 		gl_cullShader->SetUniform_ViewHeight( depthImage->height );
 		gl_cullShader->SetUniform_SurfaceCommandsOffset( surfaceCommandsCount * ( MAX_VIEWS * nextFrame + view ) );
@@ -1622,7 +1631,6 @@ void MaterialSystem::CullSurfaces() {
 		gl_cullShader->DispatchCompute( globalWorkGroupX, 1, 1 );
 
 		gl_processSurfacesShader->BindProgram( 0 );
-		gl_processSurfacesShader->SetUniform_Frame( nextFrame );
 		gl_processSurfacesShader->SetUniform_ViewID( view );
 		gl_processSurfacesShader->SetUniform_SurfaceCommandsOffset( surfaceCommandsCount * ( MAX_VIEWS * nextFrame + view ) );
 
diff --git a/src/engine/renderer/Material.h b/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 );
 
diff --git a/src/engine/renderer/gl_shader.cpp b/src/engine/renderer/gl_shader.cpp
@@ -1346,6 +1346,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 );
 			}
@@ -1601,7 +1607,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 );
 
@@ -1610,7 +1616,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 );
 
@@ -2246,7 +2252,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 );
 	}
 }
 
diff --git a/src/engine/renderer/glsl_source/cameraEffects_fp.glsl b/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)
@@ -73,6 +75,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;
 
diff --git a/src/engine/renderer/glsl_source/depthReduction_cp.glsl b/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 );
diff --git a/src/engine/renderer/glsl_source/depthtile1_fp.glsl b/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];
 
diff --git a/src/engine/renderer/glsl_source/depthtile2_fp.glsl b/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 );
diff --git a/src/engine/renderer/glsl_source/fogGlobal_fp.glsl b/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;
 
diff --git a/src/engine/renderer/glsl_source/generic_fp.glsl b/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
diff --git a/src/engine/renderer/glsl_source/lightMapping_fp.glsl b/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;
diff --git a/src/engine/renderer/glsl_source/lighttile_fp.glsl b/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;
diff --git a/src/engine/renderer/glsl_source/liquid_fp.glsl b/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;
diff --git a/src/engine/renderer/glsl_source/material_fp.glsl b/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
diff --git a/src/engine/renderer/glsl_source/motionblur_fp.glsl b/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
diff --git a/src/engine/renderer/glsl_source/ssao_fp.glsl b/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;
 
@@ -52,7 +54,7 @@ vec4 rangeTest( vec4 diff1, vec4 diff2, vec4 deltaX, vec4 deltaY ) {
 
 // Based on AMD HDAO, adapted for lack of normals
 void computeOcclusionForQuad( in vec2 centerTC, in float centerDepth,
-			      in vec2 quadOffset,
+			      in vec2 quadOffset, in sampler2D u_DepthMap,
 			      inout vec4 occlusion, inout vec4 total ) {
 	vec2 tc1 = centerTC + quadOffset * pixelScale;
 	vec2 tc2 = centerTC - quadOffset * pixelScale;
@@ -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 );
@@ -107,7 +111,7 @@ void	main()
 		} else {
 			of = offsets[i].zw;
 		}
-		computeOcclusionForQuad( st, center, spread * of,
+		computeOcclusionForQuad( st, center, spread * of, u_DepthMap,
 					 occlusion, total );
 	}
 
diff --git a/src/engine/renderer/tr_backend.cpp b/src/engine/renderer/tr_backend.cpp
diff --git a/src/engine/renderer/tr_bsp.cpp b/src/engine/renderer/tr_bsp.cpp
diff --git a/src/engine/renderer/tr_shade.cpp b/src/engine/renderer/tr_shade.cpp

Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,10 @@ void GLStagingBuffer::FlushAll() {`
`117`	`117`	`FlushStagingCopyQueue();`
`118`	`118`	`}`
`119`	`119`
	`120`	`+bool GLStagingBuffer::Active() const {`
	`121`	`+ return buffer.id;`
	`122`	`+}`
	`123`	`+`
`120`	`124`	`void GLStagingBuffer::InitGLBuffer() {`
`121`	`125`	`buffer.GenBuffer();`
`122`	`126`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.`
`34`	`34`
`35`	`35`	`/* depthtile1_fp.glsl */`
`36`	`36`
	`37`	`+#define DEPTHMAP_GLSL`
	`38`	`+`
`37`	`39`	`uniform sampler2D u_DepthMap;`
`38`	`40`	`IN(flat) vec3 unprojectionParams;`
`39`	`41`
`@@ -63,6 +65,8 @@ float min16(in vec4 data0, in vec4 data1, in vec4 data2, in vec4 data3)`
`63`	`65`	`}`
`64`	`66`	`void main()`
`65`	`67`	`{`
	`68`	`+ #insert material_fp`
	`69`	`+`
`66`	`70`	`vec2 st = gl_FragCoord.st * 4.0 * pixelScale;`
`67`	`71`	`vec4 depth[4], mask[4];`
`68`	`72`