Universal/depth copy as color

TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/230_Decals/Materials/Brick.mat

@@ -13,7 +13,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 2000
+  m_CustomRenderQueue: 1999
   stringTagMap:
     RenderType: Opaque
   disabledShaderPasses: []
@@ -95,7 +95,7 @@ Material:
     - _Metallic: 0
     - _OcclusionStrength: 0.387
     - _Parallax: 0.0477
-    - _QueueOffset: 0
+    - _QueueOffset: -1
     - _ReceiveShadows: 1
     - _Smoothness: 0.742
     - _SmoothnessTextureChannel: 0

com.unity.render-pipelines.core/ShaderLibrary/API/Metal.hlsl

@@ -150,7 +150,6 @@
 #define GATHER_GREEN_TEXTURE2D(textureName, samplerName, coord2)          textureName.GatherGreen(samplerName, coord2)
 #define GATHER_BLUE_TEXTURE2D(textureName, samplerName, coord2)           textureName.GatherBlue(samplerName, coord2)
 #define GATHER_ALPHA_TEXTURE2D(textureName, samplerName, coord2)          textureName.GatherAlpha(samplerName, coord2)
-
-#if defined(SHADER_API_MOBILE)
+#if defined(UNITY_FRAMEBUFFER_FETCH_AVAILABLE)
 #define PLATFORM_SUPPORTS_NATIVE_RENDERPASS
 #endif

com.unity.render-pipelines.universal/Editor/Decal/DecalPass.template

@@ -63,7 +63,10 @@ Pass
     #ifdef SCENEPICKINGPASS
     float4 _SelectionID;
     #endif
-
+    #if _RENDER_PASS_ENABLED
+    #define GBUFFER3 0
+    FRAMEBUFFER_INPUT_HALF(GBUFFER3);
+    #endif
     // Includes
     $splice(PreGraphIncludes)
 

com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/DepthOnlyPass.hlsl

@@ -21,7 +21,7 @@ half4 frag(PackedVaryings packedInput) : SV_TARGET
         clip(surfaceDescription.Alpha - surfaceDescription.AlphaClipThreshold);
     #endif
 
-    return 0;
+    return packedInput.positionCS.z;
 }
 
 #endif

com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/ShaderPassDecal.hlsl

@@ -181,12 +181,20 @@ void Frag(PackedVaryings packedInput,
 
 #if defined(DECAL_PROJECTOR)
 #if UNITY_REVERSED_Z
+#if _RENDER_PASS_ENABLED
+    float depth = LOAD_FRAMEBUFFER_INPUT(GBUFFER3, input.positionCS.xy);
+#else
     float depth = LoadSceneDepth(input.positionCS.xy);
+#endif
+#else
+#if _RENDER_PASS_ENABLED
+    float depth = lerp(UNITY_NEAR_CLIP_VALUE, 1, LOAD_FRAMEBUFFER_INPUT(GBUFFER3, input.positionCS.xy));
 #else
     // Adjust z to match NDC for OpenGL
     float depth = lerp(UNITY_NEAR_CLIP_VALUE, 1, LoadSceneDepth(input.positionCS.xy));
 #endif
 #endif
+#endif
 
 #if defined(DECAL_RECONSTRUCT_NORMAL)
     #if defined(_DECAL_NORMAL_BLEND_HIGH)

com.unity.render-pipelines.universal/Editor/ShaderGraph/Targets/UniversalDecalSubTarget.cs

@@ -977,6 +977,7 @@ static class Descriptors
                 { CoreKeywordDescriptors.MixedLightingSubtractive },
                 { Descriptors.DecalsNormalBlend },
                 { CoreKeywordDescriptors.GBufferNormalsOct },
+                { CoreKeywordDescriptors.RenderPassEnabled },
                 { Descriptors.LodCrossFade, new FieldCondition(Fields.LodCrossFade, true) },
             };
 
@@ -986,6 +987,7 @@ static class Descriptors
                 { CoreKeywordDescriptors.ShadowsSoft },
                 { Descriptors.DecalsNormalBlend },
                 { CoreKeywordDescriptors.GBufferNormalsOct },
+                { CoreKeywordDescriptors.RenderPassEnabled },
             };
         }
         #endregion

com.unity.render-pipelines.universal/Editor/ShaderGraph/Targets/UniversalTarget.cs

