[UUM-121776] - Graphics/URP - Fix RG API SetRenderAttachmentDepth() usage in URP

axoloto · Evergreen · commit 55e939263d92 · 2025-10-20T02:23:08.000Z
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/IRenderGraphBuilder.cs b/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/IRenderGraphBuilder.cs
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphUtilsBlit.cs b/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphUtilsBlit.cs
@@ -212,7 +212,7 @@ public static IBaseRenderGraphBuilder AddCopyPass(
                 passData.isMSAA = isMSAA;
                 passData.force2DForXR = isXRArrayTextureActive && (!isArrayTexture);
 
-                builder.SetInputAttachment(source, 0, AccessFlags.Read);
+                builder.SetInputAttachment(source, 0);
                 builder.SetRenderAttachment(destination, 0, AccessFlags.Write);
                 builder.SetRenderFunc((CopyPassData data, RasterGraphContext context) => CopyRenderFunc(data, context));
 
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/RendererFeatures/NewPostProcessRendererFeature.cs.txt b/Packages/com.unity.render-pipelines.universal/Editor/RendererFeatures/NewPostProcessRendererFeature.cs.txt
@@ -242,7 +242,7 @@ public sealed class #FEATURE_TYPE# : ScriptableRendererFeature
                 // Bind the depth-stencil buffer.
                 // This is a demonstration. The code isn't used in the example.
                 if (kBindDepthStencilAttachment)
-                    builder.SetRenderAttachmentDepth(resourcesData.activeDepthTexture, AccessFlags.Write);
+                    builder.SetRenderAttachmentDepth(resourcesData.activeDepthTexture);
 
                 // Set the render method.
                 builder.SetRenderFunc((MainPassData data, RasterGraphContext context) => ExecuteMainPass(data, context));
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/Decal/ScreenSpace/DecalGBufferRenderPass.cs b/Packages/com.unity.render-pipelines.universal/Runtime/Decal/ScreenSpace/DecalGBufferRenderPass.cs
@@ -102,9 +102,9 @@ public override void RecordRenderGraph(RenderGraph renderGraph, ContextContainer
                 if (renderGraph.nativeRenderPassesEnabled)
                 {
                     if (resourceData.gBuffer[4].IsValid())
-                        builder.SetInputAttachment(resourceData.gBuffer[4], 0, AccessFlags.Read);
+                        builder.SetInputAttachment(resourceData.gBuffer[4], 0);
                     if (m_DecalLayers && resourceData.gBuffer[5].IsValid())
-                        builder.SetInputAttachment(resourceData.gBuffer[5], 1, AccessFlags.Read);
+                        builder.SetInputAttachment(resourceData.gBuffer[5], 1);
                 }
                 else
                 {
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/Passes/AdditionalLightsShadowCasterPass.cs b/Packages/com.unity.render-pipelines.universal/Runtime/Passes/AdditionalLightsShadowCasterPass.cs
@@ -928,7 +928,7 @@ internal TextureHandle Render(RenderGraph graph, ContextContainer frameData)
                     }
 
                     shadowTexture = UniversalRenderer.CreateRenderGraphTexture(graph, m_AdditionalLightShadowDescriptor, k_AdditionalLightShadowMapTextureName, true,  ShadowUtils.m_ForceShadowPointSampling ? FilterMode.Point : FilterMode.Bilinear);
-                    builder.SetRenderAttachmentDepth(shadowTexture, AccessFlags.Write);
+                    builder.SetRenderAttachmentDepth(shadowTexture, AccessFlags.ReadWrite);
                 }
                 else
                 {
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/Passes/DeferredPass.cs b/Packages/com.unity.render-pipelines.universal/Runtime/Passes/DeferredPass.cs
@@ -45,7 +45,7 @@ internal void Render(RenderGraph renderGraph, ContextContainer frameData, Textur
                 passData.shadowData = shadowData;
 
                 builder.SetRenderAttachment(color, 0, AccessFlags.Write);
-                builder.SetRenderAttachmentDepth(depth, AccessFlags.Write);
+                builder.SetRenderAttachmentDepth(depth, AccessFlags.ReadWrite);
                 passData.deferredLights = m_DeferredLights;
 
                 if (!m_DeferredLights.UseFramebufferFetch)
@@ -63,7 +63,7 @@ internal void Render(RenderGraph renderGraph, ContextContainer frameData, Textur
                     {
                         if (i != m_DeferredLights.GBufferLightingIndex)
                         {
-                            builder.SetInputAttachment(gbuffer[i], idx, AccessFlags.Read);
+                            builder.SetInputAttachment(gbuffer[i], idx);
                             idx++;
                         }
                     }
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/Passes/DepthNormalOnlyPass.cs b/Packages/com.unity.render-pipelines.universal/Runtime/Passes/DepthNormalOnlyPass.cs
@@ -129,7 +129,7 @@ internal void Render(RenderGraph renderGraph, ContextContainer frameData, Textur
             using (var builder = renderGraph.AddRasterRenderPass<PassData>(passName, out var passData, profilingSampler))
             {
                 builder.SetRenderAttachment(cameraNormalsTexture, 0, AccessFlags.Write);
-                builder.SetRenderAttachmentDepth(cameraDepthTexture, AccessFlags.Write);
+                builder.SetRenderAttachmentDepth(cameraDepthTexture, AccessFlags.ReadWrite);
 
                 passData.enableRenderingLayers = enableRenderingLayers;
 
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/Passes/DepthOnlyPass.cs b/Packages/com.unity.render-pipelines.universal/Runtime/Passes/DepthOnlyPass.cs
@@ -86,7 +86,7 @@ internal void Render(RenderGraph renderGraph, ContextContainer frameData, ref Te
                 passData.rendererList = renderGraph.CreateRendererList(param);
                 builder.UseRendererList(passData.rendererList);
 
-                builder.SetRenderAttachmentDepth(cameraDepthTexture, AccessFlags.Write);
+                builder.SetRenderAttachmentDepth(cameraDepthTexture, AccessFlags.ReadWrite);
 
                 if (setGlobalDepth)
                     builder.SetGlobalTextureAfterPass(cameraDepthTexture, s_CameraDepthTextureID);
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/Passes/DrawSkyboxPass.cs b/Packages/com.unity.render-pipelines.universal/Runtime/Passes/DrawSkyboxPass.cs
@@ -101,7 +101,7 @@ internal void Render(RenderGraph renderGraph, ContextContainer frameData, Script
                 passData.material = skyboxMaterial;
                 builder.UseRendererList(skyRendererListHandle);
                 builder.SetRenderAttachment(colorTarget, 0, AccessFlags.Write);
-                builder.SetRenderAttachmentDepth(depthTarget, AccessFlags.Write);
+                builder.SetRenderAttachmentDepth(depthTarget, AccessFlags.ReadWrite);
 
                 builder.AllowPassCulling(false);
                 if (cameraData.xr.enabled)
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/Passes/GBufferPass.cs b/Packages/com.unity.render-pipelines.universal/Runtime/Passes/GBufferPass.cs
@@ -155,7 +155,7 @@ internal void Render(RenderGraph renderGraph, ContextContainer frameData, Textur
 
             RenderGraphUtils.UseDBufferIfValid(builder, resourceData);
 
-            builder.SetRenderAttachmentDepth(cameraDepth, AccessFlags.Write);
+            builder.SetRenderAttachmentDepth(cameraDepth, AccessFlags.ReadWrite);
             passData.deferredLights = m_DeferredLights;
 
             InitRendererLists(ref passData, default, renderGraph, renderingData, cameraData, lightData);
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/Passes/MainLightShadowCasterPass.cs b/Packages/com.unity.render-pipelines.universal/Runtime/Passes/MainLightShadowCasterPass.cs
@@ -400,7 +400,7 @@ internal TextureHandle Render(RenderGraph graph, ContextContainer frameData)
                     }
 
                     shadowTexture = UniversalRenderer.CreateRenderGraphTexture(graph, m_MainLightShadowDescriptor, k_MainLightShadowMapTextureName, true, ShadowUtils.m_ForceShadowPointSampling ? FilterMode.Point : FilterMode.Bilinear);
-                    builder.SetRenderAttachmentDepth(shadowTexture, AccessFlags.Write);
+                    builder.SetRenderAttachmentDepth(shadowTexture, AccessFlags.ReadWrite);
                 }
                 else
                 {
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/Passes/MotionVectorRenderPass.cs b/Packages/com.unity.render-pipelines.universal/Runtime/Passes/MotionVectorRenderPass.cs
@@ -169,7 +169,7 @@ internal void Render(RenderGraph renderGraph, ContextContainer frameData, Textur
                 }
 
                 builder.SetRenderAttachment(motionVectorColor, 0, AccessFlags.Write);
-                builder.SetRenderAttachmentDepth(motionVectorDepth, AccessFlags.Write);
+                builder.SetRenderAttachmentDepth(motionVectorDepth, AccessFlags.ReadWrite);
                 InitPassData(ref passData, cameraData);
                 passData.cameraDepth = cameraDepthTexture;
                 builder.UseTexture(cameraDepthTexture, AccessFlags.Read);
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/Passes/RenderObjectsPass.cs b/Packages/com.unity.render-pipelines.universal/Runtime/Passes/RenderObjectsPass.cs
@@ -244,8 +244,9 @@ public override void RecordRenderGraph(RenderGraph renderGraph, ContextContainer
 
                 passData.color = resourceData.activeColorTexture;
                 builder.SetRenderAttachment(resourceData.activeColorTexture, 0, AccessFlags.Write);
+                // TODO: Take into account user-specific settings to decide depth flag
                 if (cameraData.imageScalingMode != ImageScalingMode.Upscaling || passData.renderPassEvent != RenderPassEvent.AfterRenderingPostProcessing)
-                    builder.SetRenderAttachmentDepth(resourceData.activeDepthTexture, AccessFlags.Write);
+                    builder.SetRenderAttachmentDepth(resourceData.activeDepthTexture, AccessFlags.ReadWrite);
 
                 TextureHandle mainShadowsTexture = resourceData.mainShadowsTexture;
                 TextureHandle additionalShadowsTexture = resourceData.additionalShadowsTexture;
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/Passes/XRDepthMotionPass.cs b/Packages/com.unity.render-pipelines.universal/Runtime/Passes/XRDepthMotionPass.cs
@@ -209,7 +209,7 @@ internal void Render(RenderGraph renderGraph, ContextContainer frameData)
                 }
                 // Setup Color and Depth attachments
                 builder.SetRenderAttachment(xrMotionVectorColor, 0, AccessFlags.Write);
-                builder.SetRenderAttachmentDepth(xrMotionVectorDepth, AccessFlags.Write);
+                builder.SetRenderAttachmentDepth(xrMotionVectorDepth, AccessFlags.ReadWrite);
 
                 // Setup RendererList
                 InitObjectMotionRendererLists(ref passData, ref renderingData.cullResults, renderGraph, cameraData.camera);
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/Passes/XROcclusionMeshPass.cs b/Packages/com.unity.render-pipelines.universal/Runtime/Passes/XROcclusionMeshPass.cs
@@ -45,7 +45,7 @@ internal void Render(RenderGraph renderGraph, ContextContainer frameData, in Tex
                 passData.xr = cameraData.xr;
                 passData.cameraColorAttachment = cameraColorAttachment;
                 builder.SetRenderAttachment(cameraColorAttachment, 0);
-                builder.SetRenderAttachmentDepth(cameraDepthAttachment, AccessFlags.Write);
+                builder.SetRenderAttachmentDepth(cameraDepthAttachment, AccessFlags.ReadWrite);
 
                 passData.isActiveTargetBackBuffer = resourceData.isActiveTargetBackBuffer;
 
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/FullScreenPassRendererFeature.cs b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/FullScreenPassRendererFeature.cs
@@ -249,7 +249,7 @@ private void AddFullscreenRenderPassInputPass(RenderGraph renderGraph, Universal
                     builder.SetRenderAttachment(destination, 0, AccessFlags.Write);
 
                     if (m_BindDepthStencilAttachment)
-                        builder.SetRenderAttachmentDepth(resourcesData.activeDepthTexture, AccessFlags.Write);
+                        builder.SetRenderAttachmentDepth(resourcesData.activeDepthTexture, AccessFlags.ReadWrite);
 
                     builder.SetRenderFunc((MainPassData data, RasterGraphContext rgContext) =>
                     {
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/OnTilePostProcessPass.cs b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/OnTilePostProcessPass.cs
@@ -183,7 +183,7 @@ public override void RecordRenderGraph(RenderGraph renderGraph, ContextContainer
             }
             else
             {
-                builder.SetInputAttachment(source, 0, AccessFlags.Read);
+                builder.SetInputAttachment(source, 0);
                 // MSAA shader resolve keywords require global state modification
                 builder.AllowGlobalStateModification(true);
             }

Original file line number	Diff line number	Diff line change
`@@ -102,9 +102,9 @@ public override void RecordRenderGraph(RenderGraph renderGraph, ContextContainer`
`102`	`102`	`if (renderGraph.nativeRenderPassesEnabled)`
`103`	`103`	`{`
`104`	`104`	`if (resourceData.gBuffer[4].IsValid())`
`105`		`- builder.SetInputAttachment(resourceData.gBuffer[4], 0, AccessFlags.Read);`
	`105`	`+ builder.SetInputAttachment(resourceData.gBuffer[4], 0);`
`106`	`106`	`if (m_DecalLayers && resourceData.gBuffer[5].IsValid())`
`107`		`- builder.SetInputAttachment(resourceData.gBuffer[5], 1, AccessFlags.Read);`
	`107`	`+ builder.SetInputAttachment(resourceData.gBuffer[5], 1);`
`108`	`108`	`}`
`109`	`109`	`else`
`110`	`110`	`{`
Original file line number	Diff line number	Diff line change
`@@ -928,7 +928,7 @@ internal TextureHandle Render(RenderGraph graph, ContextContainer frameData)`
`928`	`928`	`}`
`929`	`929`
`930`	`930`	`shadowTexture = UniversalRenderer.CreateRenderGraphTexture(graph, m_AdditionalLightShadowDescriptor, k_AdditionalLightShadowMapTextureName, true, ShadowUtils.m_ForceShadowPointSampling ? FilterMode.Point : FilterMode.Bilinear);`
`931`		`- builder.SetRenderAttachmentDepth(shadowTexture, AccessFlags.Write);`
	`931`	`+ builder.SetRenderAttachmentDepth(shadowTexture, AccessFlags.ReadWrite);`
`932`	`932`	`}`
`933`	`933`	`else`
`934`	`934`	`{`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ internal void Render(RenderGraph renderGraph, ContextContainer frameData, Textur`
`45`	`45`	`passData.shadowData = shadowData;`
`46`	`46`
`47`	`47`	`builder.SetRenderAttachment(color, 0, AccessFlags.Write);`
`48`		`- builder.SetRenderAttachmentDepth(depth, AccessFlags.Write);`
	`48`	`+ builder.SetRenderAttachmentDepth(depth, AccessFlags.ReadWrite);`
`49`	`49`	`passData.deferredLights = m_DeferredLights;`
`50`	`50`
`51`	`51`	`if (!m_DeferredLights.UseFramebufferFetch)`
`@@ -63,7 +63,7 @@ internal void Render(RenderGraph renderGraph, ContextContainer frameData, Textur`
`63`	`63`	`{`
`64`	`64`	`if (i != m_DeferredLights.GBufferLightingIndex)`
`65`	`65`	`{`
`66`		`- builder.SetInputAttachment(gbuffer[i], idx, AccessFlags.Read);`
	`66`	`+ builder.SetInputAttachment(gbuffer[i], idx);`
`67`	`67`	`idx++;`
`68`	`68`	`}`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ internal void Render(RenderGraph renderGraph, ContextContainer frameData, Textur`
`129`	`129`	`using (var builder = renderGraph.AddRasterRenderPass<PassData>(passName, out var passData, profilingSampler))`
`130`	`130`	`{`
`131`	`131`	`builder.SetRenderAttachment(cameraNormalsTexture, 0, AccessFlags.Write);`
`132`		`- builder.SetRenderAttachmentDepth(cameraDepthTexture, AccessFlags.Write);`
	`132`	`+ builder.SetRenderAttachmentDepth(cameraDepthTexture, AccessFlags.ReadWrite);`
`133`	`133`
`134`	`134`	`passData.enableRenderingLayers = enableRenderingLayers;`
`135`	`135`