tr_shader: delayed image loading

Author: illwieckz

src/engine/renderer/tr_local.h

@@ -1000,6 +1000,10 @@ enum
 
 		textureBundle_t bundle[ MAX_TEXTURE_BUNDLES ];
 
+		bool collapsedStages[ MAX_TEXTURE_BUNDLES ];
+		stageType_t collapsedStageTypes[ MAX_TEXTURE_BUNDLES ];
+		char collapsedStageTextures[ MAX_TEXTURE_BUNDLES ][ MAX_QPATH ];
+
 		expression_t    ifExp;
 
 		waveForm_t      rgbWave;

src/engine/renderer/tr_shader.cpp

@@ -1591,6 +1591,14 @@ static bool ParseClampType( const char *token, wrapType_t *clamp )
 	return true;
 }
 
+static void DelayMapLoading( shaderStage_t *stage, const char* texturePath, const stageType_t stageType, const int bundleIndex )
+{
+	Log::Debug("Delaying the loading of texture %s", texturePath );
+	strncpy( stage->collapsedStageTextures[ bundleIndex ], texturePath, MAX_QPATH - 1 );
+	stage->collapsedStageTypes[ bundleIndex ] = stageType;
+	stage->collapsedStages[ bundleIndex ] = true;
+}
+
 /*
 ===================
 ParseDifuseMap
@@ -1603,7 +1611,16 @@ static void ParseDiffuseMap( shaderStage_t *stage, const char **text, const int
 
 	if ( ParseMap( text, buffer, sizeof( buffer ) ) )
 	{
-		LoadMap( stage, buffer, stageType_t::ST_DIFFUSEMAP, bundleIndex );
+		stageType_t stageType = stageType_t::ST_DIFFUSEMAP;
+
+		if ( bundleIndex == TB_DIFFUSEMAP )
+		{
+			DelayMapLoading( stage, buffer, stageType, bundleIndex );
+		}
+		else
+		{
+			LoadMap( stage, buffer, stageType, bundleIndex );
+		}
 	}
 }
 
@@ -1632,7 +1649,16 @@ static void ParseNormalMap( shaderStage_t *stage, const char **text, const int b
 
 	if ( ParseMap( text, buffer, sizeof( buffer ) ) )
 	{
-		LoadMap( stage, buffer, stageType_t::ST_NORMALMAP, bundleIndex );
+		stageType_t stageType = stageType_t::ST_NORMALMAP;
+
+		if ( bundleIndex == TB_NORMALMAP )
+		{
+			DelayMapLoading( stage, buffer, stageType, bundleIndex );
+		}
+		else
+		{
+			LoadMap( stage, buffer, stageType, bundleIndex );
+		}
 	}
 }
 
@@ -1697,7 +1723,16 @@ static void ParseHeightMap( shaderStage_t *stage, const char **text, const int b
 
 	if ( ParseMap( text, buffer, sizeof( buffer ) ) )
 	{
-		LoadMap( stage, buffer, stageType_t::ST_HEIGHTMAP, bundleIndex );
+		stageType_t stageType = stageType_t::ST_HEIGHTMAP;
+
+		if ( bundleIndex == TB_HEIGHTMAP )
+		{
+			DelayMapLoading( stage, buffer, stageType, bundleIndex );
+		}
+		else
+		{
+			LoadMap( stage, buffer, stageType, bundleIndex );
+		}
 	}
 }
 
@@ -1709,7 +1744,16 @@ static void ParseSpecularMap( shaderStage_t *stage, const char **text, const int
 
 	if ( ParseMap( text, buffer, sizeof( buffer ) ) )
 	{
-		LoadMap( stage, buffer, stageType_t::ST_SPECULARMAP, bundleIndex );
+		stageType_t stageType = stageType_t::ST_SPECULARMAP;
+
+		if ( bundleIndex == TB_SPECULARMAP )
+		{
+			DelayMapLoading( stage, buffer, stageType, bundleIndex );
+		}
+		else
+		{
+			LoadMap( stage, buffer, stageType, bundleIndex );
+		}
 	}
 }
 
@@ -1733,7 +1777,16 @@ static void ParsePhysicalMap( shaderStage_t *stage, const char **text, const int
 
 	if ( ParseMap( text, buffer, sizeof( buffer ) ) )
 	{
-		LoadMap( stage, buffer, stageType_t::ST_PHYSICALMAP, bundleIndex );
+		stageType_t stageType = stageType_t::ST_PHYSICALMAP;
+
+		if ( bundleIndex == TB_PHYSICALMAP )
+		{
+			DelayMapLoading( stage, buffer, stageType, bundleIndex );
+		}
+		else
+		{
+			LoadMap( stage, buffer, stageType, bundleIndex );
+		}
 	}
 }
 
@@ -1745,7 +1798,16 @@ static void ParseGlowMap( shaderStage_t *stage, const char **text, const int bun
 
 	if ( ParseMap( text, buffer, sizeof( buffer ) ) )
 	{
-		LoadMap( stage, buffer, stageType_t::ST_GLOWMAP, bundleIndex );
+		stageType_t stageType = stageType_t::ST_GLOWMAP;
+
+		if ( bundleIndex == TB_GLOWMAP )
+		{
+			DelayMapLoading( stage, buffer, stageType, bundleIndex );
+		}
+		else
+		{
+			LoadMap( stage, buffer, stageType, bundleIndex );
+		}
 	}
 }
 
@@ -3273,6 +3335,25 @@ static bool ParseStage( shaderStage_t *stage, const char **text )
 		return true;
 	}
 
+	for ( int bundleIndex = 0; bundleIndex < MAX_TEXTURE_BUNDLES; bundleIndex++ )
+	{
+		if ( !stage->collapsedStages[ bundleIndex ] )
+		{
+			continue;
+		}
+
+		if ( bundleIndex == TB_COLORMAP && loadMap )
+		{
+			continue;
+		}
+
+		stageType_t collapsedStage = stage->collapsedStageTypes[ bundleIndex ];
+		char* texturePath = stage->collapsedStageTextures[ bundleIndex ];
+
+		Log::Debug("Loading delayed texture %s", texturePath );
+		LoadMap( stage, texturePath, collapsedStage, bundleIndex );
+	}
+
 	// load image
 	if ( loadMap && !LoadMap( stage, buffer, stage->type ) )
 	{