tr_image: create two fog images for naive and sRGB pipelines

Author: illwieckz

src/engine/renderer/tr_bsp.cpp

@@ -3954,6 +3954,8 @@ void R_LoadEntities( lump_t *l, std::string &externalEntities )
 			tr.convertColorFromSRGB = convertColorFromSRGB_cheap;
 		}
 	}
+
+	tr.fogImage =  tr.worldLinearizeTexture ? tr.fogImageLinear : tr.fogImageNaive;
 }
 
 /*

src/engine/renderer/tr_image.cpp

@@ -2405,26 +2405,27 @@ static void R_CreateFogImage()
 {
 	// Fog image is always created because disabling fog is cheat.
 
-	int   x, y;
-	byte  *data, *ptr;
-	float d;
-	float borderColor[ 4 ];
-
 	constexpr int FOG_S = 256;
 	constexpr int FOG_T = 32;
 
-	ptr = data = (byte*) ri.Hunk_AllocateTempMemory( FOG_S * FOG_T * 4 );
+	byte *dataNaive, *ptrNaive;
+	byte *dataLinear, *ptrLinear;
+	ptrNaive = dataNaive = (byte*) ri.Hunk_AllocateTempMemory( FOG_S * FOG_T * 4 );
+	ptrLinear = dataLinear = (byte*) ri.Hunk_AllocateTempMemory( FOG_S * FOG_T * 4 );
 
 	// S is distance, T is depth
-	for ( y = 0; y < FOG_T; y++ )
+	for ( int y = 0; y < FOG_T; y++ )
 	{
-		for ( x = 0; x < FOG_S; x++ )
+		for ( int x = 0; x < FOG_S; x++ )
 		{
-			d = R_FogFactor( ( x + 0.5f ) / FOG_S, ( y + 0.5f ) / FOG_T );
+			float d = R_FogFactor( ( x + 0.5f ) / FOG_S, ( y + 0.5f ) / FOG_T );
 
-			ptr[ 0 ] = ptr[ 1 ] = ptr[ 2 ] = 255;
-			ptr[ 3 ] = 255 * d;
-			ptr += 4;
+			ptrNaive[ 0 ] = ptrNaive[ 1 ] = ptrNaive[ 2 ] = 255;
+			ptrLinear[ 0 ] = ptrLinear[ 1 ] = ptrLinear[ 2 ] = 255;
+			ptrNaive[ 3 ] = 255 * d;
+			ptrLinear[ 3 ] = 255 * convertFromSRGB( d );
+			ptrNaive += 4;
+			ptrLinear += 4;
 		}
 	}
 
@@ -2436,13 +2437,18 @@ static void R_CreateFogImage()
 	imageParams.filterType = filterType_t::FT_DEFAULT;
 	imageParams.wrapType = wrapTypeEnum_t::WT_CLAMP;
 
-	tr.fogImage = R_CreateImage( "_fog", ( const byte ** ) &data, FOG_S, FOG_T, 1, imageParams );
-	ri.Hunk_FreeTempMemory( data );
+	tr.fogImageNaive = R_CreateImage( "_fogNaive", ( const byte ** ) &dataNaive, FOG_S, FOG_T, 1, imageParams );
+	tr.fogImageLinear = R_CreateImage( "_fogLinear", ( const byte ** ) &dataLinear, FOG_S, FOG_T, 1, imageParams );
+
+	ri.Hunk_FreeTempMemory( dataNaive );
+	ri.Hunk_FreeTempMemory( dataLinear );
+
+	/* Just to be safe and not leave a null pointer in the wild.
+	This is modified when a map is loaded. */
+	tr.fogImage = tr.fogImageNaive;
 
-	borderColor[ 0 ] = 1.0;
-	borderColor[ 1 ] = 1.0;
-	borderColor[ 2 ] = 1.0;
-	borderColor[ 3 ] = 1;
+	vec4_t borderColor;
+	Vector4Set( borderColor, 1.0f, 1.0f, 1.0f, 1.0f );
 
 	glTexParameterfv( GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, borderColor );
 }

src/engine/renderer/tr_local.h

@@ -2449,7 +2449,9 @@ enum
 
 		image_t    *defaultImage;
 		image_t    *cinematicImage[ MAX_IN_GAME_VIDEOS ];
-		image_t    *fogImage;
+		image_t    *fogImage; // Will be set to either fogImageNaive or fogImageSrgb.
+		image_t    *fogImageNaive;
+		image_t    *fogImageLinear;
 		image_t    *whiteImage; // full of 0xff
 		image_t    *blackImage; // full of 0x0
 		image_t    *redImage;