Add GlobalUBOProxy

Will be required for `PushBuffer` to set global uniform values outside of their shaders.

Author: VReaperV

src/engine/renderer/gl_shader.cpp

@@ -77,6 +77,7 @@ GLShader_screen                          *gl_screenShader = nullptr;
 GLShader_screenMaterial                  *gl_screenShaderMaterial = nullptr;
 GLShader_skybox                          *gl_skyboxShader = nullptr;
 GLShader_skyboxMaterial                  *gl_skyboxShaderMaterial = nullptr;
+GlobalUBOProxy                           *globalUBOProxy = nullptr;
 GLShaderManager                           gl_shaderManager;
 
 namespace // Implementation details
@@ -3082,3 +3083,38 @@ GLShader_processSurfaces::GLShader_processSurfaces() :
 	u_ViewID( this ),
 	u_SurfaceCommandsOffset( this ) {
 }
+
+GlobalUBOProxy::GlobalUBOProxy() :
+	/* HACK: A GLShader* is required to initialise uniforms,
+	but we don't need the GLSL shader itself, so we won't actually build it */
+	GLShader( "proxy", 0,
+		false, "screenSpace", "generic", true ),
+	// CONST
+	u_ColorMap3D( this ),
+	u_DepthMap( this ),
+	u_PortalMap( this ),
+	u_FogMap( this ),
+	u_DepthTile1( this ),
+	u_DepthTile2( this ),
+	u_LightTiles( this ),
+	u_LightGrid1( this ),
+	u_LightGrid2( this ),
+	u_LightGridOrigin( this ),
+	u_LightGridScale( this ),
+	u_GlobalLightFactor( this ),
+	u_FirstPortalGroup( this ),
+	u_TotalPortals( this ),
+	u_SurfaceDescriptorsCount( this ),
+	u_ProfilerZero( this ),
+	// FRAME
+	u_Frame( this ),
+	u_UseFrustumCulling( this ),
+	u_UseOcclusionCulling( this ),
+	u_blurVec( this ),
+	u_numLights( this ),
+	u_ColorModulate( this ),
+	u_InverseGamma( this ),
+	u_Tonemap( this ),
+	u_TonemapParms( this ),
+	u_TonemapExposure( this ) {
+}

src/engine/renderer/gl_shader.h

@@ -3793,6 +3793,41 @@ class GLShader_processSurfaces :
 	GLShader_processSurfaces();
 };
 
+class GlobalUBOProxy :
+	public GLShader,
+	// CONST
+	public u_ColorMap3D,
+	public u_DepthMap,
+	public u_PortalMap,
+	public u_FogMap,
+	public u_DepthTile1,
+	public u_DepthTile2,
+	public u_LightTiles,
+	public u_LightGrid1,
+	public u_LightGrid2,
+	public u_LightGridOrigin,
+	public u_LightGridScale,
+	public u_GlobalLightFactor,
+	public u_FirstPortalGroup,
+	public u_TotalPortals,
+	public u_SurfaceDescriptorsCount,
+	public u_ProfilerZero,
+	// FRAME
+	public u_Frame,
+	public u_UseFrustumCulling,
+	public u_UseOcclusionCulling,
+	public u_blurVec,
+	public u_numLights,
+	public u_ColorModulate,
+	public u_InverseGamma,
+	public u_Tonemap,
+	public u_TonemapParms,
+	public u_TonemapExposure {
+
+	public:
+	GlobalUBOProxy();
+};
+
 
 std::string GetShaderPath();
 
@@ -3832,6 +3867,7 @@ extern GLShader_screen                          *gl_screenShader;
 extern GLShader_screenMaterial                  *gl_screenShaderMaterial;
 extern GLShader_skybox                          *gl_skyboxShader;
 extern GLShader_skyboxMaterial                  *gl_skyboxShaderMaterial;
+extern GlobalUBOProxy                           *globalUBOProxy;
 extern GLShaderManager                           gl_shaderManager;
 
 #endif // GL_SHADER_H

src/engine/renderer/tr_shade.cpp

@@ -217,6 +217,8 @@ static void GLSL_InitGPUShadersOrError()
 	// standard light mapping
 	gl_shaderManager.LoadShader( gl_lightMappingShader );
 
+	gl_shaderManager.LoadShader( globalUBOProxy );
+
 	// Material system shaders that are always loaded if material system is available
 	if ( glConfig2.usingMaterialSystem )
 	{
@@ -458,6 +460,7 @@ void GLSL_ShutdownGPUShaders()
 
 	gl_genericShader = nullptr;
 	gl_genericShaderMaterial = nullptr;
+	globalUBOProxy = nullptr;
 	gl_cullShader = nullptr;
 	gl_depthReductionShader = nullptr;
 	gl_clearSurfacesShader = nullptr;