Merge pull request #2 from Unity-Technologies/master

Update from base

Author: Kink3d

…cessing/Runtime/Utils/ReflectionUtils.cs …ocessing/Editor/Utils/ReflectionUtils.csPostProcessing/Runtime/Utils/ReflectionUtils.cs renamed to PostProcessing/Editor/Utils/ReflectionUtils.cs PostProcessing/Runtime/Utils/ReflectionUtils.cs renamed to PostProcessing/Editor/Utils/ReflectionUtils.cs

@@ -164,7 +164,7 @@ VaryingsMultitex VertMultitex(AttributesDefault v)
 #endif
 
     VaryingsMultitex o;
-    o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
+    o.pos = UnityObjectToClipPos(v.vertex);
     o.uv = v.texcoord.xy;
     o.uv01 = uvAlt;
     o.uvSPR = UnityStereoTransformScreenSpaceTex(uvAlt);

…ng/Runtime/Utils/ReflectionUtils.cs.meta …ing/Editor/Utils/ReflectionUtils.cs.metaPostProcessing/Runtime/Utils/ReflectionUtils.cs.meta renamed to PostProcessing/Editor/Utils/ReflectionUtils.cs.meta PostProcessing/Runtime/Utils/ReflectionUtils.cs.meta renamed to PostProcessing/Editor/Utils/ReflectionUtils.cs.meta

@@ -19,7 +19,7 @@ Shader "Hidden/Post FX/Blit"
         Varyings VertBlit(AttributesDefault v)
         {
             Varyings o;
-            o.vertex = mul(UNITY_MATRIX_MVP, v.vertex);
+            o.vertex = UnityObjectToClipPos(v.vertex);
             o.uv = UnityStereoScreenSpaceUVAdjust(v.texcoord, _MainTex_ST);
             return o;
         }

PostProcessing/Resources/Shaders/AmbientOcclusion.cginc

