From 441f7fb6c89503bd349aac54d3196cb8a28e2f18 Mon Sep 17 00:00:00 2001 From: Anders Pistol Date: Thu, 7 Mar 2024 21:36:00 +0100 Subject: [PATCH] Traktor: Using Catmull-Rom filter to reduce blurriness of TAA in motion. --- .../World/Antialias/Shaders/Taa/Temporal.xdi | 40 ++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/data/Source/System/World/Antialias/Shaders/Taa/Temporal.xdi b/data/Source/System/World/Antialias/Shaders/Taa/Temporal.xdi index a1622a70c2..e565ef6852 100644 --- a/data/Source/System/World/Antialias/Shaders/Taa/Temporal.xdi +++ b/data/Source/System/World/Antialias/Shaders/Taa/Temporal.xdi @@ -25,6 +25,43 @@ vec4 ColorClamp(in texture2D currentFrame, in sampler currentSampler, vec4 curre return clamp(historyColor, bmn - E, bmx + E); } +vec4 CatmullRomFilterSample(in texture2D tx, in sampler smp, vec2 uv) +{ + // return texture(sampler2D(tex, smp), uv); + +#define TEX sampler2D(tx, smp) + + vec2 texsiz = vec2(textureSize( TEX, 0 ).xy); + vec4 rtMetrics = vec4( 1.0 / texsiz.xy, texsiz.xy ); + + vec2 position = rtMetrics.zw * uv; + vec2 centerPosition = floor(position - 0.5) + 0.5; + vec2 f = position - centerPosition; + vec2 f2 = f * f; + vec2 f3 = f * f2; + + const float c = 0.5; //note: [0;1] ( SMAA_FILMIC_REPROJECTION_SHARPNESS / 100.0 ) + vec2 w0 = -c * f3 + 2.0 * c * f2 - c * f; + vec2 w1 = (2.0 - c) * f3 - (3.0 - c) * f2 + 1.0; + vec2 w2 = -(2.0 - c) * f3 + (3.0 - 2.0 * c) * f2 + c * f; + vec2 w3 = c * f3 - c * f2; + + vec2 w12 = w1 + w2; + vec2 tc12 = rtMetrics.xy * (centerPosition + w2 / w12); + vec3 centerColor = textureLod(TEX, vec2(tc12.x, tc12.y), 0).rgb; + + vec2 tc0 = rtMetrics.xy * (centerPosition - 1.0); + vec2 tc3 = rtMetrics.xy * (centerPosition + 2.0); + vec4 color = + vec4(textureLod(TEX, vec2(tc12.x, tc0.y ), 0).rgb, 1.0) * (w12.x * w0.y ) + + vec4(textureLod(TEX, vec2(tc0.x, tc12.y), 0).rgb, 1.0) * (w0.x * w12.y) + + vec4(centerColor, 1.0) * (w12.x * w12.y) + + vec4(textureLod(TEX, vec2(tc3.x, tc12.y), 0).rgb, 1.0) * (w3.x * w12.y) + + vec4(textureLod(TEX, vec2(tc12.x, tc3.y ), 0).rgb, 1.0) * (w12.x * w3.y ); + + return vec4( color.rgb / color.a, 1.0 ); +} + vec4 TemporalAntiAlias( in texture2D currentFrame, in texture2D previousFrame, @@ -54,7 +91,8 @@ vec4 TemporalAntiAlias( if (!Clipped(uv - Vuv)) { // Sample previous colour, - const vec4 cp = texture(sampler2D(previousFrame, linearSampler), uv - Vuv); + //const vec4 cp = texture(sampler2D(previousFrame, linearSampler), uv - Vuv); + const vec4 cp = CatmullRomFilterSample(previousFrame, linearSampler, uv - Vuv); // Clamp previous colour to current color neighbourhood. const vec4 ccp = ColorClamp(currentFrame, linearSampler, cc, cp, uv - Juv);