Merge pull request #43 from keijiro/fix-issue26-2

Fix for issue #26 (reopened)

Author: Chman

PostProcessing/Resources/Shaders/DepthOfField.cginc

@@ -9,6 +9,7 @@
 
 sampler2D_float _CameraDepthTexture;
 sampler2D_float _HistoryCoC;
+float _HistoryWeight;
 
 // Camera parameters
 float _Distance;
@@ -46,8 +47,27 @@ VaryingsDOF VertDOF(AttributesDefault v)
     return o;
 }
 
-// Downsampling, prefiltering and CoC calculation
-half4 FragPrefilter(VaryingsDOF i) : SV_Target
+// Prefilter: CoC calculation, downsampling and premultiplying.
+
+#if defined(PREFILTER_TAA)
+
+// TAA enabled: use MRT to update the history buffer in the same pass.
+struct PrefilterOutput
+{
+    half4 base : SV_Target0;
+    half4 history : SV_Target1;
+};
+#define PrefilterSemantics
+
+#else
+
+// No TAA
+#define PrefilterOutput half4
+#define PrefilterSemantics :SV_Target
+
+#endif
+
+PrefilterOutput FragPrefilter(VaryingsDOF i) PrefilterSemantics
 {
     float3 duv = _MainTex_TexelSize.xyx * float3(0.5, 0.5, -0.5);
 
@@ -68,6 +88,12 @@ half4 FragPrefilter(VaryingsDOF i) : SV_Target
     float4 cocs = (depths - _Distance) * _LensCoeff / depths;
     cocs = clamp(cocs, -_MaxCoC, _MaxCoC);
 
+#if defined(PREFILTER_TAA)
+    // Get the average with the history to avoid temporal aliasing.
+    half hcoc = tex2D(_HistoryCoC, i.uv).r;
+    cocs = lerp(cocs, hcoc, _HistoryWeight);
+#endif
+
     // Premultiply CoC to reduce background bleeding.
     float4 weights = saturate(abs(cocs) * _RcpMaxCoC);
 
@@ -96,33 +122,14 @@ half4 FragPrefilter(VaryingsDOF i) : SV_Target
     avg = GammaToLinearSpace(avg);
 #endif
 
-    return half4(avg, coc);
-}
-
-// Very simple temporal antialiasing on CoC to reduce jitter (mostly visible on the front plane)
-struct Output
-{
-    half4 base : SV_Target0;
-    half4 history : SV_Target1;
-};
-
-Output FragAntialiasCoC(VaryingsDOF i)
-{
-    half4 base = tex2D(_MainTex, i.uv);
-    half hCoC = tex2D(_HistoryCoC, i.uv).r;
-    half CoC = base.a;
-    half nCoC = hCoC * CoC < 0.0 ? CoC : (hCoC + CoC) / 2.0; // TODO: Smarter CoC AA
-
-    Output output;
-    output.base = half4(base.rgb, nCoC);
-    output.history = nCoC.xxxx;
+#if defined(PREFILTER_TAA)
+    PrefilterOutput output;
+    output.base = half4(avg, coc);
+    output.history = coc.xxxx;
     return output;
-}
-
-// CoC history clearing
-half4 FragClearCoCHistory(VaryingsDOF i) : SV_Target
-{
-    return tex2D(_MainTex, i.uv).aaaa;
+#else
+    return half4(avg, coc);
+#endif
 }
 
 // Bokeh filter with disk-shaped kernels

PostProcessing/Resources/Shaders/DepthOfField.shader

@@ -25,23 +25,24 @@ Shader "Hidden/Post FX/Depth Of Field"
             ENDCG
         }
 
-        // (1-4) Bokeh filter with disk-shaped kernels
+        // (1) Pass 0 + temporal antialiasing
         Pass
         {
             CGPROGRAM
                 #pragma vertex VertDOF
-                #pragma fragment FragBlur
-                #define KERNEL_SMALL
+                #pragma fragment FragPrefilter
+                #define PREFILTER_TAA
                 #include "DepthOfField.cginc"
             ENDCG
         }
 
+        // (2-5) Bokeh filter with disk-shaped kernels
         Pass
         {
             CGPROGRAM
                 #pragma vertex VertDOF
                 #pragma fragment FragBlur
-                #define KERNEL_MEDIUM
+                #define KERNEL_SMALL
                 #include "DepthOfField.cginc"
             ENDCG
         }
@@ -51,7 +52,7 @@ Shader "Hidden/Post FX/Depth Of Field"
             CGPROGRAM
                 #pragma vertex VertDOF
                 #pragma fragment FragBlur
-                #define KERNEL_LARGE
+                #define KERNEL_MEDIUM
                 #include "DepthOfField.cginc"
             ENDCG
         }
@@ -61,32 +62,22 @@ Shader "Hidden/Post FX/Depth Of Field"
             CGPROGRAM
                 #pragma vertex VertDOF
                 #pragma fragment FragBlur
