Fix stages

DaemonEngine · Jul 16, 2024 · bfc9bff · bfc9bff
1 parent 46a56ed
commit bfc9bff
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/engine/renderer/Material.cpp b/src/engine/renderer/Material.cpp
@@ -884,6 +884,7 @@ void MaterialSystem::GenerateWorldMaterialsBuffer() {
 				uint stage = 0;
 				for ( shaderStage_t* pStage = drawSurf->shader->stages; pStage < drawSurf->shader->lastStage; pStage++ ) {
 					if ( drawSurf->materialIDs[stage] != material.id || drawSurf->materialPackIDs[stage] != materialPackID ) {
+						stage++;
 						continue;
 					}
 
@@ -1367,6 +1368,7 @@ static void ProcessMaterialHeatHaze( Material* material, shaderStage_t* pStage,
 
 	material->program = gl_heatHazeShaderMaterial->GetProgram( pStage->deformIndex );
 }
+
 static void ProcessMaterialLiquid( Material* material, shaderStage_t* pStage ) {
 	material->shader = gl_liquidShaderMaterial;
 

diff --git a/src/engine/renderer/tr_shader.cpp b/src/engine/renderer/tr_shader.cpp
@@ -5904,7 +5904,11 @@ static shader_t *FinishShader()
 	shader_t *ret = MakeShaderPermanent();
 
 	if ( glConfig2.materialSystemAvailable && !tr.worldLoaded ) {
-		uint8_t maxStages = ret->numStages;
+		uint8_t maxStages = 0;
+		for ( shaderStage_t* pStage = ret->stages; pStage < ret->lastStage; pStage++ ) {
+			maxStages++;
+		}
+
 		if ( maxStages % 4 != 0 ) { // Aligned to 4 components
 			maxStages = ( maxStages / 4 + 1 ) * 4;
 		}