tr_shader: add the naiveBlend keyword

Author: illwieckz

src/engine/renderer/tr_init.cpp

@@ -1283,7 +1283,7 @@ ScreenshotCmd screenshotPNGRegistration("screenshotPNG", ssFormat_t::SSF_PNG, "p
 	}
 
 	static float convertFloatFromSRGB_NOP( float f ) { return f; }
-	static Color::Color convertColorFromSRGB_NOP( Color::Color c ) { return c; }
+	Color::Color convertColorFromSRGB_NOP( Color::Color c ) { return c; }
 
 	/*
 	===============

src/engine/renderer/tr_local.h

@@ -979,6 +979,11 @@ enum
 		ALL = BIT( 3 )
 	};
 
+	using floatProcessor_t = float(*)(float);
+	using colorProcessor_t = Color::Color(*)(Color::Color);
+
+	Color::Color convertColorFromSRGB_NOP( Color::Color c );
+
 	struct shaderStage_t
 	{
 		stageType_t     type;
@@ -998,6 +1003,8 @@ enum
 		stageShaderBinder_t shaderBinder;
 		stageMaterialProcessor_t materialProcessor;
 
+		colorProcessor_t convertColorFromSRGB;
+
 		textureBundle_t bundle[ MAX_TEXTURE_BUNDLES ];
 
 		expression_t    ifExp;
@@ -1269,6 +1276,8 @@ enum
 	                       | GLS_BLUEMASK_FALSE
 	                       | GLS_ALPHAMASK_FALSE,
 
+	  GLS_NAIVEBLEND = ( 1 << 30 ),
+
 	  GLS_DEFAULT = GLS_DEPTHMASK_TRUE
 	};
 
@@ -2397,9 +2406,6 @@ enum
 		int       h;
 	};
 
-	using floatProcessor_t = float(*)(float);
-	using colorProcessor_t = Color::Color(*)(Color::Color);
-
 	/*
 	** trGlobals_t
 	**

src/engine/renderer/tr_shade.cpp

@@ -1698,7 +1698,7 @@ void Tess_ComputeColor( shaderStage_t *pStage )
 			{
 				tess.svars.color = pStage->constantColor;
 				tess.svars.color.Clamp();
-				tess.svars.color = tr.convertColorFromSRGB( tess.svars.color );
+				tess.svars.color = pStage->convertColorFromSRGB( tess.svars.color );
 				break;
 			}
 
@@ -1708,7 +1708,7 @@ void Tess_ComputeColor( shaderStage_t *pStage )
 				{
 					tess.svars.color = backEnd.currentEntity->e.shaderRGBA;
 					tess.svars.color.Clamp();
-					tess.svars.color = tr.convertColorFromSRGB( tess.svars.color );
+					tess.svars.color = pStage->convertColorFromSRGB( tess.svars.color );
 				}
 				else
 				{
@@ -1724,7 +1724,7 @@ void Tess_ComputeColor( shaderStage_t *pStage )
 				{
 					tess.svars.color = backEnd.currentEntity->e.shaderRGBA;
 					tess.svars.color.Clamp();
-					tess.svars.color = tr.convertColorFromSRGB( tess.svars.color );
+					tess.svars.color = pStage->convertColorFromSRGB( tess.svars.color );
 				}
 				else
 				{
@@ -1757,7 +1757,7 @@ void Tess_ComputeColor( shaderStage_t *pStage )
 
 				tess.svars.color = Color::White * glow;
 				tess.svars.color.Clamp();
-				tess.svars.color = tr.convertColorFromSRGB( tess.svars.color );
+				tess.svars.color = pStage->convertColorFromSRGB( tess.svars.color );
 				break;
 			}
 

src/engine/renderer/tr_shader.cpp

@@ -1488,6 +1488,16 @@ static bool LoadMap( shaderStage_t *stage, const char *buffer, stageType_t type,
 			{
 				case stageType_t::ST_COLORMAP:
 				case stageType_t::ST_DIFFUSEMAP:
+					{
+						bool naiveBlend = stage->stateBits & GLS_NAIVEBLEND;
+
+						if ( !naiveBlend )
+						{
+							imageParams.bits |= IF_SRGB;
+							stage->convertColorFromSRGB = tr.convertColorFromSRGB;
+						}
+					}
+					break;
 				case stageType_t::ST_GLOWMAP:
 				case stageType_t::ST_REFLECTIONMAP:
 				case stageType_t::ST_SKYBOXMAP:
@@ -2074,12 +2084,15 @@ static bool ParseStage( shaderStage_t *stage, const char **text )
 	const char *token;
 	int          colorMaskBits = 0;
 	int depthMaskBits = GLS_DEPTHMASK_TRUE, blendSrcBits = 0, blendDstBits = 0, atestBits = 0, depthFuncBits = 0, polyModeBits = 0;
+	int naiveBlendBits = 0;
 	bool     depthMaskExplicit = false;
 	int          imageBits = 0;
 	filterType_t filterType;
 	char         buffer[ 1024 ] = "";
 	bool     loadMap = false;
 
+	stage->convertColorFromSRGB = convertColorFromSRGB_NOP;
+
 	memset( delayedStageTextures, 0, sizeof( delayedStageTextures ) );
 
 	while ( true )
@@ -2648,6 +2661,10 @@ static bool ParseStage( shaderStage_t *stage, const char **text )
 				depthMaskBits = 0;
 			}
 		}
+		else if ( !Q_stricmp( token, "naiveBlend" ) )
+		{
+			naiveBlendBits |= GLS_NAIVEBLEND;
+		}
 		// stage <type>
 		else if ( !Q_stricmp( token, "stage" ) )
 		{
@@ -3336,7 +3353,7 @@ static bool ParseStage( shaderStage_t *stage, const char **text )
 	}
 
 	// compute state bits
-	stage->stateBits = colorMaskBits | depthMaskBits | blendSrcBits | blendDstBits | atestBits | depthFuncBits | polyModeBits;
+	stage->stateBits = colorMaskBits | depthMaskBits | blendSrcBits | blendDstBits | atestBits | depthFuncBits | polyModeBits | naiveBlendBits;
 
 	// Do not load heatHaze maps when r_heatHaze is disabled.
 	if ( stage->type == stageType_t::ST_HEATHAZEMAP && !r_heatHaze->integer )