-                #define KERNEL_VERYLARGE
-                #include "DepthOfField.cginc"
-            ENDCG
-        }
-
-        // (5) CoC antialiasing
-        Pass
-        {
-            CGPROGRAM
-                #pragma vertex VertDOF
-                #pragma fragment FragAntialiasCoC
+                #define KERNEL_LARGE
                 #include "DepthOfField.cginc"
             ENDCG
         }
 
-        // (6) CoC history clearing
         Pass
         {
             CGPROGRAM
                 #pragma vertex VertDOF
-                #pragma fragment FragClearCoCHistory
+                #pragma fragment FragBlur
+                #define KERNEL_VERYLARGE
                 #include "DepthOfField.cginc"
             ENDCG
         }
 
-        // (7) Postfilter blur
+        // (6) Postfilter blur
         Pass
         {
             CGPROGRAM

PostProcessing/Runtime/Components/DepthOfFieldComponent.cs

@@ -16,6 +16,7 @@ static class Uniforms
             internal static readonly int _RcpAspect          = Shader.PropertyToID("_RcpAspect");
             internal static readonly int _MainTex            = Shader.PropertyToID("_MainTex");
             internal static readonly int _HistoryCoC         = Shader.PropertyToID("_HistoryCoC");
+            internal static readonly int _HistoryWeight      = Shader.PropertyToID("_HistoryWeight");
 	        internal static readonly int _DepthOfFieldParams = Shader.PropertyToID("_DepthOfFieldParams");
         }
 
@@ -92,43 +93,36 @@ public void Prepare(RenderTexture source, Material uberMaterial, bool antialiasC
             source.filterMode = FilterMode.Point;
 
             // Pass #1 - Downsampling, prefiltering and CoC calculation
-            Graphics.Blit(source, rt1, material, 0);
-
-            // Pass #2 - CoC Antialiasing
-            var pass = rt1;
-            if (antialiasCoC)
+            if (!antialiasCoC)
             {
-                pass = context.renderTextureFactory.Get(context.width / 2, context.height / 2, 0, RenderTextureFormat.ARGBHalf);
-
-                if (m_CoCHistory == null || !m_CoCHistory.IsCreated() || m_CoCHistory.width != context.width / 2 || m_CoCHistory.height != context.height / 2)
-                {
-                    m_CoCHistory = RenderTexture.GetTemporary(context.width / 2, context.height / 2, 0, RenderTextureFormat.RHalf);
-                    m_CoCHistory.filterMode = FilterMode.Point;
-                    m_CoCHistory.name = "CoC History";
-                    Graphics.Blit(rt1, m_CoCHistory, material, 6);
-                }
+                Graphics.Blit(source, rt1, material, 0);
+            }
+            else
+            {
+                var initial = m_CoCHistory == null || !m_CoCHistory.IsCreated() || m_CoCHistory.width != context.width / 2 || m_CoCHistory.height != context.height / 2;
 
                 var tempCoCHistory = RenderTexture.GetTemporary(context.width / 2, context.height / 2, 0, RenderTextureFormat.RHalf);
                 tempCoCHistory.filterMode = FilterMode.Point;
                 tempCoCHistory.name = "CoC History";
 
-                m_MRT[0] = pass.colorBuffer;
+                m_MRT[0] = rt1.colorBuffer;
                 m_MRT[1] = tempCoCHistory.colorBuffer;
-                material.SetTexture(Uniforms._MainTex, rt1);
+                material.SetTexture(Uniforms._MainTex, source);
                 material.SetTexture(Uniforms._HistoryCoC, m_CoCHistory);
+                material.SetFloat(Uniforms._HistoryWeight, initial ? 0 : 0.5f);
                 Graphics.SetRenderTarget(m_MRT, rt1.depthBuffer);
-                GraphicsUtils.Blit(material, 5);
+                GraphicsUtils.Blit(material, 1);
 
                 RenderTexture.ReleaseTemporary(m_CoCHistory);
                 m_CoCHistory = tempCoCHistory;
             }
 
-            // Pass #3 - Bokeh simulation
+            // Pass #2 - Bokeh simulation
             var rt2 = context.renderTextureFactory.Get(context.width / 2, context.height / 2, 0, RenderTextureFormat.ARGBHalf);
-            Graphics.Blit(pass, rt2, material, 1 + (int)settings.kernelSize);
+            Graphics.Blit(rt1, rt2, material, 2 + (int)settings.kernelSize);
 
-            // Pass #4 - Postfilter blur
-            Graphics.Blit(rt2, rt1, material, 7);
+            // Pass #3 - Postfilter blur
+            Graphics.Blit(rt2, rt1, material, 6);
 
             if (context.profile.debugViews.IsModeActive(DebugMode.FocusPlane))
             {
@@ -142,9 +136,7 @@ public void Prepare(RenderTexture source, Material uberMaterial, bool antialiasC
                 uberMaterial.EnableKeyword("DEPTH_OF_FIELD");
             }
 
-            if (antialiasCoC)
-                context.renderTextureFactory.Release(pass);
-
+            context.renderTextureFactory.Release(rt1);
             context.renderTextureFactory.Release(rt2);
             source.filterMode = FilterMode.Bilinear;
         }