feat: linear lighting

features/Dynamic Cubemaps/Shaders/DynamicCubemaps/DynamicCubemaps.hlsli

@@ -38,8 +38,8 @@ namespace DynamicCubemaps
 
 		float3 finalIrradiance = 0;
 
-        float directionalAmbientColorSpecular = Color::RGBToLuminance(
-            max(0, mul(SharedData::DirectionalAmbient, float4(R, 1.0)))
+        float directionalAmbientColorSpecular = Color::RGBToLuminance(Color::Ambient(
+            max(0, mul(SharedData::DirectionalAmbient, float4(R, 1.0))))
         ) * Color::ReflectionNormalisationScale;
 
 #		if defined(IBL) && defined(LIGHTING)
@@ -59,7 +59,7 @@ namespace DynamicCubemaps
 			float specularIrradianceLuminance = Color::RGBToLuminance(EnvTexture.SampleLevel(SampColorSampler, R, 15));
 
 			specularIrradiance = (specularIrradiance / max(specularIrradianceLuminance, 0.001)) * directionalAmbientColorSpecular;
-			specularIrradiance = Color::GammaToLinear(specularIrradiance);
+			specularIrradiance = Color::IrradianceToLinear(specularIrradiance);
 
 			finalIrradiance = specularIrradiance;
 			return finalIrradiance;
@@ -79,7 +79,7 @@ namespace DynamicCubemaps
 		    float specularIrradianceReflectionsLuminance = Color::RGBToLuminance(EnvReflectionsTexture.SampleLevel(SampColorSampler, R, 15));
 
 			specularIrradianceReflections = (specularIrradianceReflections / max(specularIrradianceReflectionsLuminance, 0.001)) * directionalAmbientColorSpecular;
-			specularIrradianceReflections = Color::GammaToLinear(specularIrradianceReflections);
+			specularIrradianceReflections = Color::IrradianceToLinear(specularIrradianceReflections);
 		}
 
 		float3 specularIrradiance = 0.0;
@@ -89,12 +89,12 @@ namespace DynamicCubemaps
 
             float specularIrradianceLuminance = Color::RGBToLuminance(EnvTexture.SampleLevel(SampColorSampler, R, 15));
 
-			directionalAmbientColorSpecular = Color::GammaToLinear(directionalAmbientColorSpecular);
+			directionalAmbientColorSpecular = Color::IrradianceToLinear(directionalAmbientColorSpecular);
 			directionalAmbientColorSpecular *= skylightingSpecular;
-			directionalAmbientColorSpecular = Color::LinearToGamma(directionalAmbientColorSpecular);
+			directionalAmbientColorSpecular = Color::IrradianceToGamma(directionalAmbientColorSpecular);
 
 			specularIrradiance = (specularIrradiance / max(specularIrradianceLuminance, 0.001)) * directionalAmbientColorSpecular;
-			specularIrradiance = Color::GammaToLinear(specularIrradiance);
+			specularIrradiance = Color::IrradianceToLinear(specularIrradiance);
 		}
 
 		finalIrradiance = lerp(specularIrradiance, specularIrradianceReflections, skylightingSpecular);
@@ -104,7 +104,7 @@ namespace DynamicCubemaps
 		float specularIrradianceLuminance = Color::RGBToLuminance(EnvReflectionsTexture.SampleLevel(SampColorSampler, R, 15));
 
 		specularIrradiance = (specularIrradiance / max(specularIrradianceLuminance, 0.001)) * directionalAmbientColorSpecular;
-		specularIrradiance = Color::GammaToLinear(specularIrradiance);
+		specularIrradiance = Color::IrradianceToLinear(specularIrradiance);
 
 		finalIrradiance = specularIrradiance;
 #		endif
@@ -154,7 +154,7 @@ namespace DynamicCubemaps
 			float specularIrradianceLuminance = Color::RGBToLuminance(EnvTexture.SampleLevel(SampColorSampler, R, 15));
 
 			specularIrradiance = (specularIrradiance / max(specularIrradianceLuminance, 0.001)) * directionalAmbientColorSpecular;
