Skip to content

Commit

Permalink
feat: sh skylighting, fixes and cleanup (#334)
Browse files Browse the repository at this point in the history 
* feat: spherical harmonic skylighting

* chore: reduced wetness light intensity

* chore: optimise setting constant buffers

* fix: disable VRS

* style: 🎨 apply clang-format changes

* chore: performance improvements

* fix: water reflections

* fix: skylighting flicker

* style: 🎨 apply clang-format changes

* chore: minor cleanup

* chore: convolve and ZH3 hallucination for diffuse skylighitng

* chore: skylighting cleanup

* fix: SSS crash

* fix: incorrect reflections

* style: 🎨 apply clang-format changes

* fix: reflection and shadow fixes

* style: 🎨 apply clang-format changes

* feat: cubemap optimisation

* chore: use correct depth buffer

* fix: wetness edge seam

* chore: cleaned up legacy code pending further changes

* style: 🎨 apply clang-format changes

* style: 🎨 apply clang-format changes

* fix: minor wetness issues

* style: 🎨 apply clang-format changes

* fix: fix VR in skylighting-sh branch

* feat: adjustments to improve dynamic cubemaps after quality reduction

* style: 🎨 apply clang-format changes

* fix: fix AE support

* chore: dynamic cubemap tweaks

* chore: more contrast to specular skylighting

* style: 🎨 apply clang-format changes

* fix: dynamic cubemap feedback loop

* fix: dynamic cubemap fade fixes

* style: 🎨 apply clang-format changes

* fix: reset dynamic cubemap when shaders are missing

* feat: GetTemporal utility function

* feat: skylighting optimisation and blur pass

* feat: low precision depth buffer

* style: 🎨 apply clang-format changes

* fix: skylighting position adjust

* feat: low precision depth when available

* refactor: lower case frameCount

* style: 🎨 apply clang-format changes

* chore: artistic tweaks to skylighting application

* style: 🎨 apply clang-format changes

* feat: skylighting update timer

* feat: skylighting and ambient improvements

* style: 🎨 apply clang-format changes

* refactor: switch on UpdateCubemap

* refactor: divide instead of multiply

* chore: remove unused CameraData

---------

Co-authored-by: doodlum <doodlum@users.noreply.github.com>
Co-authored-by: Pentalimbed <pentalimbed@gmail.com>
Co-authored-by: FlayaN <hannes.feldt@gmail.com>
  • Loading branch information
@doodlum @Pentalimbed @FlayaN
4 people authored Jul 22, 2024
1 parent 45456de commit 52ccd51
Show file tree
Hide file tree
Showing 44 changed files with 1,043 additions and 712 deletions.
2 changes: 1 addition & 1 deletion features/Dynamic Cubemaps/Shaders/DynamicCubemaps/DynamicCubemaps.hlsli
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ float3 GetDynamicCubemap(float2 uv, float3 N, float3 VN, float3 V, float roughne
float3 R = reflect(-V, N);
float NoV = saturate(dot(N, V));

float level = roughness * 9.0;
float level = roughness * 7.0;

float2 specularBRDF = EnvBRDFApprox(roughness, NoV);

Expand Down
20 changes: 6 additions & 14 deletions features/Dynamic Cubemaps/Shaders/DynamicCubemaps/InferCubemapCS.hlsl
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#include "../Common/Color.hlsl"

TextureCube<float4> EnvCaptureTexture : register(t0);
TextureCube<float4> ReflectionsTexture : register(t1);
TextureCube<float4> DefaultCubemap : register(t2);
Expand Down Expand Up @@ -44,16 +46,6 @@ float3 GetSamplingVector(uint3 ThreadID, in RWTexture2DArray<float4> OutputTextu
return normalize(result);
}

float3 sRGB2Lin(float3 color)
{
return color > 0.04045 ? pow(color / 1.055 + 0.055 / 1.055, 2.4) : color / 12.92;
}

float3 Lin2sRGB(float3 color)
{
return color > 0.0031308 ? 1.055 * pow(color, 1.0 / 2.4) - 0.055 : 12.92 * color;
}

[numthreads(8, 8, 1)] void main(uint3 ThreadID
: SV_DispatchThreadID) {
float3 uv = GetSamplingVector(ThreadID, EnvInferredTexture);
Expand All @@ -66,11 +58,11 @@ float3 Lin2sRGB(float3 color)
float brightness = k;
#endif

while (color.w < 1.0 && mipLevel <= 10) {
while (color.w < 1.0 && mipLevel <= 8) {
mipLevel++;

float4 tempColor = 0.0;
if (mipLevel < 10) {
if (mipLevel < 8) {
tempColor = EnvCaptureTexture.SampleLevel(LinearSampler, uv, mipLevel);
} else {
tempColor += EnvCaptureTexture.SampleLevel(LinearSampler, float3(-1.0, 0.0, 0.0), 9);
Expand Down Expand Up @@ -98,9 +90,9 @@ float3 Lin2sRGB(float3 color)
}

#if defined(REFLECTIONS)
color.rgb = lerp(color.rgb, sRGB2Lin(ReflectionsTexture.SampleLevel(LinearSampler, uv, 0)), saturate(mipLevel * (1.0 / 10.0)));
color.rgb = lerp(color.rgb, sRGB2Lin(ReflectionsTexture.SampleLevel(LinearSampler, uv, 0)), saturate(mipLevel / 8.0));
#else
color.rgb = lerp(color.rgb, color.rgb * sRGB2Lin(DefaultCubemap.SampleLevel(LinearSampler, uv, 0).x), saturate(mipLevel * (1.0 / 10.0)));
color.rgb = lerp(color.rgb, color.rgb * sRGB2Lin(DefaultCubemap.SampleLevel(LinearSampler, uv, 0).x) * 2, saturate(mipLevel / 8.0));
#endif

color.rgb = Lin2sRGB(color.rgb);
Expand Down
168 changes: 81 additions & 87 deletions features/Dynamic Cubemaps/Shaders/DynamicCubemaps/UpdateCubemapCS.hlsl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#include "../Common/Constants.hlsli"
#include "../Common/DeferredShared.hlsli"
#include "../Common/FrameBuffer.hlsl"
#include "../Common/VR.hlsli"

RWTexture2DArray<float4> DynamicCubemap : register(u0);
RWTexture2DArray<float4> DynamicCubemapRaw : register(u1);
RWTexture2DArray<float4> DynamicCubemapPosition : register(u2);
Expand Down Expand Up @@ -47,88 +50,12 @@ float3 GetSamplingVector(uint3 ThreadID, in RWTexture2DArray<float4> OutputTextu
return normalize(result);
}

cbuffer PerFrame : register(b0)
{
#if !defined(VR)
row_major float4x4 CameraView[1] : packoffset(c0);
row_major float4x4 CameraProj[1] : packoffset(c4);
row_major float4x4 CameraViewProj[1] : packoffset(c8);
row_major float4x4 CameraViewProjUnjittered[1] : packoffset(c12);
row_major float4x4 CameraPreviousViewProjUnjittered[1] : packoffset(c16);
row_major float4x4 CameraProjUnjittered[1] : packoffset(c20);
row_major float4x4 CameraProjUnjitteredInverse[1] : packoffset(c24);
row_major float4x4 CameraViewInverse[1] : packoffset(c28);
row_major float4x4 CameraViewProjInverse[1] : packoffset(c32);
row_major float4x4 CameraProjInverse[1] : packoffset(c36);
float4 CameraPosAdjust[1] : packoffset(c40);
float4 CameraPreviousPosAdjust[1] : packoffset(c41); // fDRClampOffset in w
float4 FrameParams : packoffset(c42); // inverse fGamma in x, some flags in yzw
float4 DynamicResolutionParams1 : packoffset(c43); // fDynamicResolutionWidthRatio in x,
// fDynamicResolutionHeightRatio in y,
// fDynamicResolutionPreviousWidthRatio in z,
// fDynamicResolutionPreviousHeightRatio in w
float4 DynamicResolutionParams2 : packoffset(c44); // inverse fDynamicResolutionWidthRatio in x, inverse
// fDynamicResolutionHeightRatio in y,
// fDynamicResolutionWidthRatio - fDRClampOffset in z,
// fDynamicResolutionPreviousWidthRatio - fDRClampOffset in w
#else
row_major float4x4 CameraView[2] : packoffset(c0);
row_major float4x4 CameraProj[2] : packoffset(c8);
row_major float4x4 CameraViewProj[2] : packoffset(c16);
row_major float4x4 CameraViewProjUnjittered[2] : packoffset(c24);
row_major float4x4 CameraPreviousViewProjUnjittered[2] : packoffset(c32);
row_major float4x4 CameraProjUnjittered[2] : packoffset(c40);
row_major float4x4 CameraProjUnjitteredInverse[2] : packoffset(c48);
row_major float4x4 CameraViewInverse[2] : packoffset(c56);
row_major float4x4 CameraViewProjInverse[2] : packoffset(c64);
row_major float4x4 CameraProjInverse[2] : packoffset(c72);
float4 CameraPosAdjust[2] : packoffset(c80);
float4 CameraPreviousPosAdjust[2] : packoffset(c82); // fDRClampOffset in w
float4 FrameParams : packoffset(c84); // inverse fGamma in x, some flags in yzw
float4 DynamicResolutionParams1 : packoffset(c85); // fDynamicResolutionWidthRatio in x,
// fDynamicResolutionHeightRatio in y,
// fDynamicResolutionPreviousWidthRatio in z,
// fDynamicResolutionPreviousHeightRatio in w
float4 DynamicResolutionParams2 : packoffset(c86); // inverse fDynamicResolutionWidthRatio in x, inverse
// fDynamicResolutionHeightRatio in y,
// fDynamicResolutionWidthRatio - fDRClampOffset in z,
// fDynamicResolutionPreviousWidthRatio - fDRClampOffset in w
#endif // !VR
}

cbuffer UpdateData : register(b1)
{
float4 CameraData;
uint Reset;
float3 CameraPreviousPosAdjust2;
}

float3 WorldToView(float3 x, bool is_position = true, uint a_eyeIndex = 0)
{
float4 newPosition = float4(x, (float)is_position);
return mul(CameraView[a_eyeIndex], newPosition).xyz;
}

float2 ViewToUV(float3 x, bool is_position = true, uint a_eyeIndex = 0)
{
float4 newPosition = float4(x, (float)is_position);
float4 uv = mul(CameraProj[a_eyeIndex], newPosition);
return (uv.xy / uv.w) * float2(0.5f, -0.5f) + 0.5f;
}

float GetScreenDepth(float depth)
{
return (CameraData.w / (-depth * CameraData.z + CameraData.x));
}

float2 GetDynamicResolutionAdjustedScreenPosition(float2 screenPosition)
{
float2 adjustedScreenPosition =
max(0.0.xx, DynamicResolutionParams1.xy * screenPosition);
return min(float2(DynamicResolutionParams2.z, DynamicResolutionParams1.y),
adjustedScreenPosition);
}

bool IsSaturated(float value) { return value == saturate(value); }
bool IsSaturated(float2 value) { return IsSaturated(value.x) && IsSaturated(value.y); }

Expand Down Expand Up @@ -166,6 +93,77 @@ float smoothbumpstep(float edge0, float edge1, float x)
}

if (IsSaturated(uv) && viewDirection.z < 0.0) { // Check that the view direction exists in screenspace and that it is in front of the camera
float2 PoissonDisc[64] = {
float2(0.403302f, 0.139622f),
float2(0.578204f, 0.624683f),
float2(0.942412f, 0.973693f),
float2(0.0789209f, 0.902676f),
float2(0.904355f, 0.158025f),
float2(0.0505387f, 0.403394f),
float2(0.99176f, 0.587085f),
float2(0.0210273f, 0.00875881f),
float2(0.329905f, 0.460005f),
float2(0.386853f, 0.985321f),
float2(0.625721f, 0.34431f),
float2(0.346782f, 0.687551f),
float2(0.659139f, 0.843989f),
float2(0.798029f, 0.469008f),
float2(0.14127f, 0.19602f),
float2(0.684011f, 0.0732444f),
float2(0.0515458f, 0.672048f),
float2(0.239662f, 0.00369274f),
float2(0.985076f, 0.363414f),
float2(0.191229f, 0.594928f),
float2(0.820887f, 0.720725f),
float2(0.508103f, 0.0209967f),
float2(0.783654f, 0.302744f),
float2(0.467269f, 0.82757f),
float2(0.214911f, 0.809259f),
float2(0.747703f, 0.986847f),
float2(0.966033f, 0.00357067f),
float2(0.447432f, 0.292367f),
float2(0.954253f, 0.813837f),
float2(0.209815f, 0.356304f),
float2(0.561663f, 0.970794f),
float2(0.334544f, 0.340678f),
float2(0.461013f, 0.419691f),
float2(0.229865f, 0.993164f),
float2(0.797327f, 0.838832f),
float2(0.578478f, 0.128452f),
float2(0.265358f, 0.135685f),
float2(0.495621f, 0.710837f),
float2(0.71102f, 0.643971f),
float2(0.0191046f, 0.2219f),
float2(0.990265f, 0.240516f),
float2(0.85403f, 0.589709f),
float2(0.369488f, 0.0120548f),
float2(0.478378f, 0.551805f),
float2(0.664815f, 0.519913f),
float2(0.843684f, 0.0224006f),
float2(0.0827357f, 0.530961f),
float2(0.116398f, 0.0798364f),
float2(0.676931f, 0.221381f),
float2(0.917447f, 0.472091f),
float2(0.334819f, 0.836451f),
float2(0.00308237f, 0.800134f),
float2(0.565752f, 0.823206f),
float2(0.874783f, 0.33668f),
float2(0.336772f, 0.592364f),
float2(0.151402f, 0.729484f),
float2(0.706656f, 0.748802f),
float2(0.723411f, 0.379315f),
float2(0.805109f, 0.16715f),
float2(0.853877f, 0.243294f),
float2(0.91464f, 0.693289f),
float2(0.846828f, 0.918821f),
float2(0.188513f, 0.501236f),
float2(0.0812708f, 0.993774f)
};

// Assume projection maps to one cubemap face, and randomly sample an area within the mapped resolution
uv += (PoissonDisc[FrameCountAlwaysActive % 64] * 2.0 - 1.0) * BufferDim.zw * max(1.0, float2(BufferDim.x / 128.0, BufferDim.y / 128.0)) * 0.5;
uv = saturate(uv);

uv = GetDynamicResolutionAdjustedScreenPosition(uv);
uv = ConvertToStereoUV(uv, 0);

Expand All @@ -175,19 +173,15 @@ float smoothbumpstep(float edge0, float edge1, float x)
if (linearDepth > 16.5) { // Ignore objects which are too close
float3 color = ColorTexture.SampleLevel(LinearSampler, uv, 0);
float4 output = float4(sRGB2Lin(color), 1.0);
float lerpFactor = 0.5;

float4 position = float4(InverseProjectUVZ(uv, depth) * 0.001, 1.0);
float lerpFactor = 1.0 / 64.0;

float distance = length(position.xyz);
half4 positionCS = half4(2 * half2(uv.x, -uv.y + 1) - 1, depth, 1);
positionCS = mul(CameraViewProjInverse[0], positionCS);
positionCS.xyz = positionCS.xyz / positionCS.w;

position.w = smoothstep(1.0, 4096.0 * 0.001, distance); // Objects which are far away from the perspective of the camera do not fade out

if (linearDepth > (4096.0 * 5.0))
position.w = 0;
float4 position = float4(positionCS.xyz * 0.001, linearDepth < (4096.0 * 2.5));

DynamicCubemapPosition[ThreadID] = lerp(DynamicCubemapPosition[ThreadID], position, lerpFactor);

DynamicCubemapRaw[ThreadID] = max(0, lerp(DynamicCubemapRaw[ThreadID], output, lerpFactor));

output *= sqrt(saturate(0.5 * length(position.xyz)));
Expand All @@ -204,8 +198,8 @@ float smoothbumpstep(float edge0, float edge1, float x)

float4 color = DynamicCubemapRaw[ThreadID];

float distanceFactor = sqrt(smoothbumpstep(0.0, 1.0, length(position.xyz)));
color *= max(0.001, max(distanceFactor, position.w));
float distanceFactor = sqrt(smoothbumpstep(0.0, 2.0, length(position.xyz)));
color *= distanceFactor;

DynamicCubemap[ThreadID] = max(0, color);
}
17 changes: 17 additions & 0 deletions features/Grass Lighting/Shaders/RunGrass.hlsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,11 @@ float3x3 CalculateTBN(float3 N, float3 p, float2 uv)
# include "CloudShadows/CloudShadows.hlsli"
# endif

# if defined(SKYLIGHTING)
# define LinearSampler SampBaseSampler
# include "Skylighting/Skylighting.hlsli"
# endif

PS_OUTPUT main(PS_INPUT input, bool frontFace
: SV_IsFrontFace)
{
Expand Down Expand Up @@ -450,6 +455,18 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace

diffuseColor += lightsDiffuseColor;

# if !defined(SSGI)
float3 directionalAmbientColor = mul(DirectionalAmbientShared, float4(normal, 1.0));

# if defined(SKYLIGHTING)
float4 skylightingSH = SkylightingTexture.Load(int3(input.HPosition.xy, 0));
float skylighting = saturate(shUnproject(skylightingSH, normal));
directionalAmbientColor *= lerp(1.0 / 3.0, 1.0, skylighting);
# endif

diffuseColor += directionalAmbientColor;
# endif

diffuseColor *= albedo;
diffuseColor += max(0, sss * subsurfaceColor * grassLightingSettings.SubsurfaceScatteringAmount);

Expand Down
4 changes: 3 additions & 1 deletion features/Skylighting/Shaders/Skylighting/Skylighting.hlsli
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
#include "Common/Spherical Harmonics/SphericalHarmonics.hlsli"

Texture2D<unorm float> OcclusionMapSampler : register(t29);
Texture2D<float4> SkylightingTexture : register(t30);

cbuffer SkylightingData : register(b8)
{
row_major float4x4 OcclusionViewProj;
float4 EyePosition;
float4 ShadowDirection;
float4 Parameters;
};

float GetVLSkylighting(float3 startPosWS, float3 endPosWS, float2 screenPosition)
Expand Down
73 changes: 73 additions & 0 deletions features/Skylighting/Shaders/Skylighting/SkylightingBlurCS.hlsl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
#include "../Common/FrameBuffer.hlsl"
#include "../Common/GBuffer.hlsli"
#include "../Common/VR.hlsli"

Texture2D<half> DepthTexture : register(t0);

Texture2D<half4> SkylightingTexture : register(t1);
RWTexture2D<float4> SkylightingTextureRW : register(u0);

cbuffer PerFrame : register(b0)
{
row_major float4x4 OcclusionViewProj;
float4 EyePosition;
float4 ShadowDirection;
float4 BufferDim;
float4 CameraData;
uint FrameCount;
};

SamplerState LinearSampler : register(s0);

half GetScreenDepth(half depth)
{
return (CameraData.w / (-depth * CameraData.z + CameraData.x));
}

// samples = 8, min distance = 0.5, average samples on radius = 2
static const float3 g_Poisson8[8] = {
float3(-0.4706069, -0.4427112, +0.6461146),
float3(-0.9057375, +0.3003471, +0.9542373),
float3(-0.3487388, +0.4037880, +0.5335386),
float3(+0.1023042, +0.6439373, +0.6520134),
float3(+0.5699277, +0.3513750, +0.6695386),
float3(+0.2939128, -0.1131226, +0.3149309),
float3(+0.7836658, -0.4208784, +0.8895339),
float3(+0.1564120, -0.8198990, +0.8346850)
};

[numthreads(8, 8, 1)] void main(uint3 globalId
: SV_DispatchThreadID) {
half2 uv = half2(globalId.xy + 0.5) * (BufferDim.zw) * DynamicResolutionParams2.xy;
uint eyeIndex = GetEyeIndexFromTexCoord(uv);

half4 skylightingSH = 0;
half weight = 0.0;

half rawDepth = DepthTexture[globalId.xy];
half depth = GetScreenDepth(rawDepth);

[unroll] for (uint i = 0; i < 8; i++)
{

#if defined(HORIZONTAL)
half2 testUV = uv + g_Poisson8[i].xy * BufferDim.zw * 8.0;
#else
half2 testUV = uv + g_Poisson8[i].yx * BufferDim.zw * 16.0;
#endif

if (any(testUV < 0) || any(testUV > 1))
continue;

half sampleDepth = GetScreenDepth(DepthTexture.SampleLevel(LinearSampler, testUV, 0));
half attenuation = g_Poisson8[i].z * lerp(g_Poisson8[i].z * 0.01, 1.0, 1.0 - saturate(0.01 * abs(sampleDepth - depth)));

[branch] if (attenuation > 0.0)
{
skylightingSH += SkylightingTexture.SampleLevel(LinearSampler, testUV, 0) * attenuation;
weight += attenuation;
}
}

SkylightingTextureRW[globalId.xy] = skylightingSH / weight;
}
Loading

0 comments on commit 52ccd51

Please sign in to comment.