Merge pull request #96 from Unity-Technologies/aa-fixes

Antialiasing & grain fixes

Author: Chman

PostProcessing/Resources/Shaders/FXAA.shader

@@ -9,6 +9,9 @@ Shader "Hidden/Post FX/FXAA"
 
         #include "UnityCG.cginc"
         #include "Common.cginc"
+        #include "UberSecondPass.cginc"
+        #pragma multi_compile __ GRAIN
+        #pragma multi_compile __ DITHERING
 
         #if defined(SHADER_API_PS3)
             #define FXAA_PS3 1
@@ -35,7 +38,7 @@ Shader "Hidden/Post FX/FXAA"
         float3 _QualitySettings;
         float4 _ConsoleSettings;
 
-        fixed4 Frag(VaryingsDefault i) : SV_Target
+        half4 Frag(VaryingsDefault i) : SV_Target
         {
             const float4 consoleUV = i.uv.xyxy + 0.5 * float4(-_MainTex_TexelSize.xy, _MainTex_TexelSize.xy);
             const float4 consoleSubpixelFrame = _ConsoleSettings.x * float4(-1.0, -1.0, 1.0, 1.0) *
@@ -50,10 +53,17 @@ Shader "Hidden/Post FX/FXAA"
             const float4 consoleConstants = float4(0.0, 0.0, 0.0, 0.0);
         #endif
 
-            return FxaaPixelShader(UnityStereoScreenSpaceUVAdjust(i.uv, _MainTex_ST), UnityStereoScreenSpaceUVAdjust(consoleUV, _MainTex_ST), _MainTex, _MainTex, _MainTex, _MainTex_TexelSize.xy,
+            half4 color = FxaaPixelShader(
+                UnityStereoScreenSpaceUVAdjust(i.uv, _MainTex_ST),
+                UnityStereoScreenSpaceUVAdjust(consoleUV, _MainTex_ST),
+                _MainTex, _MainTex, _MainTex, _MainTex_TexelSize.xy,
                 consoleSubpixelFrame, consoleSubpixelFramePS3, consoleSubpixelFrameXBOX,
-                _QualitySettings.x, _QualitySettings.y, _QualitySettings.z, _ConsoleSettings.y, _ConsoleSettings.z,
-                _ConsoleSettings.w, consoleConstants);
+                _QualitySettings.x, _QualitySettings.y, _QualitySettings.z,
+                _ConsoleSettings.y, _ConsoleSettings.z, _ConsoleSettings.w, consoleConstants);
+
+            color.rgb = UberSecondPass(color.rgb, i.uv);
+
+            return color;
         }
 
     ENDCG

PostProcessing/Resources/Shaders/Uber.shader

@@ -33,6 +33,7 @@ Shader "Hidden/Post FX/Uber Shader"
         #include "UnityCG.cginc"
         #include "Bloom.cginc"
         #include "ColorGrading.cginc"
+        #include "UberSecondPass.cginc"
 
         // Auto exposure / eye adaptation
         sampler2D _AutoExposure;
@@ -64,15 +65,6 @@ Shader "Hidden/Post FX/Uber Shader"
         sampler2D _UserLut;
         half4 _UserLut_Params; // @see _LogLut_Params
 
-        // Grain
-        half2 _Grain_Params1; // x: lum_contrib, y: intensity
-        half4 _Grain_Params2; // x: xscale, h: yscale, z: xoffset, w: yoffset
-        sampler2D _GrainTex;
-
-        // Dithering
-        sampler2D _DitheringTex;
-        float4 _DitheringCoords;
-
         // Vignette
         half3 _Vignette_Color;
         half2 _Vignette_Center; // UV space
@@ -288,19 +280,6 @@ Shader "Hidden/Post FX/Uber Shader"
 
             color = saturate(color);
 