-			specularIrradiance = Color::GammaToLinear(specularIrradiance);
+			specularIrradiance = Color::IrradianceToLinear(specularIrradiance);
 
 			finalIrradiance = specularIrradiance;
 			return horizon * (F0 * specularBRDF.x + specularBRDF.y) * finalIrradiance;
@@ -176,7 +176,7 @@ namespace DynamicCubemaps
             float specularIrradianceLuminance = Color::RGBToLuminance(EnvTexture.SampleLevel(SampColorSampler, R, 15));
 
 			specularIrradiance = (specularIrradiance / max(specularIrradianceLuminance, 0.001)) * directionalAmbientColorSpecular;
-			specularIrradiance = Color::GammaToLinear(specularIrradiance);
+			specularIrradiance = Color::IrradianceToLinear(specularIrradiance);
 		}
 
 		float3 specularIrradianceReflections = 1.0;
@@ -187,7 +187,7 @@ namespace DynamicCubemaps
 		    float specularIrradianceReflectionsLuminance = Color::RGBToLuminance(EnvReflectionsTexture.SampleLevel(SampColorSampler, R, 15));
 
 			specularIrradianceReflections = (specularIrradianceReflections / max(specularIrradianceReflectionsLuminance, 0.001)) * directionalAmbientColorSpecular;
-			specularIrradianceReflections = Color::GammaToLinear(specularIrradianceReflections);
+			specularIrradianceReflections = Color::IrradianceToLinear(specularIrradianceReflections);
 		}
 
 		finalIrradiance = lerp(specularIrradiance, specularIrradianceReflections, skylightingSpecular);
@@ -197,7 +197,7 @@ namespace DynamicCubemaps
 		float specularIrradianceLuminance = Color::RGBToLuminance(EnvReflectionsTexture.SampleLevel(SampColorSampler, R, 15));
 
 		specularIrradiance = (specularIrradiance / max(specularIrradianceLuminance, 0.001)) * directionalAmbientColorSpecular;
-		specularIrradiance = Color::GammaToLinear(specularIrradiance);
+		specularIrradiance = Color::IrradianceToLinear(specularIrradiance);
 
 		finalIrradiance = specularIrradiance;
 #		endif

features/Dynamic Cubemaps/Shaders/DynamicCubemaps/InferCubemapCS.hlsl

@@ -1,4 +1,5 @@
 #include "Common/Color.hlsli"
+#include "Common/SharedData.hlsli"
 
 TextureCube<float4> EnvCaptureTexture : register(t0);
 TextureCube<float4> ReflectionsTexture : register(t1);
@@ -90,11 +91,11 @@ float3 GetSamplingVector(uint3 ThreadID, in RWTexture2DArray<float4> OutputTextu
 	}
 
 #if defined(REFLECTIONS)
-	color.rgb = lerp(color.rgb, Color::GammaToLinear(ReflectionsTexture.SampleLevel(LinearSampler, uv, 0.0).rgb), saturate(mipLevel / 7.0));
+	color.rgb = lerp(color.rgb, Color::IrradianceToLinear(ReflectionsTexture.SampleLevel(LinearSampler, uv, 0.0).rgb), saturate(mipLevel / 7.0));
 #else
 	color.rgb = lerp(color.rgb, color.rgb * DefaultCubemap.SampleLevel(LinearSampler, uv, 0.0).xyz, saturate(mipLevel / 7.0));
 #endif
 
-	color.rgb = Color::LinearToGamma(color.rgb);
+	color.rgb = Color::IrradianceToGamma(color.rgb);
 	EnvInferredTexture[ThreadID] = max(0, color);
 }

features/Dynamic Cubemaps/Shaders/DynamicCubemaps/SpecularIrradianceCS.hlsl

@@ -172,11 +172,11 @@ float3 tangentToWorld(const float3 v, const float3 N, const float3 S, const floa
 			// Mip level to sample from.
 			float mipLevel = max(0.5 * log2(ws / wt) + 1.0, 0.0);
 
-			color += Color::GammaToLinear(inputTexture.SampleLevel(linear_wrap_sampler, Li, mipLevel).rgb) * cosLi;
+			color += Color::IrradianceToLinear(inputTexture.SampleLevel(linear_wrap_sampler, Li, mipLevel).rgb) * cosLi;
 			weight += cosLi;
 		}
 	}
 	color /= weight;
 
