wip: sRGB specularMap

Author: illwieckz

src/engine/renderer/glsl_source/lightMapping_fp.glsl

@@ -91,13 +91,15 @@ void main()
 		return;
 	}
 
-	/* HACK: emulate two-bits bitfield
-	even: no texture linearization (first bit)
-	less than 2: no lightmap linearization (second bit) */
-	bool linearizeTexture = bool(u_LinearizeTexture % 2);
-	bool linearizeLightMap = u_LinearizeTexture > 1;
+	/* HACK: emulate three-bits bitfield
+	even: no color map linearization (first bit)
+	less than 2: no light map linearization (second bit)
+	positive: no material map linearization (extra bit) */
+	bool linearizeColorMap = bool(u_LinearizeTexture % 2);
+	bool linearizeLightMap = abs(u_LinearizeTexture) > 1;
+	bool linearizeMaterialMap = u_LinearizeTexture < 0;
 
-	convertFromSRGB(diffuse.rgb, linearizeTexture);
+	convertFromSRGB(diffuse.rgb, linearizeColorMap);
 
 	diffuse.rgb *= var_Color.rgb;
 
@@ -107,6 +109,8 @@ void main()
 	// Compute the material term.
 	vec4 material = texture2D(u_MaterialMap, texCoords);
 
+	convertFromSRGB(material.rgb, linearizeMaterialMap);
+
 	// Compute final color.
 	vec4 color;
 	color.a = diffuse.a;
@@ -197,7 +201,7 @@ void main()
 		// Blend glow map.
 		vec3 glow = texture2D(u_GlowMap, texCoords).rgb;
 
-		convertFromSRGB(glow, linearizeTexture);
+		convertFromSRGB(glow, linearizeColorMap);
 
 		/* HACK: use sign to know if there is a light or not, and
 		then if it will receive overbright multiplication or not. */

src/engine/renderer/tr_shader.cpp

@@ -4735,12 +4735,13 @@ static bool ParseShader( const char *_text )
 	return true;
 }
 
-static int packLinearizeTexture( bool linearizeTexture, bool linearizeLightMap )
+static int packLinearizeTexture( bool linearizeColorMap, bool linearizeMaterialMap, bool linearizeLightMap )
 {
-	/* HACK: emulate two-bits bitfield
-	even: no texture linearization (first bit)
-	less than 2: no lightmap linearization (second bit) */
-	return int(linearizeTexture) + ( 2 * int(linearizeLightMap) );
+	/* HACK: emulate three-bits bitfield
+	even: no color map linearization (first bit)
+	less than 2: no light map linearization (second bit)
+	positive: no material map linearization (extra bit) */
+	return ( int(linearizeColorMap) + ( 2 * int(linearizeLightMap) ) ) * ( linearizeMaterialMap ? -1 : 1 );
 }
 
 /*
@@ -5161,28 +5162,6 @@ static void CollapseStages()
 	{
 		shaderStage_t *stage = &stages[ s ];
 
-		switch ( stage->type )
-		{
-			case stageType_t::ST_COLORMAP:
-			case stageType_t::ST_COLLAPSE_COLORMAP:
-			case stageType_t::ST_SKYBOXMAP:
-				stage->linearizeTexture = tr.worldLinearizeTexture;
-				break;
-			case stageType_t::ST_STYLELIGHTMAP:
-			case stageType_t::ST_STYLECOLORMAP:
-				stage->linearizeTexture = tr.worldLinearizeLightMap;
-				break;
-			case stageType_t::ST_LIGHTMAP:
-				stage->linearizeTexture = packLinearizeTexture( false, tr.worldLinearizeLightMap );
-				break;
-			case stageType_t::ST_DIFFUSEMAP:
-			case stageType_t::ST_COLLAPSE_DIFFUSEMAP:
-				stage->linearizeTexture = packLinearizeTexture( tr.worldLinearizeTexture, tr.worldLinearizeLightMap );
-				break;
-			default:
-				break;
-		}
-
 		switch ( stage->type )
 		{
 			case stageType_t::ST_LIGHTMAP:
@@ -5234,6 +5213,31 @@ static void CollapseStages()
 		// see https://github.com/DaemonEngine/Daemon/issues/376
 		stage->isHeightMapInNormalMap = stage->isHeightMapInNormalMap && ( stage->enableNormalMapping || stage->enableReliefMapping );
 
+		switch ( stage->type )
+		{
+			case stageType_t::ST_COLORMAP:
+			case stageType_t::ST_COLLAPSE_COLORMAP:
+			case stageType_t::ST_SKYBOXMAP:
+				stage->linearizeTexture = tr.worldLinearizeTexture;
+				break;
+			case stageType_t::ST_STYLELIGHTMAP:
+			case stageType_t::ST_STYLECOLORMAP:
+				stage->linearizeTexture = tr.worldLinearizeLightMap;
+				break;
+			case stageType_t::ST_LIGHTMAP:
+				stage->linearizeTexture = packLinearizeTexture( false, false, tr.worldLinearizeLightMap );
+				break;
+			case stageType_t::ST_DIFFUSEMAP:
+			case stageType_t::ST_COLLAPSE_DIFFUSEMAP:
+				stage->linearizeTexture = packLinearizeTexture(
+					tr.worldLinearizeTexture,
+					stage->hasMaterialMap && stages->collapseType == collapseType_t::COLLAPSE_PHONG,
+					tr.worldLinearizeLightMap );
+				break;
+			default:
+				break;
+		}
+
 		// Bind fallback textures if required.
 		if ( !stage->enableNormalMapping && !( stage->enableReliefMapping && stage->isHeightMapInNormalMap) )
 		{