@@ -1242,7 +1242,7 @@ public static RenderStateCollection DepthOnly(UniversalTarget target)
                 { RenderState.ZTest(ZTest.LEqual) },
                 { RenderState.ZWrite(ZWrite.On) },
                 { UberSwitchedCullRenderState(target) },
-                { RenderState.ColorMask("ColorMask 0") },
+                { RenderState.ColorMask("ColorMask R") },
             };
 
             return result;

com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/VFXPasses.template

@@ -86,6 +86,9 @@ void frag(ps_input i
 #if VFX_PASSDEPTH == VFX_PASSDEPTH_ACTUAL
     #if defined(WRITE_NORMAL_BUFFER)
     , out float4 outNormalBuffer : SV_Target0
+    , out float4 outDepthColor : SV_Target1
+    #else
+    , out float4 outDepthColor : SV_Target0
     #endif
 #elif VFX_PASSDEPTH == VFX_PASSDEPTH_SELECTION
     , out float4 outColor : SV_Target0
@@ -130,7 +133,7 @@ void frag(ps_input i
         // We use depth prepass for scene selection in the editor, this code allow to output the outline correctly
         outColor = float4(_ObjectId, _PassValue, 1.0, 1.0);
     #elif VFX_PASSDEPTH == VFX_PASSDEPTH_ACTUAL
-        //void
+        outDepthColor = float4(i.VFX_VARYING_POSCS.z, 0,0,0);
     #elif VFX_PASSDEPTH == VFX_PASSDEPTH_SHADOW
         //void
     #else

com.unity.render-pipelines.universal/Runtime/Decal/ScreenSpace/DecalGBufferRenderPass.cs

@@ -17,6 +17,7 @@ internal class DecalGBufferRenderPass : ScriptableRenderPass
         private DecalDrawGBufferSystem m_DrawSystem;
         private DecalScreenSpaceSettings m_Settings;
         private DeferredLights m_DeferredLights;
+        private RenderTargetIdentifier[] m_GbufferAttachments;
 
         public DecalGBufferRenderPass(DecalScreenSpaceSettings settings, DecalDrawGBufferSystem drawSystem)
         {
@@ -41,7 +42,20 @@ internal void Setup(DeferredLights deferredLights)
 
         public override void OnCameraSetup(CommandBuffer cmd, ref RenderingData renderingData)
         {
-            ConfigureTarget(m_DeferredLights.GbufferAttachmentIdentifiers, m_DeferredLights.DepthAttachmentIdentifier);
+            if (m_DeferredLights != null && m_DeferredLights.UseRenderPass)
+            {
+                if (m_GbufferAttachments == null)
+                    m_GbufferAttachments = new RenderTargetIdentifier[]
+                    {
+                        m_DeferredLights.GbufferAttachmentIdentifiers[0], m_DeferredLights.GbufferAttachmentIdentifiers[1],
+                        m_DeferredLights.GbufferAttachmentIdentifiers[2], m_DeferredLights.GbufferAttachmentIdentifiers[3]
+                    };
+                ConfigureInputAttachments(m_DeferredLights.DepthCopyTextureIdentifier, false);
+            }
+            else
+                m_GbufferAttachments = m_DeferredLights.GbufferAttachmentIdentifiers;
+
+            ConfigureTarget(m_GbufferAttachments, m_DeferredLights.DepthAttachmentIdentifier);
         }
 
         public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData)

com.unity.render-pipelines.universal/Runtime/DeferredLights.cs

@@ -188,6 +188,7 @@ internal bool AccurateGbufferNormals
         // Output lighting result.
         internal RenderTargetHandle[] GbufferAttachments { get; set; }
         internal RenderTargetIdentifier[] DeferredInputAttachments { get; set; }
+        internal bool[] DeferredInputIsTransient { get; set; }
         // Input depth texture, also bound as read-only RT
         internal RenderTargetHandle DepthAttachment { get; set; }
         //
@@ -402,12 +403,17 @@ public void Setup(ref RenderingData renderingData,
                 this.GbufferAttachmentIdentifiers[i] = this.GbufferAttachments[i].Identifier();
                 this.GbufferFormats[i] = this.GetGBufferFormat(i);
             }
-            if (this.DeferredInputAttachments == null && this.UseRenderPass && this.GbufferAttachments.Length >= 5)
+            if (this.DeferredInputAttachments == null && this.UseRenderPass && this.GbufferAttachments.Length >= 3)
             {
                 this.DeferredInputAttachments = new RenderTargetIdentifier[4]
                 {
                     this.GbufferAttachmentIdentifiers[0], this.GbufferAttachmentIdentifiers[1],
-                    this.GbufferAttachmentIdentifiers[2], this.GbufferAttachmentIdentifiers[4]
+                    this.GbufferAttachmentIdentifiers[2], this.DepthCopyTextureIdentifier
+                };
+
+                this.DeferredInputIsTransient = new bool[4]
+                {
+                    true, true, true, false
                 };
             }
             this.DepthAttachmentIdentifier = depthAttachment.Identifier();

com.unity.render-pipelines.universal/Runtime/NativeRenderPass.cs

@@ -29,6 +29,11 @@ public partial class ScriptableRenderer
         };
         AttachmentDescriptor m_ActiveDepthAttachmentDescriptor;
 
+        bool[] m_IsActiveColorAttachmentTransient = new bool[]
+        {
+            false, false, false, false, false, false, false, false
+        };
+
         internal RenderBufferStoreAction[] m_FinalColorStoreAction = new RenderBufferStoreAction[]
         {
             RenderBufferStoreAction.Store, RenderBufferStoreAction.Store, RenderBufferStoreAction.Store, RenderBufferStoreAction.Store,
@@ -200,6 +205,7 @@ internal void SetNativeRenderPassMRTAttachmentList(ScriptableRenderPass renderPa
                 UpdateFinalStoreActions(currentMergeablePasses, cameraData);
 
                 int currentAttachmentIdx = 0;
+                bool hasInput = false;
                 foreach (var passIdx in currentMergeablePasses)
                 {
                     if (passIdx == -1)
@@ -248,7 +254,10 @@ internal void SetNativeRenderPassMRTAttachmentList(ScriptableRenderPass renderPa
                     }
 
                     if (PassHasInputAttachments(pass))
+                    {
+                        hasInput = true;
                         SetupInputAttachmentIndices(pass);
+                    }
 
                     // TODO: this is redundant and is being setup for each attachment. Needs to be done only once per mergeable pass list (we need to make sure mergeable passes use the same depth!)
                     m_ActiveDepthAttachmentDescriptor = new AttachmentDescriptor(SystemInfo.GetGraphicsFormat(DefaultFormat.DepthStencil));
@@ -260,6 +269,9 @@ internal void SetNativeRenderPassMRTAttachmentList(ScriptableRenderPass renderPa
                     if (m_UseOptimizedStoreActions)
                         m_ActiveDepthAttachmentDescriptor.storeAction = m_FinalDepthStoreAction;
                 }
+
+                if (hasInput)
+                    SetupTransientInputAttachments(m_RenderPassesAttachmentCount[currentPassHash]);
             }
         }
 
@@ -504,6 +516,7 @@ internal void ExecuteNativeRenderPass(ScriptableRenderContext context, Scriptabl
                 for (int i = 0; i < m_ActiveColorAttachmentDescriptors.Length; ++i)
                 {
                     m_ActiveColorAttachmentDescriptors[i] = RenderingUtils.emptyAttachment;
+                    m_IsActiveColorAttachmentTransient[i] = false;
                 }
 
                 m_ActiveDepthAttachmentDescriptor = RenderingUtils.emptyAttachment;
@@ -523,11 +536,25 @@ internal void SetupInputAttachmentIndices(ScriptableRenderPass pass)
                     continue;
                 }
 
-                // Assume input attachment has to be transient as ScriptableRenderPass currently has only setters for StoreAction
-                // We also change the target of the descriptor for it to be initialized engine-side as a transient resource.
-                m_ActiveColorAttachmentDescriptors[pass.m_InputAttachmentIndices[i]].loadAction = RenderBufferLoadAction.DontCare;
-                m_ActiveColorAttachmentDescriptors[pass.m_InputAttachmentIndices[i]].storeAction = RenderBufferStoreAction.DontCare;
-                m_ActiveColorAttachmentDescriptors[pass.m_InputAttachmentIndices[i]].loadStoreTarget = BuiltinRenderTextureType.None;
+                // Only update it as long as it has default value - if it was changed once, we assume it'll be memoryless in the whole RenderPass
+                if (!m_IsActiveColorAttachmentTransient[pass.m_InputAttachmentIndices[i]])
+                {
+                    m_IsActiveColorAttachmentTransient[pass.m_InputAttachmentIndices[i]] = pass.IsInputAttachmentTransient(i);
+                }
+            }
+        }
+
+        internal void SetupTransientInputAttachments(int attachmentCount)
+        {
+            for (int i = 0; i < attachmentCount; ++i)
+            {
+                if (!m_IsActiveColorAttachmentTransient[i])
+                    continue;
+
+                m_ActiveColorAttachmentDescriptors[i].loadAction = RenderBufferLoadAction.DontCare;
+                m_ActiveColorAttachmentDescriptors[i].storeAction = RenderBufferStoreAction.DontCare;
+                // We change the target of the descriptor for it to be initialized engine-side as a transient resource.
+                m_ActiveColorAttachmentDescriptors[i].loadStoreTarget = BuiltinRenderTextureType.None;
             }
         }
 

