feat: linear lighting

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

@@ -45,7 +45,7 @@ namespace DynamicCubemaps
 
 #		if defined(SKYLIGHTING)
 		if (SharedData::InInterior) {
-			float3 specularIrradiance = Color::GammaToLinear(EnvTexture.SampleLevel(SampColorSampler, R, level).xyz);
+			float3 specularIrradiance = Color::IrradianceToLinear(EnvTexture.SampleLevel(SampColorSampler, R, level).xyz);
 
 			finalIrradiance += specularIrradiance;
 			return finalIrradiance;
@@ -59,16 +59,16 @@ namespace DynamicCubemaps
 		float3 specularIrradiance = 1;
 
 		if (skylightingSpecular < 1.0)
-			specularIrradiance = Color::GammaToLinear(EnvTexture.SampleLevel(SampColorSampler, R, level).xyz);
+			specularIrradiance = Color::IrradianceToLinear(EnvTexture.SampleLevel(SampColorSampler, R, level).xyz);
 
 		float3 specularIrradianceReflections = 1.0;
 
 		if (skylightingSpecular > 0.0)
-			specularIrradianceReflections = Color::GammaToLinear(EnvReflectionsTexture.SampleLevel(SampColorSampler, R, level).xyz);
+			specularIrradianceReflections = Color::IrradianceToLinear(EnvReflectionsTexture.SampleLevel(SampColorSampler, R, level).xyz);
 
 		finalIrradiance = lerp(specularIrradiance, specularIrradianceReflections, skylightingSpecular);
 #		else
-		float3 specularIrradiance = Color::GammaToLinear(EnvReflectionsTexture.SampleLevel(SampColorSampler, R, level).xyz);
+		float3 specularIrradiance = Color::IrradianceToLinear(EnvReflectionsTexture.SampleLevel(SampColorSampler, R, level).xyz);
 
 		finalIrradiance += specularIrradiance;
 #		endif
@@ -102,7 +102,7 @@ namespace DynamicCubemaps
 
 #		if defined(SKYLIGHTING)
 		if (SharedData::InInterior) {
-			float3 specularIrradiance = Color::GammaToLinear(EnvTexture.SampleLevel(SampColorSampler, R, level).xyz);
+			float3 specularIrradiance = Color::IrradianceToLinear(EnvTexture.SampleLevel(SampColorSampler, R, level).xyz);
 
 			finalIrradiance += specularIrradiance;
 
@@ -117,16 +117,16 @@ namespace DynamicCubemaps
 		float3 specularIrradiance = 1;
 
 		if (skylightingSpecular < 1.0)
-			specularIrradiance = Color::GammaToLinear(EnvTexture.SampleLevel(SampColorSampler, R, level).xyz);
+			specularIrradiance = Color::IrradianceToLinear(EnvTexture.SampleLevel(SampColorSampler, R, level).xyz);
 
 		float3 specularIrradianceReflections = 1.0;
 
 		if (skylightingSpecular > 0.0)
-			specularIrradianceReflections = Color::GammaToLinear(EnvReflectionsTexture.SampleLevel(SampColorSampler, R, level).xyz);
+			specularIrradianceReflections = Color::IrradianceToLinear(EnvReflectionsTexture.SampleLevel(SampColorSampler, R, level).xyz);
 
 		finalIrradiance = lerp(specularIrradiance, specularIrradianceReflections, skylightingSpecular);
 #		else
-		float3 specularIrradiance = Color::GammaToLinear(EnvReflectionsTexture.SampleLevel(SampColorSampler, R, level));
+		float3 specularIrradiance = Color::IrradianceToLinear(EnvReflectionsTexture.SampleLevel(SampColorSampler, R, level));
 
 		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/IBL/Shaders/IBL/DiffuseIBLCS.hlsl

@@ -50,9 +50,8 @@ void main(uint3 dispatchID : SV_DispatchThreadID, uint groupIndex : SV_GroupInde
 		}
 	}
 #endif
-
 	// Apply gamma correction
-	color = Color::GammaToLinear(color);
+	color = Color::IrradianceToLinear(color);
 
 	// Compute spherical harmonics basis for this direction
 	sh2 sh = SphericalHarmonics::Evaluate(rayDir);

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

@@ -142,7 +142,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);
 #	ifdef GI_BOUNCE
 	radiance += prev_ambient.rgb * GIBounceFade;
 #	endif

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

