Merge branch 'blit-copy-fix' into v2

Author: Chman

PostProcessing/PostProcessResources.asset

@@ -352,7 +352,7 @@ void OnPreCull()
             // tiled GPUs
             int tempRt = m_TargetPool.Get();
             m_LegacyCmdBuffer.GetTemporaryRT(tempRt, context.width, context.height, 24, FilterMode.Bilinear, sourceFormat);
-            m_LegacyCmdBuffer.Blit(cameraTarget, tempRt, RuntimeUtilities.copyMaterial, stopNaNPropagation ? 3 : 2);
+            m_LegacyCmdBuffer.Blit(cameraTarget, tempRt, RuntimeUtilities.copyStdMaterial, stopNaNPropagation ? 1 : 0);
             m_NaNKilled = stopNaNPropagation;
 
             context.command = m_LegacyCmdBuffer;

PostProcessing/Runtime/PostProcessLayer.cs

@@ -13,6 +13,7 @@ public sealed class Shaders
             public Shader autoExposure;
             public Shader bloom;
             public Shader copy;
+            public Shader copyStd;
             public Shader discardAlpha;
             public Shader depthOfField;
             public Shader finalPass;

PostProcessing/Runtime/PostProcessResources.cs

@@ -92,6 +92,25 @@ public static Mesh fullscreenTriangle
             }
         }
 
+        static Material s_CopyStdMaterial;
+        public static Material copyStdMaterial
+        {
+            get
+            {
+                if (s_CopyStdMaterial != null)
+                    return s_CopyStdMaterial;
+
+                var shader = Shader.Find("Hidden/PostProcessing/CopyStd");
+                s_CopyStdMaterial = new Material(shader)
+                {
+                    name = "PostProcess - CopyStd",
+                    hideFlags = HideFlags.HideAndDontSave
+                };
+
+                return s_CopyStdMaterial;
+            }
+        }
+
         static Material s_CopyMaterial;
         public static Material copyMaterial
         {

PostProcessing/Runtime/Utils/RuntimeUtilities.cs

@@ -1,35 +1,10 @@
 Shader "Hidden/PostProcessing/Copy"
 {
-    Properties
-    {
-        _MainTex ("", 2D) = "white" {}
-    }
-
     HLSLINCLUDE
 
         #include "../StdLib.hlsl"
 
-        struct AttributesClassic
-        {
-            float4 vertex : POSITION;
-            float2 texcoord : TEXCOORD0;
-        };
-
         TEXTURE2D_SAMPLER2D(_MainTex, sampler_MainTex);
-        float4 _MainTex_ST;
-
-        VaryingsDefault VertClassic(AttributesClassic v)
-        {
-            VaryingsDefault o;
-            o.vertex = float4(v.vertex.xy * 2.0 - 1.0, 0.0, 1.0);
-            o.texcoord = v.texcoord * _MainTex_ST.xy + _MainTex_ST.zw; // We need this for VR
-
-            #if UNITY_UV_STARTS_AT_TOP
-            o.texcoord = o.texcoord * float2(1.0, -1.0) + float2(0.0, 1.0);
-            #endif
-
-            return o;
-        }
 
         float4 Frag(VaryingsDefault i) : SV_Target
         {
@@ -78,27 +53,5 @@ Shader "Hidden/PostProcessing/Copy"
 
             ENDHLSL
         }
-
-        // 2 - Classic copy
-        Pass
-        {
-            HLSLPROGRAM
-
-                #pragma vertex VertClassic
-                #pragma fragment Frag
-
-            ENDHLSL
-        }
-
-        // 3 - Classic copy + NaN killer
-        Pass
-        {
-            HLSLPROGRAM
-
-                #pragma vertex VertClassic
-                #pragma fragment FragKillNaN
-
-            ENDHLSL
-        }
     }
 }

PostProcessing/Shaders/Builtins/Copy.shader

@@ -0,0 +1,93 @@
+Shader "Hidden/PostProcessing/CopyStd"
+{
+    //
+    // We need this shader for the very first RT blit using the internal CommandBuffer.Blit() method
+    // so it can handle AAResolve properly. We also need it to be separate because of VR and the
+    // need for a Properties block. If we were to add this block to the other Copy shader it would
+    // not allow us to manually bind _MainTex, thus breaking a few other things in the process...
+    //
+
+    Properties
+    {
+        _MainTex ("", 2D) = "white" {}
+    }
+
+    CGINCLUDE
+
+        struct Attributes
+        {
+            float4 vertex : POSITION;
+            float2 texcoord : TEXCOORD0;
+        };
+
+        struct Varyings
+        {
+            float4 vertex : SV_POSITION;
+            float2 texcoord : TEXCOORD0;
+        };
+
+        sampler2D _MainTex;
+        float4 _MainTex_ST;
+
+        Varyings Vert(Attributes v)
+        {
+            Varyings o;
+            o.vertex = float4(v.vertex.xy * 2.0 - 1.0, 0.0, 1.0);
+            o.texcoord = v.texcoord * _MainTex_ST.xy + _MainTex_ST.zw; // We need this for VR
+
+            #if UNITY_UV_STARTS_AT_TOP
+            o.texcoord = o.texcoord * float2(1.0, -1.0) + float2(0.0, 1.0);
+            #endif
+
+            return o;
+        }
+
+        float4 Frag(Varyings i) : SV_Target
+        {
+            float4 color = tex2D(_MainTex, i.texcoord);
+            return color;
+        }
+
+        float4 FragKillNaN(Varyings i) : SV_Target
+        {
+            float4 color = tex2D(_MainTex, i.texcoord);
+
+            #if !SHADER_API_GLES
+            if (any(isnan(color)) || any(isinf(color)))
+            {
+                color = (0.0).xxxx;
+            }
+            #endif
+
+            return color;
+        }
+
+    ENDCG
+
+    SubShader
+    {
+        Cull Off ZWrite Off ZTest Always
+
+        // 0 - Copy
+        Pass
+        {
+            CGPROGRAM
+
+                #pragma vertex Vert
+                #pragma fragment Frag
+
+            ENDCG
+        }
+
+        // 1 - Copy + NaN killer
+        Pass
+        {
+            CGPROGRAM
+
+                #pragma vertex Vert
+                #pragma fragment FragKillNaN
+
+            ENDCG
+        }
+    }
+}