com.unity.render-pipelines.universal/Runtime/Passes/CopyDepthPass.cs

@@ -18,6 +18,9 @@ public class CopyDepthPass : ScriptableRenderPass
         private RenderTargetHandle destination { get; set; }
         internal bool AllocateRT { get; set; }
         internal int MssaSamples { get; set; }
+        // In some cases (Scene view, XR and etc.) we actually want to output to depth buffer
+        // So this variable needs to be set to true to enable the correct copy shader semantic
+        internal bool CopyToDepth { get; set; }
         Material m_CopyDepthMaterial;
 
         internal bool m_CopyResolvedDepth;
@@ -26,6 +29,7 @@ public CopyDepthPass(RenderPassEvent evt, Material copyDepthMaterial)
         {
             base.profilingSampler = new ProfilingSampler(nameof(CopyDepthPass));
             AllocateRT = true;
+            CopyToDepth = false;
             m_CopyDepthMaterial = copyDepthMaterial;
             renderPassEvent = evt;
             m_CopyResolvedDepth = false;
@@ -47,14 +51,25 @@ public void Setup(RenderTargetHandle source, RenderTargetHandle destination)
         public override void OnCameraSetup(CommandBuffer cmd, ref RenderingData renderingData)
         {
             var descriptor = renderingData.cameraData.cameraTargetDescriptor;
-            descriptor.colorFormat = RenderTextureFormat.Depth;
-            descriptor.depthBufferBits = 32; //TODO: do we really need this. double check;
+            descriptor.graphicsFormat = GraphicsFormat.R32_SFloat;
+#if UNITY_EDITOR
+            descriptor.depthBufferBits = 16;
+
+#else
+            descriptor.depthBufferBits = 0;
+
+#endif
             descriptor.msaaSamples = 1;
             if (this.AllocateRT)
                 cmd.GetTemporaryRT(destination.id, descriptor, FilterMode.Point);
 
+            var target = new RenderTargetIdentifier(destination.Identifier(), 0, CubemapFace.Unknown, -1);
+#if UNITY_EDITOR
+            ConfigureTarget(target, target, GraphicsFormat.R32_SFloat, descriptor.width, descriptor.height, descriptor.msaaSamples);
+#else
             // On Metal iOS, prevent camera attachments to be bound and cleared during this pass.
-            ConfigureTarget(new RenderTargetIdentifier(destination.Identifier(), 0, CubemapFace.Unknown, -1), descriptor.depthStencilFormat, descriptor.width, descriptor.height, descriptor.msaaSamples, true);
+            ConfigureTarget(target, GraphicsFormat.R32_SFloat, descriptor.width, descriptor.height, descriptor.msaaSamples, false);
+#endif
             ConfigureClear(ClearFlag.None, Color.black);
         }
 
@@ -112,6 +127,11 @@ public override void Execute(ScriptableRenderContext context, ref RenderingData
                         break;
                 }
 
+                if (CopyToDepth)
+                    cmd.EnableShaderKeyword("_OUTPUT_DEPTH");
+                else
+                    cmd.DisableShaderKeyword("_OUTPUT_DEPTH");
+
                 cmd.SetGlobalTexture("_CameraDepthAttachment", source.Identifier());
 
 

com.unity.render-pipelines.universal/Runtime/Passes/DeferredPass.cs

@@ -29,7 +29,7 @@ public override void Configure(CommandBuffer cmd, RenderTextureDescriptor camera
             RenderTargetIdentifier lightingAttachmentId = m_DeferredLights.GbufferAttachmentIdentifiers[m_DeferredLights.GBufferLightingIndex];
             RenderTargetIdentifier depthAttachmentId = m_DeferredLights.DepthAttachmentIdentifier;
             if (m_DeferredLights.UseRenderPass)
-                ConfigureInputAttachments(m_DeferredLights.DeferredInputAttachments);
+                ConfigureInputAttachments(m_DeferredLights.DeferredInputAttachments, m_DeferredLights.DeferredInputIsTransient);
 
             // TODO: change to m_DeferredLights.GetGBufferFormat(m_DeferredLights.GBufferLightingIndex) when it's not GraphicsFormat.None
             // TODO: Cannot currently bind depth texture as read-only!

com.unity.render-pipelines.universal/Runtime/Passes/DepthOnlyPass.cs

@@ -31,6 +31,7 @@ public DepthOnlyPass(RenderPassEvent evt, RenderQueueRange renderQueueRange, Lay
             base.profilingSampler = new ProfilingSampler(nameof(DepthOnlyPass));
             m_FilteringSettings = new FilteringSettings(renderQueueRange, layerMask);
             renderPassEvent = evt;
+            useNativeRenderPass = false;
         }
 
         /// <summary>
@@ -41,7 +42,8 @@ public void Setup(
             RenderTargetHandle depthAttachmentHandle)
         {
             this.depthAttachmentHandle = depthAttachmentHandle;
-            baseDescriptor.colorFormat = RenderTextureFormat.Depth;
+            baseDescriptor.graphicsFormat = GraphicsFormat.R32_SFloat;
+            // Even though this texture is going to be a color texture, we need depth buffer to correctly render it (ZTest and all)
             baseDescriptor.depthBufferBits = k_DepthBufferBits;
 
             // Depth-Only pass don't use MSAA
@@ -61,16 +63,18 @@ public override void OnCameraSetup(CommandBuffer cmd, ref RenderingData renderin
             // When depth priming is in use the camera target should not be overridden so the Camera's MSAA depth attachment is used.
             if (renderingData.cameraData.renderer.useDepthPriming && (renderingData.cameraData.renderType == CameraRenderType.Base || renderingData.cameraData.clearDepth))
             {
-                ConfigureTarget(renderingData.cameraData.renderer.cameraDepthTarget, descriptor.depthStencilFormat, desc.width, desc.height, 1, true);
+                ConfigureTarget(renderingData.cameraData.renderer.cameraDepthTarget, desc.depthStencilFormat, desc.width, desc.height, 1, true);
+                // Only clear depth here so we don't clear any bound color target. It might be unused by this pass but that doesn't mean we can just clear it. (e.g. in case of overlay cameras + depth priming)
+                ConfigureClear(ClearFlag.Depth, Color.black);
             }
             // When not using depth priming the camera target should be set to our non MSAA depth target.
             else
             {
-                ConfigureTarget(new RenderTargetIdentifier(depthAttachmentHandle.Identifier(), 0, CubemapFace.Unknown, -1), descriptor.depthStencilFormat, desc.width, desc.height, 1, true);
+                useNativeRenderPass = true;
+                var target = new RenderTargetIdentifier(depthAttachmentHandle.Identifier(), 0, CubemapFace.Unknown, -1);
+                ConfigureTarget(target, target, GraphicsFormat.R32_SFloat, desc.width, desc.height, 1);
+                ConfigureClear(ClearFlag.All, Color.black);
             }
-
-            // Only clear depth here so we don't clear any bound color target. It might be unused by this pass but that doesn't mean we can just clear it. (e.g. in case of overlay cameras + depth priming)
-            ConfigureClear(ClearFlag.Depth, Color.black);
         }
 
         /// <inheritdoc/>

com.unity.render-pipelines.universal/Runtime/Passes/FinalBlitPass.cs

@@ -109,7 +109,7 @@ public override void Execute(ScriptableRenderContext context, ref RenderingData
                         cameraTarget,
                         RenderBufferLoadAction.Load,
                         RenderBufferStoreAction.Store,
-                        ClearFlag.None,
+                        ClearFlag.Depth,
                         Color.black);
 
                     Camera camera = cameraData.camera;