@@ -40,7 +40,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);
 	}
 

features/Wetness Effects/Shaders/WetnessEffects/WetnessEffects.hlsli

@@ -151,7 +151,7 @@ namespace WetnessEffects
 		float3 specularIrradiance = 1.0;
 #	else
 		float level = roughness * 7.0;
-		float3 specularIrradiance = Color::GammaToLinear(DynamicCubemaps::EnvReflectionsTexture.SampleLevel(SampColorSampler, R, level).rgb);
+		float3 specularIrradiance = Color::IrradianceToLinear(DynamicCubemaps::EnvReflectionsTexture.SampleLevel(SampColorSampler, R, level).rgb);
 #	endif
 #else
 		float3 specularIrradiance = 1.0;

package/Shaders/AmbientCompositeCS.hlsl

@@ -62,22 +62,29 @@ void SampleSSGI(uint2 pixCoord, float3 normalWS, out float ao, out float3 il)
 
 #if defined(IBL)
 	if (SharedData::iblSettings.EnableDiffuseIBL) {
-		directionalAmbientColor *= SharedData::iblSettings.DALCAmount;
+		directionalAmbientColor = SharedData::iblSettings.DALCAmount * Color::Ambient(directionalAmbientColor);
 		directionalAmbientColor += Color::Saturation(ImageBasedLighting::GetDiffuseIBL(-normalWS), SharedData::iblSettings.IBLSaturation) * SharedData::iblSettings.DiffuseIBLScale;
 	}
 #endif
 
-	float3 linAlbedo = Color::GammaToLinear(albedo);
-	float3 linDirectionalAmbientColor = Color::GammaToLinear(directionalAmbientColor);
+	float3 linAlbedo = albedo;
+	float3 linDirectionalAmbientColor = directionalAmbientColor;
+	float3 linDiffuseColor = diffuseColor;
+	if (!SharedData::linearLightingSettings.enableLinearLighting) {
+		linAlbedo = Color::GammaToLinear(linAlbedo);
+		linDirectionalAmbientColor = Color::GammaToLinear(linDirectionalAmbientColor);
+		linDiffuseColor = Color::GammaToLinear(linDiffuseColor);
+	} else {
+		linDirectionalAmbientColor = Color::Ambient(linDirectionalAmbientColor);
+	}
 #if defined(IBL)
 	if (SharedData::iblSettings.EnableDiffuseIBL) {
 		linDirectionalAmbientColor = directionalAmbientColor;
 	}
 #endif
-	float3 linDiffuseColor = Color::GammaToLinear(diffuseColor);
 	float3 originalDiffuseColor = linDiffuseColor;
 
-	float3 linAmbient = Color::GammaToLinear(albedo * directionalAmbientColor);
+	float3 linAmbient = Color::IrradianceToLinear(albedo * directionalAmbientColor);
 
 	float visibility = 1.0;
 #if defined(SKYLIGHTING)
@@ -140,13 +147,13 @@ void SampleSSGI(uint2 pixCoord, float3 normalWS, out float ao, out float3 il)
 #endif
 
 	linAmbient *= visibility;
-	diffuseColor = Color::LinearToGamma(linDiffuseColor);
-	directionalAmbientColor = Color::LinearToGamma(linDirectionalAmbientColor * visibility);
+	diffuseColor = Color::IrradianceToGamma(linDiffuseColor);
+	directionalAmbientColor = Color::IrradianceToGamma(linDirectionalAmbientColor * visibility);
 
 	diffuseColor = diffuseColor + directionalAmbientColor * albedo;
 
 #if defined(SSGI)
-	DiffuseAmbientRW[dispatchID.xy] = Color::GammaToLinear(diffuseColor - originalDiffuseColor);
+	DiffuseAmbientRW[dispatchID.xy] = Color::IrradianceToLinear(diffuseColor - originalDiffuseColor);
 #endif
 
 	MainRW[dispatchID.xy] = float4(diffuseColor, 1);