[UUM-77742] Fix depth rendering when using Render Objects

Author: seungwon-oh

Packages/com.unity.render-pipelines.universal/Editor/UniversalRendererDataEditor.cs

@@ -18,6 +18,7 @@ private static class Styles
             public static readonly GUIContent PostProcessIncluded = EditorGUIUtility.TrTextContent("Enabled", "Enables the use of post processing effects within the scene. If disabled, Unity excludes post processing renderer Passes, shaders and textures from the build.");
             public static readonly GUIContent PostProcessLabel = EditorGUIUtility.TrTextContent("Data", "The asset containing references to shaders and Textures that the Renderer uses for post-processing.");
             public static readonly GUIContent FilteringSectionLabel = EditorGUIUtility.TrTextContent("Filtering", "Settings that controls and define which layers the renderer draws.");
+            public static readonly GUIContent PrepassMask = EditorGUIUtility.TrTextContent("Prepass Layer Mask", "Controls which prepass layers this renderer draws. It applies to any prepass.");
             public static readonly GUIContent OpaqueMask = EditorGUIUtility.TrTextContent("Opaque Layer Mask", "Controls which opaque layers this renderer draws.");
             public static readonly GUIContent TransparentMask = EditorGUIUtility.TrTextContent("Transparent Layer Mask", "Controls which transparent layers this renderer draws.");
 
@@ -45,6 +46,7 @@ private static class Styles
             public static readonly GUIContent deferredPlusIncompatibleWarning = EditorGUIUtility.TrTextContent("Deferred+ is only available with Render Graph. In compatibility mode, Deferred+ falls back to Forward+.");
         }
 
+        SerializedProperty m_PrepassLayerMask;
         SerializedProperty m_OpaqueLayerMask;
         SerializedProperty m_TransparentLayerMask;
         SerializedProperty m_RenderingMode;
