renderer/tr_shader: disable useless heightMapInNormalMap if both norm…

…al and relief mapping are disabled, also fix #376
DaemonEngine · Oct 12, 2020 · e40828d · e40828d
1 parent 5bd030d
commit e40828d
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/engine/renderer/tr_shader.cpp b/src/engine/renderer/tr_shader.cpp
@@ -4819,6 +4819,10 @@ static void CollapseStages()
 		stage->enableSpecularMapping = r_specularMapping->integer && stage->hasMaterialMap && !stage->isMaterialPhysical;
 		stage->enableGlowMapping = r_glowMapping->integer && stage->hasGlowMap;
 
+		// Finally disable useless heightMapInNormalMap if both normal and relief mapping are disabled.
+		// see https://github.com/DaemonEngine/Daemon/issues/376
+		stage->isHeightMapInNormalMap = stage->isHeightMapInNormalMap && ( stage->enableNormalMapping || stage->enableReliefMapping );
+
 		// Bind fallback textures if required.
 		if ( !stage->enableNormalMapping && !( stage->enableReliefMapping && stage->isHeightMapInNormalMap) )
 		{