making depthOnly pass compatible to render color texture and changing shaders to accommodate that

jonuuukas · jonuuukas · commit 933f089b7598 · 2021-08-12T16:43:25.000+03:00
diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/230_Decals/Materials/Brick.mat b/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
diff --git a/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/DepthOnlyPass.hlsl b/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/DepthOnlyPass.hlsl
@@ -23,7 +23,7 @@ half4 frag(PackedVaryings packedInput) : SV_TARGET
         clip(surfaceDescription.Alpha - surfaceDescription.AlphaClipThreshold);
     #endif
 
-    return 0;
+    return packedInput.positionCS.z;
 }
 
 #endif
diff --git a/com.unity.render-pipelines.universal/Editor/ShaderGraph/Targets/UniversalTarget.cs b/com.unity.render-pipelines.universal/Editor/ShaderGraph/Targets/UniversalTarget.cs
@@ -1165,7 +1165,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;
diff --git a/com.unity.render-pipelines.universal/Runtime/Passes/DepthOnlyPass.cs b/com.unity.render-pipelines.universal/Runtime/Passes/DepthOnlyPass.cs
@@ -21,7 +21,7 @@ public class DepthOnlyPass : ScriptableRenderPass
         FilteringSettings m_FilteringSettings;
 
         // Constants
-        private const int k_DepthBufferBits = 32;
+        private const int k_DepthBufferBits = 0;
 
         /// <summary>
         /// Create the DepthOnlyPass
