Defer shader building

This will be required for PushBuffer.

Author: VReaperV

src/engine/renderer/gl_shader.cpp

@@ -2992,7 +2992,7 @@ void GLShader_fxaa::SetShaderProgramUniforms( ShaderProgramDescriptor *shaderPro
 
 GLShader_cull::GLShader_cull() :
 	GLShader( "cull",
-		false, "cull" ),
+		false, "cull", true ),
 	u_Frame( this ),
 	u_ViewID( this ),
 	u_SurfaceDescriptorsCount( this ),

src/engine/renderer/gl_shader.h

@@ -103,6 +103,8 @@ class GLShader {
 
 	GLuint std430Size = 0;
 	uint32_t padding = 0;
+
+	const bool worldShader;
 protected:
 	int _activeMacros = 0;
 	ShaderProgramDescriptor* currentProgram;
@@ -131,19 +133,21 @@ class GLShader {
 		fragmentShaderName( newFragmentShaderName ),
 		hasVertexShader( true ),
 		hasFragmentShader( true ),
-		hasComputeShader( false ) {
+		hasComputeShader( false ),
+		worldShader( false ) {
 	}
 
 	GLShader( const std::string& name,
 		const bool useMaterialSystem,
-		const std::string newComputeShaderName ) :
+		const std::string newComputeShaderName, const bool newWorldShader = false ) :
 		_name( name ),
 		_vertexAttribsRequired( 0 ),
 		_useMaterialSystem( useMaterialSystem ),
 		computeShaderName( newComputeShaderName ),
 		hasVertexShader( false ),
 		hasFragmentShader( false ),
-		hasComputeShader( true ) {
+		hasComputeShader( true ),
+		worldShader( newWorldShader ) {
 	}
 
 public:
@@ -387,19 +391,34 @@ class GLShaderManager {
 	void GenerateWorldHeaders();
 
 	template<class T>
-	void LoadShader( T *& shader ) {
-		if( !deformShaderCount ) {
+	void LoadShader( T*& shader ) {
+		if ( !deformShaderCount ) {
 			Q_UNUSED( GetDeformShaderIndex( nullptr, 0 ) );
 			initTime = 0;
 			initCount = 0;
 		}
 
 		shader = new T();
-		InitShader( shader );
 		_shaders.emplace_back( shader );
 		_shaderBuildQueue.push( shader );
 	}
 
+	void InitShaders() {
+		for ( const std::unique_ptr<GLShader>& shader : _shaders ) {
+			if ( !shader.get()->worldShader ) {
+				InitShader( shader.get() );
+			}
+		}
+	}
+
+	void InitWorldShaders() {
+		for ( const std::unique_ptr<GLShader>& shader : _shaders ) {
+			if ( shader.get()->worldShader ) {
+				InitShader( shader.get() );
+			}
+		}
+	}
+
 	int GetDeformShaderIndex( deformStage_t *deforms, int numDeforms );
 
 	bool BuildPermutation( GLShader* shader, int macroIndex, int deformIndex, const bool buildOneShader );

src/engine/renderer/tr_shade.cpp

@@ -190,10 +190,10 @@ void GLSL_InitWorldShaders() {
 
 	// Material system shaders that are always loaded if material system is available
 	if ( glConfig2.usingMaterialSystem ) {
-		gl_shaderManager.LoadShader( gl_cullShader );
-
 		gl_cullShader->MarkProgramForBuilding( 0 );
 	}
+
+	gl_shaderManager.InitWorldShaders();
 }
 
 static void GLSL_InitGPUShadersOrError()
@@ -224,6 +224,9 @@ static void GLSL_InitGPUShadersOrError()
 		gl_shaderManager.LoadShader( gl_lightMappingShaderMaterial );
 
 		gl_shaderManager.LoadShader( gl_clearSurfacesShader );
+		/* Load gl_cullShader so we can post-process it correctly for push buffer,
+		it will only actually be built in GLSL_InitWorldShaders() */
+		gl_shaderManager.LoadShader( gl_cullShader );
 		gl_shaderManager.LoadShader( gl_processSurfacesShader );
 		gl_shaderManager.LoadShader( gl_depthReductionShader );
 
@@ -320,7 +323,6 @@ static void GLSL_InitGPUShadersOrError()
 
 		gl_contrastShader->MarkProgramForBuilding( 0 );
 	}
-
 
 	// portal process effect
 	gl_shaderManager.LoadShader( gl_portalShader );
@@ -371,6 +373,8 @@ static void GLSL_InitGPUShadersOrError()
 		gl_fxaaShader->MarkProgramForBuilding( 0 );
 	}
 
+	gl_shaderManager.InitShaders();
+
 	if ( r_lazyShaders.Get() == 0 )
 	{
 		gl_shaderManager.BuildAll( false );