-            // Grain
-            #if GRAIN
-            {
-                float3 grain = tex2D(_GrainTex, uv * _Grain_Params2.xy + _Grain_Params2.zw).rgb;
-
-                // Noisiness response curve based on scene luminance
-                float lum = 1.0 - sqrt(AcesLuminance(color));
-                lum = lerp(1.0, lum, _Grain_Params1.x);
-
-                color += color * grain * _Grain_Params1.y * lum;
-            }
-            #endif
-
             // Back to gamma space if needed
             #if UNITY_COLORSPACE_GAMMA
             {
@@ -329,16 +308,7 @@ Shader "Hidden/Post FX/Uber Shader"
             }
             #endif
 
-            // Blue noise dithering 
-            #if DITHERING
-            {
-                // Symmetric triangular distribution on [-1,1] with maximal density at 0
-                float noise = tex2D(_DitheringTex, uv * _DitheringCoords.xy + _DitheringCoords.zw).a * 2.0 - 1.0;
-                noise = sign(noise) * (1.0 - sqrt(1.0 - abs(noise))) / 255.0;
-
-                color += noise;
-            }
-            #endif
+            color = UberSecondPass(color, uv);
 
             // Done !
             return half4(color, 1.0);

PostProcessing/Resources/Shaders/UberSecondPass.cginc

@@ -0,0 +1,39 @@
+#include "ColorGrading.cginc"
+
+// Grain
+half2 _Grain_Params1; // x: lum_contrib, y: intensity
+half4 _Grain_Params2; // x: xscale, h: yscale, z: xoffset, w: yoffset
+sampler2D _GrainTex;
+
+// Dithering
+sampler2D _DitheringTex;
+float4 _DitheringCoords;
+
+float3 UberSecondPass(half3 color, float2 uv)
+{
+    // Grain
+    #if GRAIN
+    {
+        float3 grain = tex2D(_GrainTex, uv * _Grain_Params2.xy + _Grain_Params2.zw).rgb;
+
+        // Noisiness response curve based on scene luminance
+        float lum = 1.0 - sqrt(AcesLuminance(color));
+        lum = lerp(1.0, lum, _Grain_Params1.x);
+
+        color += color * grain * _Grain_Params1.y * lum;
+    }
+    #endif
+
+    // Blue noise dithering 
+    #if DITHERING
+    {
+        // Symmetric triangular distribution on [-1,1] with maximal density at 0
+        float noise = tex2D(_DitheringTex, uv * _DitheringCoords.xy + _DitheringCoords.zw).a * 2.0 - 1.0;
+        noise = sign(noise) * (1.0 - sqrt(1.0 - abs(noise))) / 255.0;
+
+        color += noise;
+    }
+    #endif
+
+    return color;
+}

PostProcessing/Resources/Shaders/UberSecondPass.cginc.meta

@@ -1,4 +1,4 @@
-using UnityEngine.Rendering;
+using System;
 
 namespace UnityEngine.PostProcessing
 {
@@ -45,17 +45,25 @@ public void ResetHistory()
             m_ResetHistory = true;
         }
 
-        public void SetProjectionMatrix()
+        public void SetProjectionMatrix(Func<Vector2, Matrix4x4> jitteredFunc)
         {
             var settings = model.settings.taaSettings;
 
             var jitter = GenerateRandomOffset();
             jitter *= settings.jitterSpread;
 
             context.camera.nonJitteredProjectionMatrix = context.camera.projectionMatrix;
-            context.camera.projectionMatrix = context.camera.orthographic
-                ? GetOrthographicProjectionMatrix(jitter)
-                : GetPerspectiveProjectionMatrix(jitter);
+
+            if (jitteredFunc != null)
+            {
+                context.camera.projectionMatrix = jitteredFunc(jitter);
+            }
+            else
+            {
+                context.camera.projectionMatrix = context.camera.orthographic
+                    ? GetOrthographicProjectionMatrix(jitter)
+                    : GetPerspectiveProjectionMatrix(jitter);
+            }
 
 #if UNITY_5_5_OR_NEWER
             context.camera.useJitteredProjectionMatrixForTransparentRendering = false;
@@ -198,7 +206,7 @@ public override void OnDisable()
 
             m_HistoryTexture = null;
             m_SampleIndex = 0;
-	        ResetHistory();
+            ResetHistory();
         }
     }
 }

