Partner/crazyhunter 10.6.0 custom.1 rendergraph (#25)

* Some code was accessing the rendergraph through a global var instead of their local argument

* Split ExecuteWithRenderGraph

* ProbeVolume upload code will now execute in the RenderGraph if available

* Import shared ProbeVolumesRenderGraphResources only once per frame

* Fixed debug mode

Co-authored-by: Guillermo Gijon <[email protected]>

Author: pastasfuture

com.unity.render-pipelines.high-definition/Runtime/Lighting/ProbeVolume/ProbeVolumeLighting.cs

@@ -34,7 +34,7 @@ TextureHandle EvaluateShadowDebugView(RenderGraph renderGraph, HDCamera hdCamera
         {
             // If this is the right debug mode and the index we are asking for is in the range
             if (!rayTracingSupported || (m_ScreenSpaceShadowChannelSlot <= m_CurrentDebugDisplaySettings.data.screenSpaceShadowIndex))
-                return m_RenderGraph.defaultResources.blackTextureXR;
+                return renderGraph.defaultResources.blackTextureXR;
 
             using (var builder = renderGraph.AddRenderPass<ScreenSpaceShadowDebugPassData>("Screen Space Shadows Debug", out var passData, ProfilingSampler.Get(HDProfileId.ScreenSpaceShadowsDebug)))
             {
@@ -140,7 +140,7 @@ TextureHandle RenderScreenSpaceShadows(RenderGraph renderGraph, HDCamera hdCamer
         {
             // If screen space shadows are not supported for this camera, we are done
             if (!hdCamera.frameSettings.IsEnabled(FrameSettingsField.ScreenSpaceShadows) || !RequestedScreenSpaceShadows())
-                return m_RenderGraph.defaultResources.blackTextureArrayXR;
+                return renderGraph.defaultResources.blackTextureArrayXR;
 
             using (new RenderGraphProfilingScope(renderGraph, ProfilingSampler.Get(HDProfileId.ScreenSpaceShadows)))
             {
@@ -158,7 +158,7 @@ TextureHandle RenderScreenSpaceShadows(RenderGraph renderGraph, HDCamera hdCamer
 
                 // We render the debug view, if the texture is not used, it is not evaluated anyway
                 TextureHandle screenSpaceShadowDebug = EvaluateShadowDebugView(renderGraph, hdCamera, screenSpaceShadowTexture);
-                PushFullScreenDebugTexture(m_RenderGraph, screenSpaceShadowDebug, FullScreenDebugMode.ScreenSpaceShadows);
+                PushFullScreenDebugTexture(renderGraph, screenSpaceShadowDebug, FullScreenDebugMode.ScreenSpaceShadows);
 
                 return screenSpaceShadowTexture;
             }

com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/ScreenSpaceShadowManager.RenderGraph.cs

@@ -254,7 +254,7 @@ void RenderProbeVolumeDebugOverlay(RenderGraph renderGraph, in DebugParameters d
                 passData.depthBuffer = builder.UseDepthBuffer(depthBuffer, DepthAccess.ReadWrite);
 
                 builder.SetRenderFunc(
-                (DebugLightLoopOverlayPassData data, RenderGraphContext ctx) =>
+                (DebugOverlayPassData data, RenderGraphContext ctx) =>
                 {
                     RenderProbeVolumeDebugOverlay(data.debugParameters, ctx.cmd);
                 });

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

@@ -253,7 +253,7 @@ void PushGlobalCameraParams(RenderGraph renderGraph, HDCamera hdCamera)
 
         internal ShadowResult RenderShadows(RenderGraph renderGraph, HDCamera hdCamera, CullingResults cullResults, ref ShadowResult result)
         {
-            m_ShadowManager.RenderShadows(m_RenderGraph, m_ShaderVariablesGlobalCB, hdCamera, cullResults, ref result);
+            m_ShadowManager.RenderShadows(renderGraph, m_ShaderVariablesGlobalCB, hdCamera, cullResults, ref result);
             // Need to restore global camera parameters.
             PushGlobalCameraParams(renderGraph, hdCamera);
             return result;

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

@@ -218,7 +218,7 @@ PrepassOutput RenderPrepass(RenderGraph     renderGraph,
                 BuildGPULightListOutput probeVolumeListOutput = new BuildGPULightListOutput();
                 if (hdCamera.frameSettings.IsEnabled(FrameSettingsField.ProbeVolume) && ShaderConfig.s_ProbeVolumesEvaluationMode == ProbeVolumesEvaluationModes.MaterialPass)
                 {
-                    probeVolumeListOutput = BuildGPULightList(m_RenderGraph, hdCamera, m_ProbeVolumeClusterData, m_ProbeVolumeCount, ref m_ShaderVariablesProbeVolumeLightListCB, result.depthBuffer, result.stencilBuffer, result.gbuffer);
+                    probeVolumeListOutput = BuildGPULightList(renderGraph, hdCamera, m_ProbeVolumeClusterData, m_ProbeVolumeCount, ref m_ShaderVariablesProbeVolumeLightListCB, result.depthBuffer, result.stencilBuffer, result.gbuffer);
                 }
 
                 bool shouldRenderMotionVectorAfterGBuffer = RenderDepthPrepass(renderGraph, cullingResults, hdCamera, ref result, out var decalBuffer);

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

@@ -13,12 +13,22 @@ class TempPassData { };
         // Needed only because of custom pass. See comment at ResolveMSAAColor.
         TextureHandle m_NonMSAAColorBuffer;
 
+        private void BeginRenderGraph(ScriptableRenderContext renderContext, CommandBuffer commandBuffer)
+        {
+            var renderGraphParams = new RenderGraphParameters()
+            {
+                scriptableRenderContext = renderContext,
+                commandBuffer = commandBuffer,
+                currentFrameIndex = m_FrameCount
+            };
+
+            m_RenderGraph.Begin(renderGraphParams);
+        }
+
         void ExecuteWithRenderGraph(RenderRequest           renderRequest,
             AOVRequestData          aovRequest,
             List<RTHandle>          aovBuffers,
-            List<RTHandle>          aovCustomPassBuffers,
-            ScriptableRenderContext renderContext,
-            CommandBuffer           commandBuffer)
+            List<RTHandle>          aovCustomPassBuffers)
         {
             var hdCamera = renderRequest.hdCamera;
             var camera = hdCamera.camera;
@@ -27,15 +37,6 @@ void ExecuteWithRenderGraph(RenderRequest           renderRequest,
             bool msaa = hdCamera.frameSettings.IsEnabled(FrameSettingsField.MSAA);
             var target = renderRequest.target;
 
-            var renderGraphParams = new RenderGraphParameters()
-            {
-                scriptableRenderContext = renderContext,
-                commandBuffer = commandBuffer,
-                currentFrameIndex = m_FrameCount
-            };
-
-            m_RenderGraph.Begin(renderGraphParams);
-
             // We need to initalize the MipChainInfo here, so it will be available to any render graph pass that wants to use it during setup
             // Be careful, ComputePackedMipChainInfo needs the render texture size and not the viewport size. Otherwise it would compute the wrong size.
             m_DepthBufferMipChainInfo.ComputePackedMipChainInfo(RTHandles.rtHandleProperties.currentRenderTargetSize);
@@ -283,7 +284,7 @@ void ExecuteWithRenderGraph(RenderRequest           renderRequest,
             }
             PushFullScreenExposureDebugTexture(m_RenderGraph, postProcessDest);
 
-            ResetCameraSizeForAfterPostProcess(m_RenderGraph, hdCamera, commandBuffer);
+            ResetCameraSizeForAfterPostProcess(m_RenderGraph, hdCamera);
 
             RenderCustomPass(m_RenderGraph, hdCamera, postProcessDest, prepassOutput, customPassCullingResults, CustomPassInjectionPoint.AfterPostProcess, aovRequest, aovCustomPassBuffers);
 
@@ -338,15 +339,6 @@ void ExecuteWithRenderGraph(RenderRequest           renderRequest,
             RenderGizmos(m_RenderGraph, hdCamera, colorBuffer, GizmoSubset.PostImageEffects);
 
             m_RenderGraph.Execute();
-
-            if (aovRequest.isValid)
-            {
-                // aovRequest.Execute don't go through render graph for now
-                using (new ProfilingScope(commandBuffer, ProfilingSampler.Get(HDProfileId.AOVExecute)))
-                {
-                    aovRequest.Execute(commandBuffer, aovBuffers, aovCustomPassBuffers, RenderOutputProperties.From(hdCamera));
-                }
-            }
         }
 
         class FinalBlitPassData
@@ -947,7 +939,7 @@ TextureHandle RenderTransparency(RenderGraph                 renderGraph,
             // TODO RENDERGRAPH: Remove this when we properly convert custom passes to full render graph with explicit color buffer reads.
             // To allow users to fetch the current color buffer, we temporarily bind the camera color buffer
             SetGlobalColorForCustomPass(renderGraph, colorBuffer);
-            RenderCustomPass(m_RenderGraph, hdCamera, colorBuffer, prepassOutput, customPassCullingResults, CustomPassInjectionPoint.BeforePreRefraction, aovRequest, aovCustomPassBuffers);
+            RenderCustomPass(renderGraph, hdCamera, colorBuffer, prepassOutput, customPassCullingResults, CustomPassInjectionPoint.BeforePreRefraction, aovRequest, aovCustomPassBuffers);
             SetGlobalColorForCustomPass(renderGraph, currentColorPyramid);
 
             // Render pre-refraction objects
@@ -960,7 +952,7 @@ TextureHandle RenderTransparency(RenderGraph                 renderGraph,
             }
 
             // We don't have access to the color pyramid with transparent if rough refraction is disabled
-            RenderCustomPass(m_RenderGraph, hdCamera, colorBuffer, prepassOutput, customPassCullingResults, CustomPassInjectionPoint.BeforeTransparent, aovRequest, aovCustomPassBuffers);
+            RenderCustomPass(renderGraph, hdCamera, colorBuffer, prepassOutput, customPassCullingResults, CustomPassInjectionPoint.BeforeTransparent, aovRequest, aovCustomPassBuffers);
 
             // Render all type of transparent forward (unlit, lit, complex (hair...)) to keep the sorting between transparent objects.
             RenderForwardTransparent(renderGraph, hdCamera, colorBuffer, normalBuffer, prepassOutput, vtFeedbackBuffer, volumetricLighting, ssrLightingBuffer, currentColorPyramid, lightLists, shadowResult, cullingResults, false);
@@ -1581,7 +1573,7 @@ class ResetCameraSizeForAfterPostProcessPassData
             public ShaderVariablesGlobal shaderVariablesGlobal;
         }
 
-        void ResetCameraSizeForAfterPostProcess(RenderGraph renderGraph, HDCamera hdCamera, CommandBuffer commandBuffer)
+        void ResetCameraSizeForAfterPostProcess(RenderGraph renderGraph, HDCamera hdCamera)
         {
             if (DynamicResolutionHandler.instance.DynamicResolutionEnabled())
             {