Also mark material system shaders for building

Author: VReaperV

src/engine/renderer/GeometryOptimiser.cpp

@@ -451,6 +451,7 @@ std::vector<MaterialSurface> OptimiseMapGeometryMaterial(bspSurface_t** renderer
 	// std::unordered_map<TriEdge, TriIndex> triEdges;
 
 	vec3_t worldBounds[2] = {};
+	materialSystem.buildOneShader = false;
 	for ( int i = 0; i < numSurfaces; i++ ) {
 		bspSurface_t* surface = rendererSurfaces[i];
 
@@ -486,6 +487,8 @@ std::vector<MaterialSurface> OptimiseMapGeometryMaterial(bspSurface_t** renderer
 		materialSurfaces.emplace_back( srf );
 	}
 
+	materialSystem.buildOneShader = true;
+
 	materialSystem.GenerateWorldMaterialsBuffer();
 	materialSystem.GeneratePortalBoundingSpheres();
 	materialSystem.SetWorldBounds( worldBounds );

src/engine/renderer/Material.cpp

@@ -1011,7 +1011,7 @@ void ProcessMaterialGeneric3D( Material* material, shaderStage_t* pStage, Materi
 	material->hasDepthFade = hasDepthFade;
 	gl_genericShaderMaterial->SetDepthFade( hasDepthFade );
 
-	material->program = gl_genericShaderMaterial->GetProgram( pStage->deformIndex );
+	material->program = gl_genericShaderMaterial->GetProgram( pStage->deformIndex, materialSystem.buildOneShader );
 }
 
 void ProcessMaterialLightMapping( Material* material, shaderStage_t* pStage, MaterialSurface* surface ) {
@@ -1053,7 +1053,7 @@ void ProcessMaterialLightMapping( Material* material, shaderStage_t* pStage, Mat
 
 	gl_lightMappingShaderMaterial->SetPhysicalShading( pStage->enablePhysicalMapping );
 
-	material->program = gl_lightMappingShaderMaterial->GetProgram( pStage->deformIndex );
+	material->program = gl_lightMappingShaderMaterial->GetProgram( pStage->deformIndex, materialSystem.buildOneShader );
 }
 
 void ProcessMaterialReflection( Material* material, shaderStage_t* pStage, MaterialSurface* /* surface */ ) {
@@ -1067,31 +1067,31 @@ void ProcessMaterialReflection( Material* material, shaderStage_t* pStage, Mater
 
 	gl_reflectionShaderMaterial->SetReliefMapping( pStage->enableReliefMapping );
 
-	material->program = gl_reflectionShaderMaterial->GetProgram( pStage->deformIndex );
+	material->program = gl_reflectionShaderMaterial->GetProgram( pStage->deformIndex, materialSystem.buildOneShader );
 }
 
 void ProcessMaterialSkybox( Material* material, shaderStage_t* pStage, MaterialSurface* /* surface */ ) {
 	material->shader = gl_skyboxShaderMaterial;
 
 	material->deformIndex = pStage->deformIndex;
 
-	material->program = gl_skyboxShaderMaterial->GetProgram( pStage->deformIndex );
+	material->program = gl_skyboxShaderMaterial->GetProgram( pStage->deformIndex, materialSystem.buildOneShader );
 }
 
 void ProcessMaterialScreen( Material* material, shaderStage_t* pStage, MaterialSurface* /* surface */ ) {
 	material->shader = gl_screenShaderMaterial;
 
 	material->deformIndex = pStage->deformIndex;
 
-	material->program = gl_screenShaderMaterial->GetProgram( pStage->deformIndex );
+	material->program = gl_screenShaderMaterial->GetProgram( pStage->deformIndex, materialSystem.buildOneShader );
 }
 
 void ProcessMaterialHeatHaze( Material* material, shaderStage_t* pStage, MaterialSurface* ) {
 	material->shader = gl_heatHazeShaderMaterial;
 
 	material->deformIndex = pStage->deformIndex;
 
-	material->program = gl_heatHazeShaderMaterial->GetProgram( pStage->deformIndex );
+	material->program = gl_heatHazeShaderMaterial->GetProgram( pStage->deformIndex, materialSystem.buildOneShader );
 }
 
 void ProcessMaterialLiquid( Material* material, shaderStage_t* pStage, MaterialSurface* surface ) {
@@ -1115,14 +1115,14 @@ void ProcessMaterialLiquid( Material* material, shaderStage_t* pStage, MaterialS
 
 	gl_liquidShaderMaterial->SetGridLighting( lightMode == lightMode_t::GRID );
 
-	material->program = gl_liquidShaderMaterial->GetProgram( pStage->deformIndex );
+	material->program = gl_liquidShaderMaterial->GetProgram( pStage->deformIndex, materialSystem.buildOneShader );
 }
 
 void ProcessMaterialFog( Material* material, shaderStage_t* pStage, MaterialSurface* surface ) {
 	material->shader = gl_fogQuake3ShaderMaterial;
 	material->fog = surface->fog;
 
-	material->program = gl_fogQuake3ShaderMaterial->GetProgram( pStage->deformIndex );
+	material->program = gl_fogQuake3ShaderMaterial->GetProgram( pStage->deformIndex, materialSystem.buildOneShader );
 }
 
 void MaterialSystem::AddStage( MaterialSurface* surface, shaderStage_t* pStage, uint32_t stage,
@@ -1742,6 +1742,8 @@ void MaterialSystem::Free() {
 		}
 	}
 
+	buildOneShader = true;
+
 	totalDrawSurfs = 0;
 
 	currentFrame = 0;

src/engine/renderer/Material.h

@@ -339,6 +339,8 @@ class MaterialSystem {
 	uint32_t totalPortals;
 	std::vector<shader_t*> skyShaders;
 
+	bool buildOneShader = true;
+
 	std::vector<Material*> renderedMaterials;
 
 	/* MaterialPack is an abstraction to match a range of materials with the 3 different calls to RB_RenderDrawSurfaces()

src/engine/renderer/gl_shader.cpp

@@ -2353,14 +2353,14 @@ void GLShader::MarkProgramForBuilding( int deformIndex ) {
 	shaderProgramsToBuild[index] = true;
 }
 
-GLuint GLShader::GetProgram( int deformIndex ) {
+GLuint GLShader::GetProgram( int deformIndex, const bool buildOneShader ) {
 	int macroIndex = SelectProgram();
 	size_t index = macroIndex + ( size_t( deformIndex ) << _compileMacros.size() );
 
 	// program may not be loaded yet because the shader manager hasn't yet gotten to it
 	// so try to load it now
 	if ( index >= shaderPrograms.size() || !shaderPrograms[index].id ) {
-		gl_shaderManager.BuildPermutation( this, macroIndex, deformIndex, true );
+		gl_shaderManager.BuildPermutation( this, macroIndex, deformIndex, buildOneShader );
 	}
 
 	// program is still not loaded

src/engine/renderer/gl_shader.h

@@ -186,7 +186,7 @@ class GLShader {
 	int SelectProgram();
 public:
 	void MarkProgramForBuilding( int deformIndex );
-	GLuint GetProgram( int deformIndex );
+	GLuint GetProgram( int deformIndex, const bool buildOneShader );
 	void BindProgram( int deformIndex );
 	void DispatchCompute( const GLuint globalWorkgroupX, const GLuint globalWorkgroupY, const GLuint globalWorkgroupZ );
 	void DispatchComputeIndirect( const GLintptr indirectBuffer );