PostProcessing/Runtime/Components/TaaComponent.cs

@@ -16,6 +16,9 @@ public class PostProcessingBehaviour : MonoBehaviour
         // Inspector fields
         public PostProcessingProfile profile;
 
+        public Func<Vector2, Matrix4x4> jitteredMatrixFunc;
+        Matrix4x4 nonJitteredProjectionMatrix;
+
         // Internal helpers
         Dictionary<Type, KeyValuePair<CameraEvent, CommandBuffer>> m_CommandBuffers;
         List<PostProcessingComponentBase> m_Components;
@@ -149,7 +152,10 @@ void OnPreCull()
 
             // Temporal antialiasing jittering, needs to happen before culling
             if (!m_RenderingInSceneView && m_Taa.active && !profile.debugViews.willInterrupt)
-                m_Taa.SetProjectionMatrix();
+            {
+                nonJitteredProjectionMatrix = m_Context.camera.projectionMatrix;
+                m_Taa.SetProjectionMatrix(jitteredMatrixFunc);
+            }
         }
 
         void OnPreRender()
@@ -171,7 +177,8 @@ void OnPostRender()
             if (profile == null || m_Camera == null)
                 return;
 
-            m_Camera.ResetProjectionMatrix();
+            if (!m_RenderingInSceneView && m_Taa.active && !profile.debugViews.willInterrupt)
+                m_Context.camera.projectionMatrix = nonJitteredProjectionMatrix;
         }
 
         // Classic render target pipeline for RT-based effects
@@ -234,30 +241,41 @@ void OnRenderImage(RenderTexture source, RenderTexture destination)
 
             uberActive |= TryPrepareUberImageEffect(m_ChromaticAberration, uberMaterial);
             uberActive |= TryPrepareUberImageEffect(m_ColorGrading, uberMaterial);
-            uberActive |= TryPrepareUberImageEffect(m_UserLut, uberMaterial);
-            uberActive |= TryPrepareUberImageEffect(m_Grain, uberMaterial);
             uberActive |= TryPrepareUberImageEffect(m_Vignette, uberMaterial);
-            uberActive |= TryPrepareUberImageEffect(m_Dithering, uberMaterial);
+            uberActive |= TryPrepareUberImageEffect(m_UserLut, uberMaterial);
 
-            // Render to destination
-            if (uberActive)
+            var fxaaMaterial = fxaaActive
+                ? m_MaterialFactory.Get("Hidden/Post FX/FXAA")
+                : null;
+
+            if (fxaaActive)
             {
-                if (!GraphicsUtils.isLinearColorSpace)
-                    uberMaterial.EnableKeyword("UNITY_COLORSPACE_GAMMA");
+                fxaaMaterial.shaderKeywords = null;
+                TryPrepareUberImageEffect(m_Grain, fxaaMaterial);
+                TryPrepareUberImageEffect(m_Dithering, fxaaMaterial);
 
-                var input = src;
-                var output = dst;
-                if (fxaaActive)
+                if (uberActive)
                 {
-                    output = m_RenderTextureFactory.Get(src);
+                    var output = m_RenderTextureFactory.Get(src);
+                    Graphics.Blit(src, output, uberMaterial, 0);
                     src = output;
                 }
 
-                Graphics.Blit(input, output, uberMaterial, 0);
+                m_Fxaa.Render(src, dst);
             }
+            else
+            {
+                uberActive |= TryPrepareUberImageEffect(m_Grain, uberMaterial);
+                uberActive |= TryPrepareUberImageEffect(m_Dithering, uberMaterial);
 
-            if (fxaaActive)
-                m_Fxaa.Render(src, dst);
+                if (uberActive)
+                {
+                    if (!GraphicsUtils.isLinearColorSpace)
+                        uberMaterial.EnableKeyword("UNITY_COLORSPACE_GAMMA");
+
+                    Graphics.Blit(src, dst, uberMaterial, 0);
+                }
+            }
 
             if (!uberActive && !fxaaActive)
                 Graphics.Blit(src, dst);