@@ -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,7 @@ public void Setup(
             RenderTargetHandle depthAttachmentHandle)
         {
             this.depthAttachmentHandle = depthAttachmentHandle;
-            baseDescriptor.colorFormat = RenderTextureFormat.Depth;
+            baseDescriptor.graphicsFormat = GraphicsFormat.R32_SFloat;
             baseDescriptor.depthBufferBits = k_DepthBufferBits;
 
             // Depth-Only pass don't use MSAA
@@ -62,15 +63,16 @@ public override void OnCameraSetup(CommandBuffer cmd, ref RenderingData renderin
             if (renderingData.cameraData.renderer.useDepthPriming && (renderingData.cameraData.renderType == CameraRenderType.Base || renderingData.cameraData.clearDepth))
             {
                 ConfigureTarget(renderingData.cameraData.renderer.cameraDepthTarget, GraphicsFormat.DepthAuto, 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), GraphicsFormat.DepthAuto, desc.width, desc.height, 1, true);
+                useNativeRenderPass = true;
+                ConfigureTarget(new RenderTargetIdentifier(depthAttachmentHandle.Identifier(), 0, CubemapFace.Unknown, -1), GraphicsFormat.R32_SFloat, desc.width, desc.height, 1, false);
+                ConfigureClear(ClearFlag.Color, 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/>
diff --git a/com.unity.render-pipelines.universal/Runtime/Passes/FinalBlitPass.cs b/com.unity.render-pipelines.universal/Runtime/Passes/FinalBlitPass.cs
@@ -108,7 +108,7 @@ public override void Execute(ScriptableRenderContext context, ref RenderingData
                         cameraTarget,
                         RenderBufferLoadAction.Load,
                         RenderBufferStoreAction.Store,
-                        ClearFlag.None,
+                        ClearFlag.Depth,
                         Color.black);
 
                     Camera camera = cameraData.camera;
diff --git a/com.unity.render-pipelines.universal/Shaders/BakedLit.shader b/com.unity.render-pipelines.universal/Shaders/BakedLit.shader
@@ -82,7 +82,7 @@ Shader "Universal Render Pipeline/Baked Lit"
             Tags{"LightMode" = "DepthOnly"}
 
             ZWrite On
-            ColorMask 0
+            ColorMask R
 
             HLSLPROGRAM
             #pragma exclude_renderers gles gles3 glcore
@@ -280,7 +280,7 @@ Shader "Universal Render Pipeline/Baked Lit"
             Tags{"LightMode" = "DepthOnly"}
 
             ZWrite On
-            ColorMask 0
+            ColorMask R
 
             HLSLPROGRAM
             #pragma only_renderers gles gles3 glcore d3d11
diff --git a/com.unity.render-pipelines.universal/Shaders/ComplexLit.shader b/com.unity.render-pipelines.universal/Shaders/ComplexLit.shader
@@ -191,7 +191,7 @@ Shader "Universal Render Pipeline/Complex Lit"
             Tags{"LightMode" = "DepthOnly"}
 
             ZWrite On
-            ColorMask 0
+            ColorMask R
             Cull[_Cull]
 
             HLSLPROGRAM
@@ -420,7 +420,7 @@ Shader "Universal Render Pipeline/Complex Lit"
             Tags{"LightMode" = "DepthOnly"}
 
             ZWrite On
-            ColorMask 0
+            ColorMask R
             Cull[_Cull]
 
             HLSLPROGRAM
diff --git a/com.unity.render-pipelines.universal/Shaders/DepthOnlyPass.hlsl b/com.unity.render-pipelines.universal/Shaders/DepthOnlyPass.hlsl
@@ -29,11 +29,11 @@ Varyings DepthOnlyVertex(Attributes input)
     return output;
 }
 
-half4 DepthOnlyFragment(Varyings input) : SV_TARGET
+float DepthOnlyFragment(Varyings input) : SV_TARGET
 {
     UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input);
 
     Alpha(SampleAlbedoAlpha(input.uv, TEXTURE2D_ARGS(_BaseMap, sampler_BaseMap)).a, _BaseColor, _Cutoff);
-    return 0;
+    return input.positionCS.z;
 }
 #endif
diff --git a/com.unity.render-pipelines.universal/Shaders/Lit.shader b/com.unity.render-pipelines.universal/Shaders/Lit.shader
@@ -260,7 +260,7 @@ Shader "Universal Render Pipeline/Lit"
             Tags{"LightMode" = "DepthOnly"}
 
             ZWrite On
-            ColorMask 0
+            ColorMask R
             Cull[_Cull]
 
             HLSLPROGRAM
@@ -495,7 +495,7 @@ Shader "Universal Render Pipeline/Lit"
             Tags{"LightMode" = "DepthOnly"}
 
             ZWrite On
-            ColorMask 0
+            ColorMask R
             Cull[_Cull]
 
             HLSLPROGRAM
diff --git a/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree7.shader b/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree7.shader
@@ -168,7 +168,7 @@ Shader "Universal Render Pipeline/Nature/SpeedTree7"
             Name "DepthOnly"
             Tags{"LightMode" = "DepthOnly"}
 
-            ColorMask 0
+            ColorMask R
 
             HLSLPROGRAM
 
diff --git a/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree7Billboard.shader b/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree7Billboard.shader
@@ -116,7 +116,7 @@ Shader "Universal Render Pipeline/Nature/SpeedTree7 Billboard"
             Name "DepthOnly"
             Tags{"LightMode" = "DepthOnly"}
 
-            ColorMask 0
+            ColorMask R
 
             HLSLPROGRAM
 
diff --git a/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree8.shader b/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree8.shader
@@ -197,7 +197,7 @@ Shader "Universal Render Pipeline/Nature/SpeedTree8"
             Tags{"LightMode" = "DepthOnly"}
 
             ZWrite On
-            ColorMask 0
+            ColorMask R
 
             HLSLPROGRAM
 
diff --git a/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesDepthOnlyPass.hlsl b/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesDepthOnlyPass.hlsl
@@ -30,7 +30,7 @@ VaryingsDepthOnlyParticle DepthOnlyVertex(AttributesDepthOnlyParticle input)
     return output;
 }
 
-half4 DepthOnlyFragment(VaryingsDepthOnlyParticle input) : SV_TARGET
+float DepthOnlyFragment(VaryingsDepthOnlyParticle input) : SV_TARGET
 {
     UNITY_SETUP_INSTANCE_ID(input);
     UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input);
@@ -57,7 +57,7 @@ half4 DepthOnlyFragment(VaryingsDepthOnlyParticle input) : SV_TARGET
         AlphaDiscard(albedo.a, _Cutoff);
     #endif
 
-    return 0;
+    return input.clipPos.z;
 }
 
 #endif // UNIVERSAL_PARTICLES_LIT_DEPTH_ONLY_PASS_INCLUDED
diff --git a/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesLit.shader b/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesLit.shader
@@ -211,7 +211,7 @@ Shader "Universal Render Pipeline/Particles/Lit"
             Tags{"LightMode" = "DepthOnly"}
 
             ZWrite On
-            ColorMask 0
+            ColorMask R
             Cull[_Cull]
 
             HLSLPROGRAM
diff --git a/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesSimpleLit.shader b/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesSimpleLit.shader
@@ -204,7 +204,7 @@ Shader "Universal Render Pipeline/Particles/Simple Lit"
             Tags{"LightMode" = "DepthOnly"}
 
             ZWrite On