@@ -60,7 +60,7 @@ Shader "Hidden/Post FX/Bloom"
         VaryingsMultitex VertMultitex(AttributesDefault v)
         {
             VaryingsMultitex o;
-            o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
+            o.pos = UnityObjectToClipPos(v.vertex);
             o.uvMain = UnityStereoScreenSpaceUVAdjust(v.texcoord.xy, _MainTex_ST);
             o.uvBase = o.uvMain;
 

PostProcessing/Resources/Shaders/Blit.shader

@@ -39,7 +39,7 @@ struct VaryingsDefault
 VaryingsDefault VertDefault(AttributesDefault v)
 {
     VaryingsDefault o;
-    o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
+    o.pos = UnityObjectToClipPos(v.vertex);
     o.uv = v.texcoord.xy;
     o.uvSPR = UnityStereoScreenSpaceUVAdjust(v.texcoord.xy, _MainTex_ST);
     return o;
@@ -58,6 +58,12 @@ inline half Min3(half x, half y, half z) { return min(x, min(y, z)); }
 inline half Max3(half3 x) { return max(x.x, max(x.y, x.z)); }
 inline half Max3(half x, half y, half z) { return max(x, max(y, z)); }
 
+inline half Min4(half4 x) { return min(x.x, min(x.y, min(x.z, x.w))); }
+inline half Min4(half x, half y, half z, half w) { return min(x, min(y, min(z, w))); }
+
+inline half Max4(half4 x) { return max(x.x, max(x.y, max(x.z, x.w))); }
+inline half Max4(half x, half y, half z, half w) { return max(x, max(y, min(z, w))); }
+
 inline half  Pow2(half  x) { return x * x; }
 inline half2 Pow2(half2 x) { return x * x; }
 inline half3 Pow2(half3 x) { return x * x; }
@@ -76,9 +82,9 @@ inline half4 Pow4(half4 x) { return x * x * x * x; }
 #endif
 
 // Returns the largest vector of v1 and v2
-inline half2 MaxV(half2 v1, half2 v2) { return lerp(v1, v2, dot(v1, v1) < dot(v2, v2)); }
-inline half3 MaxV(half3 v1, half3 v2) { return lerp(v1, v2, dot(v1, v1) < dot(v2, v2)); }
-inline half4 MaxV(half4 v1, half4 v2) { return lerp(v1, v2, dot(v1, v1) < dot(v2, v2)); }
+inline half2 MaxV(half2 v1, half2 v2) { return dot(v1, v1) < dot(v2, v2) ? v2 : v1; }
+inline half3 MaxV(half3 v1, half3 v2) { return dot(v1, v1) < dot(v2, v2) ? v2 : v1; }
+inline half4 MaxV(half4 v1, half4 v2) { return dot(v1, v1) < dot(v2, v2) ? v2 : v1; }
 
 // Clamp HDR value within a safe range
 inline half  SafeHDR(half  c) { return min(c, HALF_MAX); }

PostProcessing/Resources/Shaders/Bloom.shader

@@ -9,6 +9,7 @@
 
 sampler2D_float _CameraDepthTexture;
 sampler2D_float _HistoryCoC;
+float _HistoryWeight;
 
 // Camera parameters
 float _Distance;
@@ -33,21 +34,40 @@ VaryingsDOF VertDOF(AttributesDefault v)
 #endif
 
     VaryingsDOF o;
-#if defined(UNITY_SINGLE_PASS_STEREO)
     o.pos = UnityObjectToClipPos(v.vertex);
+
+#if defined(UNITY_SINGLE_PASS_STEREO)
     o.uv = UnityStereoScreenSpaceUVAdjust(v.texcoord, _MainTex_ST);
     o.uvAlt = UnityStereoScreenSpaceUVAdjust(uvAlt, _MainTex_ST);
 #else
-    o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
     o.uv = v.texcoord;
     o.uvAlt = uvAlt;
 #endif
 
     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);
 
@@ -87,7 +113,9 @@ half4 FragPrefilter(VaryingsDOF i) : SV_Target
     avg /= dot(weights, 1.0);
 
     // Output CoC = average of CoCs
-    half coc = dot(cocs, 0.25);
+    half cocmin = Min4(cocs);
+    half cocmax = Max4(cocs);
+    half coc = -cocmin > cocmax ? cocmin : cocmax;
 
     // Premultiply CoC again.
     avg *= smoothstep(0, _MainTex_TexelSize.y * 2, abs(coc));
@@ -96,33 +124,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
@@ -187,21 +196,35 @@ half4 FragPostBlur(VaryingsDOF i) : SV_Target
 {
     // 9-tap tent filter
     float4 duv = _MainTex_TexelSize.xyxy * float4(1, 1, -1, 0);
-    half4 acc;
 
-    acc  = tex2D(_MainTex, i.uv - duv.xy);
-    acc += tex2D(_MainTex, i.uv - duv.wy) * 2;
-    acc += tex2D(_MainTex, i.uv - duv.zy);
+    half4 c0 = tex2D(_MainTex, i.uv - duv.xy);
+    half4 c1 = tex2D(_MainTex, i.uv - duv.wy);
+    half4 c2 = tex2D(_MainTex, i.uv - duv.zy);
+
+    half4 c3 = tex2D(_MainTex, i.uv + duv.zw);
+    half4 c4 = tex2D(_MainTex, i.uv         );
+    half4 c5 = tex2D(_MainTex, i.uv + duv.xw);
+
+    half4 c6 = tex2D(_MainTex, i.uv + duv.zy);
+    half4 c7 = tex2D(_MainTex, i.uv + duv.wy);
+    half4 c8 = tex2D(_MainTex, i.uv + duv.xy);
+
+    half4 acc = c0 * 1 + c1 * 2 + c2 * 1 +
+                c3 * 2 + c4 * 4 + c5 * 2 +
+                c6 * 1 + c7 * 2 + c8 * 1;
+
+    half aa =
+        c0.a * c0.a * 1 + c1.a * c1.a * 2 + c2.a * c2.a * 1 +
+        c3.a * c3.a * 2 + c4.a * c4.a * 4 + c5.a * c5.a * 2 +
+        c6.a * c6.a * 1 + c7.a * c7.a * 2 + c8.a * c8.a * 1;
 
-    acc += tex2D(_MainTex, i.uv + duv.zw) * 2;
-    acc += tex2D(_MainTex, i.uv         ) * 4;
-    acc += tex2D(_MainTex, i.uv + duv.xw) * 2;
+    half wb = 1.2;
+    half a = (wb * acc.a - aa) / (wb * 16 - acc.a);
 
-    acc += tex2D(_MainTex, i.uv + duv.zy);
-    acc += tex2D(_MainTex, i.uv + duv.wy) * 2;
-    acc += tex2D(_MainTex, i.uv + duv.xy);
+    acc /= 16;
 
-    return acc / 16;
+    half3 rgb = acc.rgb * (1 + saturate(acc.a - a));
+    return half4(rgb, a);
 }
 
 #endif // __DEPTH_OF_FIELD__

PostProcessing/Resources/Shaders/Common.cginc

@@ -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/Resources/Shaders/DepthOfField.cginc

@@ -134,7 +134,7 @@ Shader "Hidden/Post FX/Eye Adaptation"
         VaryingsEditorHisto VertEditorHisto(AttributesDefault v)
         {
             VaryingsEditorHisto o;
-            o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
+            o.pos = UnityObjectToClipPos(v.vertex);
             o.uv = v.texcoord.xy;
             o.maxValue = 1.0 / FindMaxHistogramValue();
             o.avgLuminance = GetAverageLuminance(o.maxValue);