[UUM-109492] Fixed UberPostProcess pass viewport scaling not accounting for subsequent custom pass presence

Author: CalChiu

Packages/com.unity.render-pipelines.universal/Runtime/Passes/PostProcess/UberPostProcessPass.cs

@@ -87,7 +87,7 @@ private class UberPostPassData
             internal FilmGrainParams filmGrain;
             internal DitheringParams dither;
 
-            internal bool isFinalPass;
+            internal bool isActiveTargetBackBuffer;
             internal bool useFastSRGBLinearConversion;
             internal bool requireSRGBConversionBlit;
         }
@@ -194,7 +194,7 @@ public override void RecordRenderGraph(RenderGraph renderGraph, ContextContainer
                     passData.filmGrain.Setup(filmGrain, m_FilmGrainTextures, cameraData.pixelWidth, cameraData.pixelHeight);
                     passData.dither.Setup(m_DitherTexture, cameraData.pixelWidth, cameraData.pixelHeight);
                 }
-                passData.isFinalPass = m_IsFinalPass;
+                passData.isActiveTargetBackBuffer = resourceData.isActiveTargetBackBuffer;
 
                 builder.SetRenderFunc(static (UberPostPassData data, RasterGraphContext context) =>
                 {
@@ -260,7 +260,7 @@ public override void RecordRenderGraph(RenderGraph renderGraph, ContextContainer
                     if(PostProcessUtils.RequireHDROutput(cameraData))
                     {
                         PostProcessUtils.SetupHDROutput(material, cameraData.hdrDisplayInformation, cameraData.hdrDisplayColorGamut, data.tonemapping, data.hdrOperations, cameraData.rendersOverlayUI);
-                        RenderingUtils.SetupOffscreenUIViewportParams(material, ref cameraData.pixelRect, data.isFinalPass && cameraData.resolveFinalTarget);
+                        RenderingUtils.SetupOffscreenUIViewportParams(material, ref cameraData.pixelRect, data.isActiveTargetBackBuffer);
                     }
 
 #if ENABLE_VR && ENABLE_XR_MODULE
@@ -272,10 +272,10 @@ public override void RecordRenderGraph(RenderGraph renderGraph, ContextContainer
 
                     // Done with Uber, blit it
                     if (cameraData.xr.enabled && cameraData.xr.hasValidVisibleMesh)
-                        PostProcessUtils.ScaleViewportAndDrawVisibilityMesh(context, data.sourceTexture, data.destinationTexture, data.cameraData, material, data.isFinalPass);
+                        PostProcessUtils.ScaleViewportAndDrawVisibilityMesh(context, data.sourceTexture, data.destinationTexture, data.cameraData, material, data.isActiveTargetBackBuffer);
                     else
 #endif
-                        PostProcessUtils.ScaleViewportAndBlit(context, data.sourceTexture, data.destinationTexture, data.cameraData, material, data.isFinalPass);
+                        PostProcessUtils.ScaleViewportAndBlit(context, data.sourceTexture, data.destinationTexture, data.cameraData, material, data.isActiveTargetBackBuffer);
                 });
             }
 

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

@@ -350,7 +350,7 @@ internal static void SetGlobalShaderSourceSize(CommandBuffer cmd, RTHandle sourc
             SetGlobalShaderSourceSize(CommandBufferHelpers.GetRasterCommandBuffer(cmd), source);
         }
 
-        internal static void ScaleViewport(RasterCommandBuffer cmd, RTHandle dest, UniversalCameraData cameraData, bool isFinalPass)
+        internal static void ScaleViewport(RasterCommandBuffer cmd, RTHandle dest, UniversalCameraData cameraData, bool isActiveTargetBackBuffer)
         {
             RenderTargetIdentifier cameraTarget = BuiltinRenderTextureType.CameraTarget;
 #if ENABLE_VR && ENABLE_XR_MODULE
@@ -359,7 +359,7 @@ internal static void ScaleViewport(RasterCommandBuffer cmd, RTHandle dest, Unive
 #endif
             if (dest.nameID == cameraTarget || cameraData.targetTexture != null)
             {
-                if (!isFinalPass || !cameraData.resolveFinalTarget)
+                if (!isActiveTargetBackBuffer)
                 {
                     // Inside the camera stack the target is the shared intermediate target, which can be scaled with render scale.
                     // camera.pixelRect is the viewport of the final target in pixels, so it cannot be used for the intermediate target.
@@ -383,19 +383,19 @@ internal static void ScaleViewport(RasterCommandBuffer cmd, RTHandle dest, Unive
             }
         }
 
-        internal static void ScaleViewportAndBlit(RasterGraphContext context, in TextureHandle sourceTexture, in TextureHandle destTexture, UniversalCameraData cameraData, Material material, bool isFinalPass)
+        internal static void ScaleViewportAndBlit(RasterGraphContext context, in TextureHandle sourceTexture, in TextureHandle destTexture, UniversalCameraData cameraData, Material material, bool isActiveTargetBackBuffer)
         {
             Vector4 scaleBias = RenderingUtils.GetFinalBlitScaleBias(context, sourceTexture, destTexture);
-            ScaleViewport(context.cmd, destTexture, cameraData, isFinalPass);
+            ScaleViewport(context.cmd, destTexture, cameraData, isActiveTargetBackBuffer);
 
             Blitter.BlitTexture(context.cmd, sourceTexture, scaleBias, material, 0);
         }
 
-        internal static void ScaleViewportAndDrawVisibilityMesh(RasterGraphContext context, in TextureHandle sourceTexture, in TextureHandle destTexture, UniversalCameraData cameraData, Material material, bool isFinalPass)
+        internal static void ScaleViewportAndDrawVisibilityMesh(RasterGraphContext context, in TextureHandle sourceTexture, in TextureHandle destTexture, UniversalCameraData cameraData, Material material, bool isActiveTargetBackBuffer)
         {
 #if ENABLE_VR && ENABLE_XR_MODULE
             Vector4 scaleBias = RenderingUtils.GetFinalBlitScaleBias(context, sourceTexture, destTexture);
-            ScaleViewport(context.cmd, destTexture, cameraData, isFinalPass);
+            ScaleViewport(context.cmd, destTexture, cameraData, isActiveTargetBackBuffer);
 
             // Set property block for blit shader
             MaterialPropertyBlock xrPropertyBlock = XRSystemUniversal.GetMaterialPropertyBlock();