-            ColorMask 0
+            ColorMask R
             Cull[_Cull]
 
             HLSLPROGRAM
diff --git a/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesUnlit.shader b/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesUnlit.shader
@@ -119,7 +119,7 @@ Shader "Universal Render Pipeline/Particles/Unlit"
             Tags{"LightMode" = "DepthOnly"}
 
             ZWrite On
-            ColorMask 0
+            ColorMask R
             Cull[_Cull]
 
             HLSLPROGRAM
diff --git a/com.unity.render-pipelines.universal/Shaders/SimpleLit.shader b/com.unity.render-pipelines.universal/Shaders/SimpleLit.shader
@@ -214,7 +214,7 @@ Shader "Universal Render Pipeline/Simple Lit"
             Tags{"LightMode" = "DepthOnly"}
 
             ZWrite On
-            ColorMask 0
+            ColorMask R
             Cull[_Cull]
 
             HLSLPROGRAM
@@ -417,7 +417,7 @@ Shader "Universal Render Pipeline/Simple Lit"
             Tags{"LightMode" = "DepthOnly"}
 
             ZWrite On
-            ColorMask 0
+            ColorMask R
             Cull[_Cull]
 
             HLSLPROGRAM
diff --git a/com.unity.render-pipelines.universal/Shaders/Terrain/TerrainDetailLit.shader b/com.unity.render-pipelines.universal/Shaders/Terrain/TerrainDetailLit.shader
@@ -175,7 +175,7 @@ Shader "Hidden/TerrainEngine/Details/UniversalPipeline/Vertexlit"
             Tags{"LightMode" = "DepthOnly"}
 
             ZWrite On
-            ColorMask 0
+            ColorMask R
 
             HLSLPROGRAM
             #pragma target 2.0
diff --git a/com.unity.render-pipelines.universal/Shaders/Terrain/TerrainLit.shader b/com.unity.render-pipelines.universal/Shaders/Terrain/TerrainLit.shader
@@ -182,7 +182,7 @@ Shader "Universal Render Pipeline/Terrain/Lit"
             Tags{"LightMode" = "DepthOnly"}
 
             ZWrite On
-            ColorMask 0
+            ColorMask R
 
             HLSLPROGRAM
             #pragma target 2.0
diff --git a/com.unity.render-pipelines.universal/Shaders/Terrain/TerrainLitBase.shader b/com.unity.render-pipelines.universal/Shaders/Terrain/TerrainLitBase.shader
@@ -152,7 +152,7 @@ Shader "Hidden/Universal Render Pipeline/Terrain/Lit (Base Pass)"
             Tags{"LightMode" = "DepthOnly"}
 
             ZWrite On
-            ColorMask 0
+            ColorMask R
 
             HLSLPROGRAM
             #pragma target 2.0
diff --git a/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrass.shader b/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrass.shader
@@ -62,7 +62,7 @@ Shader "Hidden/TerrainEngine/Details/UniversalPipeline/WavingDoublePass"
             Tags{"LightMode" = "DepthOnly"}
 
             ZWrite On
-            ColorMask 0
+            ColorMask R
             Cull Off
 
             HLSLPROGRAM
diff --git a/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrassBillboard.shader b/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrassBillboard.shader
@@ -57,7 +57,7 @@ Shader "Hidden/TerrainEngine/Details/UniversalPipeline/BillboardWavingDoublePass
             Tags{"LightMode" = "DepthOnly"}
 
             ZWrite On
-            ColorMask 0
+            ColorMask R
             Cull Off
 
             HLSLPROGRAM
diff --git a/com.unity.render-pipelines.universal/Shaders/Unlit.shader b/com.unity.render-pipelines.universal/Shaders/Unlit.shader
@@ -69,7 +69,7 @@ Shader "Universal Render Pipeline/Unlit"
             Tags{"LightMode" = "DepthOnly"}
 
             ZWrite On
-            ColorMask 0
+            ColorMask R
 
             HLSLPROGRAM
             #pragma exclude_renderers gles gles3 glcore
@@ -188,7 +188,7 @@ Shader "Universal Render Pipeline/Unlit"
             Tags{"LightMode" = "DepthOnly"}
 
             ZWrite On