-	outputTexture[ThreadID] = float4(Color::LinearToGamma(color), 1.0);
+	outputTexture[ThreadID] = float4(Color::IrradianceToGamma(color), 1.0);
 }

features/Dynamic Cubemaps/Shaders/DynamicCubemaps/UpdateCubemapCS.hlsl

@@ -99,7 +99,7 @@ float smoothbumpstep(float edge0, float edge1, float x)
 			color /= weight;
 
 			float4 positionFinal = float4(position.xyz * 0.001, length(position) < (4096.0 * 2.5));
-			float4 colorFinal = float4(Color::GammaToLinear(color), 1.0);
+			float4 colorFinal = float4(Color::IrradianceToLinear(color), 1.0);
 
 			float lerpFactor = 0.5;
 

features/Hair Specular/Shaders/Hair/Hair.hlsli

@@ -2,11 +2,10 @@
 #define __HAIR_DEPENDENCY_HLSL__
 
 #include "Common/BRDF.hlsli"
+#include "Common/Color.hlsli"
 #include "Common/Game.hlsli"
 #include "Common/Math.hlsli"
 
-#define HAIR_LIGHTING_MULTIPLIER Math::PI  // Compensating to adapt to vanilla lighting model
-
 namespace Hair
 {
 	Texture2D<float> TexTangentShift : register(t73);
@@ -194,7 +193,7 @@ namespace Hair
 
 	void GetHairDirectLightMarschner(out float3 dirDiffuse, out float3 dirSpecular, out float3 dirTransmission, float3 T, float3 L, float3 V, float3 N, float3 VN, float3 lightColor, float shininess, float selfShadow, float2 uv, float3 baseColor)
 	{
-		lightColor *= HAIR_LIGHTING_MULTIPLIER * selfShadow;
+		lightColor *= Color::PBRLightingCompensation * selfShadow;
 		dirDiffuse = 0;
 		dirSpecular = 0;
 		dirTransmission = 0;

features/Linear Lighting/Shaders/Features/LinearLighting.ini

@@ -0,0 +1,2 @@
+[Info]
+Version = 1-0-0

features/Screen Space GI/Shaders/ScreenSpaceGI/radianceDisocc.cs.hlsl

@@ -135,7 +135,7 @@ void readHistory(
 
 	half3 radiance = 0;
 #ifdef GI
-	radiance = Color::GammaToLinear(FULLRES_LOAD(srcDiffuse, pixCoord, uv * frameScale, samplerLinearClamp).rgb * GIStrength);
+	radiance = Color::RadianceToLinear(FULLRES_LOAD(srcDiffuse, pixCoord, uv * frameScale, samplerLinearClamp).rgb * GIStrength);
 	radiance = filterNaN(radiance);
 	radiance = filterInf(radiance);
 	outRadianceDisocc[pixCoord] = radiance;

features/Skylighting/Shaders/Skylighting/Skylighting.hlsli

@@ -49,7 +49,7 @@ namespace Skylighting
 
 		diffuseColor = max(0.0, diffuseColor - directionalAmbientColor);
 
-		directionalAmbientColor = Color::LinearToGamma(Color::GammaToLinear(directionalAmbientColor) * Color::MultiBounceAO(Color::GammaToLinear(albedo / Color::PBRLightingScale), skylightingDiffuse));
+		directionalAmbientColor = Color::IrradianceToGamma(Color::IrradianceToLinear(directionalAmbientColor) * Color::MultiBounceAO(Color::IrradianceToLinear(albedo / Color::PBRLightingScale), skylightingDiffuse));
 
 		diffuseColor += directionalAmbientColor;
 	}

features/Subsurface Scattering/Shaders/SubsurfaceScattering/Burley.hlsli

@@ -59,7 +59,7 @@ float4 BurleyNormalizedSS(uint2 DTid, float2 texCoord, uint eyeIndex, float sssA
 	}
 
 	float4 surfaceAlbedo = AlbedoTexture[DTid];
-	float3 originalColor = Color::GammaToLinear(centerColor.xyz / max(surfaceAlbedo.xyz, EPSILON_SSS_ALBEDO));
+	float3 originalColor = Color::IrradianceToLinear(centerColor.xyz / max(surfaceAlbedo.xyz, EPSILON_SSS_ALBEDO));
 
 	float4 diffuseMeanFreePath = humanProfile ? MeanFreePathHuman : MeanFreePathBase;
 	diffuseMeanFreePath.xyz = float3(max(diffuseMeanFreePath.x, 1e-5f), max(diffuseMeanFreePath.y, 1e-5f), max(diffuseMeanFreePath.z, 1e-5f));
@@ -114,7 +114,7 @@ float4 BurleyNormalizedSS(uint2 DTid, float2 texCoord, uint eyeIndex, float sssA
 		if (!mask)
 			continue;
 
-		float3 sampleColor = Color::GammaToLinear(ColorTexture[samplePixcoord].xyz * maskSample / max(AlbedoTexture[samplePixcoord].xyz, EPSILON_SSS_ALBEDO));
+		float3 sampleColor = Color::IrradianceToLinear(ColorTexture[samplePixcoord].xyz * maskSample / max(AlbedoTexture[samplePixcoord].xyz, EPSILON_SSS_ALBEDO));
 		float sampleDepth = SharedData::GetScreenDepth(DepthTexture[samplePixcoord].x);
 		float3 sampleNormalVS = GBuffer::DecodeNormal(NormalTexture[samplePixcoord].xy);
 		float3 sampleNormalWS = normalize(mul(FrameBuffer::CameraViewInverse[eyeIndex], float4(sampleNormalVS, 0)).xyz);
@@ -132,7 +132,7 @@ float4 BurleyNormalizedSS(uint2 DTid, float2 texCoord, uint eyeIndex, float sssA
 
 	colorSum *= any(weightSum == 0.0f) ? 0.0f : (1.0f / weightSum);
 	colorSum = lerp(colorSum, originalColor, saturate(centerWeight));
-	float3 color = Color::LinearToGamma(colorSum) * AlbedoTexture[DTid.xy].xyz;
+	float3 color = Color::IrradianceToGamma(colorSum) * AlbedoTexture[DTid.xy].xyz;
 	color = lerp(centerColor.xyz, color, saturate(sssAmount));
 
 	float4 outColor = float4(color, ColorTexture[DTid.xy].w);

features/Subsurface Scattering/Shaders/SubsurfaceScattering/SeparableSSS.hlsli

@@ -102,7 +102,7 @@ float4 SSSSBlurCS(
 	float4 colorM = ColorTexture[DTid.xy];
 
 #if defined(HORIZONTAL)
-	colorM.rgb = Color::GammaToLinear(colorM.rgb);
+	colorM.rgb = Color::IrradianceToLinear(colorM.rgb);
 #endif
 
 	if (sssAmount == 0)
@@ -152,7 +152,7 @@ float4 SSSSBlurCS(
 		float3 color = ColorTexture[coords].rgb;
 
 #if defined(HORIZONTAL)
-		color.rgb = Color::GammaToLinear(color.rgb);
+		color.rgb = Color::IrradianceToLinear(color.rgb);
 #endif
 
 		float depth = DepthTexture[coords].r;

features/Subsurface Scattering/Shaders/SubsurfaceScattering/SeparableSSSCS.hlsl

@@ -63,7 +63,7 @@ cbuffer PerFrameSSS : register(b1)
 		bool humanProfile = MaskTexture[DTid.xy].y > 0.0;
 
 		float4 color = SSSSBlurCS(DTid.xy, texCoord, float2(0.0, 1.0), sssAmount, humanProfile);
-		color.rgb = Color::LinearToGamma(color.rgb);
+		color.rgb = Color::IrradianceToGamma(color.rgb);
 		SSSRW[DTid.xy] = float4(color.rgb, 1.0);
 	}