Graphics/SRP - RenderGraph Consolidation - Replace RenderGraph ImportBackBuffer by ImportTexture API in HDRP

Author: axoloto

Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs

@@ -726,7 +726,7 @@ public TextureHandle ImportTexture(RTHandle rt, ImportResourceParams importParam
 
         /// <summary>
         /// Import an external texture to the Render Graph. This overload should be used for RTHandles  wrapping a RenderTargetIdentifier.
-        /// If the RTHandle is wrapping a RenderTargetIdentifer, Rendergrpah can't derive the render texture's properties so the user has to provide this info to the graph through RenderTargetInfo.
+        /// If the RTHandle is wrapping a RenderTargetIdentifer, Rendergraph can't derive the render texture's properties so the user has to provide this info to the graph through RenderTargetInfo.
         ///
         /// Any pass writing to an imported texture will be considered having side effects and can't be automatically culled.
         ///

Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs

@@ -83,7 +83,9 @@ void RecordRenderGraph(RenderRequest renderRequest,
 
                 UpdateParentExposure(m_RenderGraph, hdCamera);
 
-                TextureHandle backBuffer = m_RenderGraph.ImportBackbuffer(target.id);
+                TextureHandle colorBackBuffer = ImportColorBackBuffer(m_RenderGraph, target.colorId);
+                TextureHandle depthBackBuffer = ImportDepthBackBuffer(m_RenderGraph, target.depthId);
+
                 TextureHandle colorBuffer = CreateColorBuffer(m_RenderGraph, hdCamera, msaa, true);
                 m_NonMSAAColorBuffer = CreateColorBuffer(m_RenderGraph, hdCamera, false);
                 TextureHandle currentColorPyramid = m_RenderGraph.ImportTexture(hdCamera.GetCurrentFrameRT((int)HDCameraFrameHistoryType.ColorBufferMipChain));
@@ -348,7 +350,7 @@ void RecordRenderGraph(RenderRequest renderRequest,
                 bool postProcessIsFinalPass = HDUtils.PostProcessIsFinalPass(hdCamera, aovRequest);
                 TextureHandle afterPostProcessBuffer = RenderAfterPostProcessObjects(m_RenderGraph, hdCamera, pathTracing, cullingResults, prepassOutput);
                 var postProcessTargetFace = postProcessIsFinalPass ? target.face : CubemapFace.Unknown;
-                TextureHandle postProcessDest = RenderPostProcess(m_RenderGraph, prepassOutput, colorBuffer, backBuffer, uiBuffer, afterPostProcessBuffer, opticalFogTransmittance, cullingResults, hdCamera, postProcessTargetFace, postProcessIsFinalPass);
+                TextureHandle postProcessDest = RenderPostProcess(m_RenderGraph, prepassOutput, colorBuffer, colorBackBuffer, uiBuffer, afterPostProcessBuffer, opticalFogTransmittance, cullingResults, hdCamera, postProcessTargetFace, postProcessIsFinalPass);
 
                 var xyMapping = GenerateDebugHDRxyMapping(m_RenderGraph, hdCamera, postProcessDest);
                 GenerateDebugImageHistogram(m_RenderGraph, hdCamera, postProcessDest);
@@ -370,8 +372,8 @@ void RecordRenderGraph(RenderRequest renderRequest,
                 RenderCustomPass(m_RenderGraph, hdCamera, postProcessDest, prepassOutput, customPassCullingResults, cullingResults, CustomPassInjectionPoint.AfterPostProcess, aovRequest, aovCustomPassBuffers);
 
                 // Copy and rescale depth buffer for XR devices
-                if (hdCamera.xr.enabled && hdCamera.xr.copyDepth)
-                    CopyDepth(m_RenderGraph, hdCamera, prepassOutput.resolvedDepthBuffer, backBuffer, true);
+                if (hdCamera.xr.enabled && hdCamera.xr.copyDepth && depthBackBuffer.IsValid())
+                    CopyDepth(m_RenderGraph, hdCamera, prepassOutput.resolvedDepthBuffer, depthBackBuffer, true);
 
                 if (m_CurrentDebugDisplaySettings.data.historyBuffersView != -1)
                 {
@@ -408,7 +410,7 @@ void RecordRenderGraph(RenderRequest renderRequest,
 
                     for (int viewIndex = 0; viewIndex < hdCamera.viewCount; ++viewIndex)
                     {
-                        BlitFinalCameraTexture(m_RenderGraph, hdCamera, postProcessDest, backBuffer, uiBuffer, afterPostProcessBuffer, viewIndex, HDROutputActiveForCameraType(hdCamera), target.face);
+                        BlitFinalCameraTexture(m_RenderGraph, hdCamera, postProcessDest, colorBackBuffer, uiBuffer, afterPostProcessBuffer, viewIndex, HDROutputActiveForCameraType(hdCamera), target.face);
                     }
 
                     if (aovRequest.isValid)
@@ -419,25 +421,25 @@ void RecordRenderGraph(RenderRequest renderRequest,
                 // we need to do this separately.
                 for (int viewIndex = 0; viewIndex < hdCamera.viewCount; ++viewIndex)
                 {
-                    if (target.targetDepth != null)
+                    if (target.isProbe && depthBackBuffer.IsValid())
                     {
-                        BlitFinalCameraTexture(m_RenderGraph, hdCamera, prepassOutput.resolvedDepthBuffer, m_RenderGraph.ImportTexture(target.targetDepth), uiBuffer, afterPostProcessBuffer, viewIndex, outputsToHDR: false, cubemapFace: target.face);
+                        BlitFinalCameraTexture(m_RenderGraph, hdCamera, prepassOutput.resolvedDepthBuffer, depthBackBuffer, uiBuffer, afterPostProcessBuffer, viewIndex, outputsToHDR: false, cubemapFace: target.face);
                     }
                 }
 
                 SendColorGraphicsBuffer(m_RenderGraph, hdCamera);
 
-                SetFinalTarget(m_RenderGraph, hdCamera, prepassOutput.resolvedDepthBuffer, backBuffer, target.face);
+                SetFinalTarget(m_RenderGraph, hdCamera, prepassOutput.resolvedDepthBuffer, colorBackBuffer, target.face);
 
-                RenderWireOverlay(m_RenderGraph, hdCamera, backBuffer);
+                RenderWireOverlay(m_RenderGraph, hdCamera, colorBackBuffer);
 
                 RenderGizmos(m_RenderGraph, hdCamera, GizmoSubset.PostImageEffects);
 
                 // Stop XR single pass before rendering screenspace UI
                 StopXRSinglePass(m_RenderGraph, hdCamera);
 
                 if (renderRequest.isLast)
-                    RenderScreenSpaceOverlayUI(m_RenderGraph, hdCamera, backBuffer);
+                    RenderScreenSpaceOverlayUI(m_RenderGraph, hdCamera, colorBackBuffer);
             }
         }
 
@@ -2098,6 +2100,51 @@ void RenderDistortion(RenderGraph renderGraph,
             }
         }
 
+        TextureHandle ImportColorBackBuffer(RenderGraph renderGraph, RenderTargetIdentifier colorBackBufferId)
+        {
+            if (m_CurrentColorBackBuffer == null)
+            {
+                m_CurrentColorBackBuffer = RTHandles.Alloc(colorBackBufferId, "Backbuffer color");
+            }
+            else
+            {
+                RTHandleStaticHelpers.SetRTHandleUserManagedWrapper(ref m_CurrentColorBackBuffer, colorBackBufferId);
+            }
+
+            // Importing the backbuffer, using dummy information as we used to do with ImportBackbuffer API
+            // TODO: Pass the right information using engine APIs and camera settings like in URP
+            RenderTargetInfo dummyImportInfo = new RenderTargetInfo();
+            dummyImportInfo.width = dummyImportInfo.height = dummyImportInfo.volumeDepth = dummyImportInfo.msaaSamples = 1;
+            dummyImportInfo.format = GraphicsFormat.R8G8B8A8_SRGB;
+
+            return m_RenderGraph.ImportTexture(m_CurrentColorBackBuffer, dummyImportInfo);
+        }
+
+        TextureHandle ImportDepthBackBuffer(RenderGraph renderGraph, RenderTargetIdentifier depthBackBufferId)
+        {
+            if (m_CurrentDepthBackBuffer == null)
+            {
+                m_CurrentDepthBackBuffer = RTHandles.Alloc(depthBackBufferId, "Backbuffer depth");
+            }
+            else
+            {
+                RTHandleStaticHelpers.SetRTHandleUserManagedWrapper(ref m_CurrentDepthBackBuffer, depthBackBufferId);
+            }
+
+            // We might have requests without depth buffer
+            bool noDepthBackBuffer = depthBackBufferId == default(RenderTargetIdentifier);
+            if (noDepthBackBuffer)
+                return TextureHandle.nullHandle;
+
+            // Importing the backbuffer, using dummy information as we used to do with ImportBackbuffer API
+            // TODO: Pass the right information using engine APIs and camera settings like in URP
+            RenderTargetInfo dummyImportInfo = new RenderTargetInfo();
+            dummyImportInfo.width = dummyImportInfo.height = dummyImportInfo.volumeDepth = dummyImportInfo.msaaSamples = 1;
+            dummyImportInfo.format = CoreUtils.GetDefaultDepthStencilFormat();
+
+            return m_RenderGraph.ImportTexture(m_CurrentDepthBackBuffer, dummyImportInfo);  
+        }
+
         TextureHandle CreateColorBuffer(RenderGraph renderGraph, HDCamera hdCamera, bool msaa, bool fallbackToBlack = false)
         {
 #if UNITY_2020_2_OR_NEWER

Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs

@@ -155,6 +155,9 @@ internal static HDRenderPipeline currentPipeline
         Lazy<RTHandle> m_CustomPassColorBuffer;
         Lazy<RTHandle> m_CustomPassDepthBuffer;
 
+        RTHandle m_CurrentColorBackBuffer;
+        RTHandle m_CurrentDepthBackBuffer;
+
         // Constant Buffers
         ShaderVariablesGlobal m_ShaderVariablesGlobalCB = new ShaderVariablesGlobal();
         ShaderVariablesXR m_ShaderVariablesXRCB = new ShaderVariablesXR();
@@ -1013,6 +1016,9 @@ protected override void Dispose(bool disposing)
             if (m_CustomPassDepthBuffer.IsValueCreated)
                 RTHandles.Release(m_CustomPassDepthBuffer.Value);
 
+            RTHandles.Release(m_CurrentColorBackBuffer);
+            RTHandles.Release(m_CurrentDepthBackBuffer);
+
             CullingGroupManager.instance.Cleanup();
 
             CoreUtils.SafeRelease(m_DepthPyramidMipLevelOffsetsBuffer);
@@ -1411,9 +1417,10 @@ struct RenderRequest
         {
             public struct Target
             {
-                public RenderTargetIdentifier id;
+                public RenderTargetIdentifier colorId;
+                public RenderTargetIdentifier depthId;
                 public CubemapFace face;
-                public RTHandle targetDepth;
+                public bool isProbe;
             }
             public HDCamera hdCamera;
             public bool clearCameraSettings;
@@ -1587,15 +1594,19 @@ bool PrepareAndCullCamera(
             }
 
             // Select render target
-            RenderTargetIdentifier targetId = camera.targetTexture ?? new RenderTargetIdentifier(BuiltinRenderTextureType.CameraTarget);
+            RenderTargetIdentifier targetColorId = camera.targetTexture ?? new RenderTargetIdentifier(BuiltinRenderTextureType.CameraTarget);
+            RenderTargetIdentifier targetDepthId = camera.targetTexture ?? new RenderTargetIdentifier(BuiltinRenderTextureType.Depth);
             if (camera.targetTexture != null)
             {
                 camera.targetTexture.IncrementUpdateCount(); // Necessary if the texture is used as a cookie.
             }
 
             // Render directly to XR render target if active
             if (hdCamera.xr.enabled)
-                targetId = hdCamera.xr.renderTarget;
+            {
+                targetColorId = hdCamera.xr.renderTarget;
+                targetDepthId = hdCamera.xr.renderTarget;
+            }
 
             hdCamera.RequestDynamicResolution(cameraRequestedDynamicRes, DynamicResolutionHandler.instance);
 
@@ -1606,7 +1617,8 @@ bool PrepareAndCullCamera(
                 cullingResults = cullingResults,
                 target = new RenderRequest.Target
                 {
-                    id = targetId,
+                    colorId = targetColorId,
+                    depthId = targetDepthId,
                     face = cubemapFace
                 },
                 dependsOnRenderRequestIndices = ListPool<int>.Get(),
@@ -1938,17 +1950,19 @@ ScriptableRenderContext renderContext
                 {
                     request.target = new RenderRequest.Target
                     {
-                        id = visibleProbe.realtimeTextureRTH,
-                        face = face
+                        colorId = visibleProbe.realtimeTextureRTH,
+                        face = face,
+                        isProbe = true
                     };
                 }
                 else
                 {
                     request.target = new RenderRequest.Target
                     {
-                        id = visibleProbe.realtimeTextureRTH,
-                        targetDepth = visibleProbe.realtimeDepthTextureRTH,
-                        face = CubemapFace.Unknown
+                        colorId = visibleProbe.realtimeTextureRTH,
+                        depthId = visibleProbe.realtimeDepthTextureRTH,
+                        face = CubemapFace.Unknown,
+                        isProbe = true
                     };
                 }
 
@@ -2821,7 +2835,7 @@ AOVRequestData aovRequest
 
                 if (GL.wireframe)
                 {
-                    RenderWireFrame(cullingResults, hdCamera, target.id, renderContext, cmd);
+                    RenderWireFrame(cullingResults, hdCamera, target.colorId, renderContext, cmd);
                     return;
                 }