-            ColorMask 0
+            ColorMask R
 
             HLSLPROGRAM
             #pragma only_renderers gles gles3 glcore d3d11

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ half4 frag(PackedVaryings packedInput) : SV_TARGET`
`23`	`23`	`clip(surfaceDescription.Alpha - surfaceDescription.AlphaClipThreshold);`
`24`	`24`	`#endif`
`25`	`25`
`26`		`- return 0;`
	`26`	`+ return packedInput.positionCS.z;`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public class DepthOnlyPass : ScriptableRenderPass`
`21`	`21`	`FilteringSettings m_FilteringSettings;`
`22`	`22`
`23`	`23`	`// Constants`
`24`		`- private const int k_DepthBufferBits = 32;`
	`24`	`+ private const int k_DepthBufferBits = 0;`
`25`	`25`
`26`	`26`	`/// <summary>`
`27`	`27`	`/// Create the DepthOnlyPass`
`@@ -31,6 +31,7 @@ public DepthOnlyPass(RenderPassEvent evt, RenderQueueRange renderQueueRange, Lay`
`31`	`31`	`base.profilingSampler = new ProfilingSampler(nameof(DepthOnlyPass));`
`32`	`32`	`m_FilteringSettings = new FilteringSettings(renderQueueRange, layerMask);`
`33`	`33`	`renderPassEvent = evt;`
	`34`	`+ useNativeRenderPass = false;`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`/// <summary>`
`@@ -41,7 +42,7 @@ public void Setup(`
`41`	`42`	`RenderTargetHandle depthAttachmentHandle)`
`42`	`43`	`{`
`43`	`44`	`this.depthAttachmentHandle = depthAttachmentHandle;`
`44`		`- baseDescriptor.colorFormat = RenderTextureFormat.Depth;`
	`45`	`+ baseDescriptor.graphicsFormat = GraphicsFormat.R32_SFloat;`
`45`	`46`	`baseDescriptor.depthBufferBits = k_DepthBufferBits;`
`46`	`47`
`47`	`48`	`// Depth-Only pass don't use MSAA`
`@@ -62,15 +63,16 @@ public override void OnCameraSetup(CommandBuffer cmd, ref RenderingData renderin`
`62`	`63`	`if (renderingData.cameraData.renderer.useDepthPriming && (renderingData.cameraData.renderType == CameraRenderType.Base \|\| renderingData.cameraData.clearDepth))`
`63`	`64`	`{`
`64`	`65`	`ConfigureTarget(renderingData.cameraData.renderer.cameraDepthTarget, GraphicsFormat.DepthAuto, desc.width, desc.height, 1, true);`
	`66`	`+ // 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)`
	`67`	`+ ConfigureClear(ClearFlag.Depth, Color.black);`
`65`	`68`	`}`
`66`	`69`	`// When not using depth priming the camera target should be set to our non MSAA depth target.`
`67`	`70`	`else`
`68`	`71`	`{`
`69`		`- ConfigureTarget(new RenderTargetIdentifier(depthAttachmentHandle.Identifier(), 0, CubemapFace.Unknown, -1), GraphicsFormat.DepthAuto, desc.width, desc.height, 1, true);`
	`72`	`+ useNativeRenderPass = true;`
	`73`	`+ ConfigureTarget(new RenderTargetIdentifier(depthAttachmentHandle.Identifier(), 0, CubemapFace.Unknown, -1), GraphicsFormat.R32_SFloat, desc.width, desc.height, 1, false);`
	`74`	`+ ConfigureClear(ClearFlag.Color, Color.black);`
`70`	`75`	`}`
`71`		`-`
`72`		`- // 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)`
`73`		`- ConfigureClear(ClearFlag.Depth, Color.black);`
`74`	`76`	`}`
`75`	`77`
`76`	`78`	`/// <inheritdoc/>`
Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,11 @@ Varyings DepthOnlyVertex(Attributes input)`
`29`	`29`	`return output;`
`30`	`30`	`}`
`31`	`31`
`32`		`-half4 DepthOnlyFragment(Varyings input) : SV_TARGET`
	`32`	`+float DepthOnlyFragment(Varyings input) : SV_TARGET`
`33`	`33`	`{`
`34`	`34`	`UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input);`
`35`	`35`
`36`	`36`	`Alpha(SampleAlbedoAlpha(input.uv, TEXTURE2D_ARGS(_BaseMap, sampler_BaseMap)).a, _BaseColor, _Cutoff);`
`37`		`- return 0;`
	`37`	`+ return input.positionCS.z;`
`38`	`38`	`}`
`39`	`39`	`#endif`