@@ -64,6 +66,7 @@ private static class Styles
 
         private void OnEnable()
         {
+            m_PrepassLayerMask = serializedObject.FindProperty("m_PrepassLayerMask");
             m_OpaqueLayerMask = serializedObject.FindProperty("m_OpaqueLayerMask");
             m_TransparentLayerMask = serializedObject.FindProperty("m_TransparentLayerMask");
             m_RenderingMode = serializedObject.FindProperty("m_RenderingMode");
@@ -160,6 +163,11 @@ public override void OnInspectorGUI()
 
             EditorGUILayout.LabelField(Styles.FilteringSectionLabel, EditorStyles.boldLabel);
             EditorGUI.indentLevel++;
+            if (GraphicsSettings.TryGetRenderPipelineSettings<RenderGraphSettings>(out var renderGraphSettings)
+                && !renderGraphSettings.enableRenderCompatibilityMode)
+            {
+                EditorGUILayout.PropertyField(m_PrepassLayerMask, Styles.PrepassMask);
+            }
             EditorGUILayout.PropertyField(m_OpaqueLayerMask, Styles.OpaqueMask);
             EditorGUILayout.PropertyField(m_TransparentLayerMask, Styles.TransparentMask);
             EditorGUI.indentLevel--;
@@ -222,8 +230,7 @@ public override void OnInspectorGUI()
 
 
             EditorGUI.indentLevel--;
-            if (GraphicsSettings.TryGetRenderPipelineSettings<RenderGraphSettings>(out var renderGraphSettings)
-                && renderGraphSettings.enableRenderCompatibilityMode)
+            if (renderGraphSettings != null && renderGraphSettings.enableRenderCompatibilityMode)
             {
                 EditorGUILayout.Space();
                 EditorGUILayout.LabelField(Styles.RenderPassSectionLabel, EditorStyles.boldLabel);

Packages/com.unity.render-pipelines.universal/Runtime/FrameData/UniversalRenderingData.cs

@@ -48,6 +48,11 @@ internal CommandBuffer commandBuffer
         /// </summary>
         public RenderingMode renderingMode { get; internal set; }
 
+        /// <summary>
+        /// The layer mask set on the renderer to filter prepass objects.
+        /// </summary>
+        public LayerMask prepassLayerMask { get; internal set; }
+
         /// <summary>
         /// The layer mask set on the renderer to filter opaque objects.
         /// </summary>
@@ -72,6 +77,7 @@ public override void Reset()
             perObjectData = default;
             renderingMode = default;
             stencilLodCrossFadeEnabled = default;
+            prepassLayerMask = -1;
             opaqueLayerMask = -1;
             transparentLayerMask = -1;
         }

Packages/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipeline.cs

@@ -1613,6 +1613,7 @@ static UniversalRenderingData CreateRenderingData(ContextContainer frameData, Un
             if (universalRenderer != null)
             {
                 data.renderingMode = universalRenderer.renderingModeActual;
+                data.prepassLayerMask = universalRenderer.prepassLayerMask;
                 data.opaqueLayerMask = universalRenderer.opaqueLayerMask;
                 data.transparentLayerMask = universalRenderer.transparentLayerMask;
             }

Packages/com.unity.render-pipelines.universal/Runtime/UniversalRenderer.cs

@@ -213,6 +213,7 @@ internal RenderingMode renderingModeActual  {
         internal PostProcessPass finalPostProcessPass { get => m_PostProcessPasses.finalPostProcessPass; }
         internal RTHandle colorGradingLut { get => m_PostProcessPasses.colorGradingLut; }
         internal DeferredLights deferredLights { get => m_DeferredLights; }
+        internal LayerMask prepassLayerMask { get; set; }
         internal LayerMask opaqueLayerMask { get; set; }
         internal LayerMask transparentLayerMask { get; set; }
         internal bool shadowTransparentReceive { get; set; }
@@ -265,6 +266,15 @@ public UniversalRenderer(UniversalRendererData data) : base(data)
             m_DefaultStencilState.SetZFailOperation(stencilData.zFailOperation);
 
             m_IntermediateTextureMode = data.intermediateTextureMode;
+            if (GraphicsSettings.TryGetRenderPipelineSettings<RenderGraphSettings>(out var renderGraphSettings)
+                && !renderGraphSettings.enableRenderCompatibilityMode)
+            {
+                prepassLayerMask = data.prepassLayerMask;
+            }
+            else
+            {
+                prepassLayerMask = data.opaqueLayerMask;
+            }
             opaqueLayerMask = data.opaqueLayerMask;
             transparentLayerMask = data.transparentLayerMask;
             shadowTransparentReceive = data.shadowTransparentReceive;
@@ -319,8 +329,8 @@ public UniversalRenderer(UniversalRendererData data) : base(data)
             // Schedule XR copydepth right after m_FinalBlitPass
             m_XRCopyDepthPass = new CopyDepthPass(RenderPassEvent.AfterRendering + k_AfterFinalBlitPassQueueOffset, copyDephPS);
 #endif
-            m_DepthPrepass = new DepthOnlyPass(RenderPassEvent.BeforeRenderingPrePasses, RenderQueueRange.opaque, data.opaqueLayerMask);
-            m_DepthNormalPrepass = new DepthNormalOnlyPass(RenderPassEvent.BeforeRenderingPrePasses, RenderQueueRange.opaque, data.opaqueLayerMask);
+            m_DepthPrepass = new DepthOnlyPass(RenderPassEvent.BeforeRenderingPrePasses, RenderQueueRange.opaque, prepassLayerMask);
+            m_DepthNormalPrepass = new DepthNormalOnlyPass(RenderPassEvent.BeforeRenderingPrePasses, RenderQueueRange.opaque, prepassLayerMask);
 
             if (renderingModeRequested == RenderingMode.Forward || renderingModeRequested == RenderingMode.ForwardPlus)
             {

Packages/com.unity.render-pipelines.universal/Runtime/UniversalRendererData.cs

@@ -132,8 +132,9 @@ static void CreateUniversalRendererData()
         /// </summary>
         public PostProcessData postProcessData = null;
 
-        const int k_LatestAssetVersion = 2;
+        const int k_LatestAssetVersion = 3;
         [SerializeField] int m_AssetVersion = 0;
+        [SerializeField] LayerMask m_PrepassLayerMask = -1;
         [SerializeField] LayerMask m_OpaqueLayerMask = -1;
         [SerializeField] LayerMask m_TransparentLayerMask = -1;
         [SerializeField] StencilStateData m_DefaultStencilState = new StencilStateData() { passOperation = StencilOp.Replace }; // This default state is compatible with deferred renderer.
@@ -163,6 +164,19 @@ protected override ScriptableRenderer Create()
             return new UniversalRenderer(this);
         }
 
+        /// <summary>
+        /// Use this to configure how to filter prepass objects.
+        /// </summary>
+        public LayerMask prepassLayerMask
+        {
+            get => m_PrepassLayerMask;
+            set
+            {
+                SetDirty();
+                m_PrepassLayerMask = value;
+            }
+        }
+
         /// <summary>
         /// Use this to configure how to filter opaque objects.
         /// </summary>
@@ -399,6 +413,10 @@ void ISerializationCallbackReceiver.OnAfterDeserialize()
                 m_CopyDepthMode = CopyDepthMode.AfterOpaques;
             }
 
+            if (m_AssetVersion <= 2)
+            {
+                m_PrepassLayerMask = m_OpaqueLayerMask;
+            }
 
             m_AssetVersion = k_LatestAssetVersion;
         }

Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/URPAssets/DefaultURPAsset.asset

@@ -57,6 +57,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 89054f48c57da7c479fee17c7a703635, type: 2}
   - {fileID: 11400000, guid: 030c8301f2c12b94fa730f3f402b803e, type: 2}
   - {fileID: 11400000, guid: 07cb18bb06b5e43c09f9c046804bde0d, type: 2}
+  - {fileID: 11400000, guid: 6810122dc0f8d244faf9c3cd24516686, type: 2}
   m_DefaultRendererIndex: 0
   m_RequireDepthTexture: 1
   m_RequireOpaqueTexture: 1