Skip to content

feat: fixed vanilla ssr #745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
doodlum merged 5 commits into from
Nov 14, 2024
Merged

feat: fixed vanilla ssr #745

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fb63ad2
feat: fixed vanilla ssr
doodlum Nov 13, 2024
437eb1b
style: 🎨 apply clang-format changes
doodlum Nov 13, 2024
b0af05b
fix: vr
doodlum Nov 14, 2024
dc1abf9
style: 🎨 apply clang-format changes
doodlum Nov 14, 2024
e1a4e1a
chore: remove deltaUvDepthDR
doodlum Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions package/Shaders/ISReflectionsRayTracing.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,16 @@ float hash(float2 p)
return frac(p.x * p.y * float2(0.5, 0.5).x);
}

float3 ViewToUVDepthHelper(float3 x, uint eyeIndex)
{
float4 newPosition = float4(x, 1.0);
float4 uv = mul(CameraProj[eyeIndex], newPosition);
uv.xyz /= uv.w;
float3 uvDepth = float3(uv.xy * float2(0.5, -0.5) + 0.5, uv.z);
uvDepth.xy = FrameBuffer::GetDynamicResolutionAdjustedScreenPosition(uvDepth.xy);
return uvDepth;
}

PS_OUTPUT main(PS_INPUT input)
{
PS_OUTPUT psout;
Expand Down Expand Up @@ -85,6 +95,12 @@ PS_OUTPUT main(PS_INPUT input)
float ssrPower = max(srcNormal.z >= 1e-5, srcNormal.w);
bool isSsrDisabled = ssrPower < 1e-5;

[branch] if (isSsrDisabled)
{
psout.Color = 0;
return psout;
}

# if defined(SPECMASK)
float3 color = ColorTex.Sample(ColorSampler, uvStartDR).xyz;

Expand Down Expand Up @@ -116,15 +132,14 @@ PS_OUTPUT main(PS_INPUT input)
float3 uvDepthFinish = ViewToUVDepth(vsFinish.xyz);
float3 deltaUvDepth = uvDepthFinish - uvDepthStart;

float3 uvDepthFinishDR = uvDepthStart + deltaUvDepth * (SSRParams.x * rcp(length(deltaUvDepth.xy)));
float3 uvDepthFinishDR = uvDepthStart + deltaUvDepth * SSRParams.x * rcp(length(deltaUvDepth.xy));
uvDepthFinishDR.xy = FrameBuffer::GetDynamicResolutionAdjustedScreenPosition(uvDepthFinishDR.xy);

# ifdef VR
uvStartDR.xy = FrameBuffer::GetDynamicResolutionAdjustedScreenPosition(uvDepthStart.xy);
# endif

float3 uvDepthStartDR = float3(uvStartDR, vsStart.z);
float3 deltaUvDepthDR = uvDepthFinishDR - uvDepthStartDR;

float3 uvDepthPreResultDR = uvDepthStartDR;
float3 uvDepthResultDR = float3(uvDepthStartDR.xy, depthStart);
Expand All @@ -142,7 +157,7 @@ PS_OUTPUT main(PS_INPUT input)
; // Adjust based on performance/quality tradeoff

for (; iterationIndex < maxIterations; iterationIndex++) {
float3 iterationUvDepthDR = uvDepthStartDR + (iterationIndex / (float)maxIterations) * deltaUvDepthDR;
Comment thread
doodlum marked this conversation as resolved.
float3 iterationUvDepthDR = ViewToUVDepthHelper(lerp(csStart.xyz, csFinish.xyz, (iterationIndex / (float)maxIterations) * SSRParams.x * rcp(length(deltaUvDepth.xy))), eyeIndex);
float3 iterationUvDepthSampleDR =
# ifdef VR
// Apply dynamic resolution adjustments and stereo UV conversions
Expand Down