[Port] [6000.5] [UUM-136528] Fixed Nearest-Neighbor upscaling dependency on final post-process pass

Author: svc-reach-platform-support

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

@@ -9,8 +9,15 @@ internal sealed class UberPostProcessPass : PostProcessPass
         Material m_Material;
         Texture2D[] m_FilmGrainTextures;
 
+        public enum FilteringOperation
+        {
+            Linear,
+            Point
+        }
+
         Texture m_DitherTexture;
         RTHandle m_UserLut;
+        FilteringOperation m_FilteringOperation;
         HDROutputUtils.Operation m_HdrOperations;
         bool m_IsValid;
         bool m_IsFinalPass;
@@ -28,6 +35,7 @@ public UberPostProcessPass(Shader shader, Texture2D[] filmGrainTextures)
 
             // Defaults
             m_DitherTexture = null; // Dither disabled.
+            m_FilteringOperation = FilteringOperation.Linear;   // Common case.
             m_HdrOperations = HDROutputUtils.Operation.None;    // HDR disabled.
             m_RequireSRGBConversionBlit = false; // sRGB conversion is typically automatic based on format.
             m_IsFinalPass = false;  // Assume other passes.
@@ -42,12 +50,14 @@ public override void Dispose()
         }
 
         public void Setup(Texture ditherTexture,
+            FilteringOperation filteringOperation,
             HDROutputUtils.Operation hdrOperations,
             bool requireSRGBConversionBlit,
             bool isFinalPass,
             bool renderOverlayUI)
         {
             m_DitherTexture = ditherTexture;
+            m_FilteringOperation = filteringOperation;
             m_HdrOperations = hdrOperations;
             m_RequireSRGBConversionBlit = requireSRGBConversionBlit;
             m_IsFinalPass = isFinalPass;
@@ -64,6 +74,7 @@ private class UberPostPassData
             internal UniversalCameraData cameraData;
 
             internal Tonemapping tonemapping;
+            internal FilteringOperation filteringOperation;
             internal HDROutputUtils.Operation hdrOperations;
             internal bool isHdrGrading;
 
@@ -166,6 +177,7 @@ public override void RecordRenderGraph(RenderGraph renderGraph, ContextContainer
 
                 // HDR
                 passData.tonemapping = tonemapping;
+                passData.filteringOperation = m_FilteringOperation;
                 passData.hdrOperations = m_HdrOperations;
                 passData.isHdrGrading = postProcessingData.gradingMode == ColorGradingMode.HighDynamicRange;
 
@@ -187,10 +199,21 @@ public override void RecordRenderGraph(RenderGraph renderGraph, ContextContainer
                 {
                     var cameraData = data.cameraData;
                     var material = data.material;
+                    var filteringOperation = data.filteringOperation;
 
                     // Reset keywords
                     material.shaderKeywords = null;
 
+                    switch (filteringOperation)
+                    {
+                        case FilteringOperation.Point:
+                            material.EnableKeyword(ShaderKeywordStrings.PointSampling);
+                        break;
+                        case FilteringOperation.Linear: goto default;
+                        default:
+                        break;
+                    }
+
                     data.lut.Apply(material);
 
                     if (data.bloom.IsActive())

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

@@ -213,8 +213,26 @@ public void RenderPostProcessing(RenderGraph renderGraph, ContextContainer frame
                 hdrOperations = !hasFinalPass && enableColorEncodingIfNeeded ? HDROutputUtils.Operation.ColorEncoding : HDROutputUtils.Operation.None;
             }
 
+            UberPostProcessPass.FilteringOperation filteringOperation = UberPostProcessPass.FilteringOperation.Linear;
+
+            // Point sampling is only used for upscaling so the default linear sampler should be used if there is a final pass
+            if (cameraData.imageScalingMode == ImageScalingMode.Upscaling && !hasFinalPass)
+            {
+#if ENABLE_UPSCALER_FRAMEWORK
+                if (cameraData.resolvedUpscalerHash == UniversalRenderPipeline.k_UpscalerHash_Point)
+                {
+                    filteringOperation = UberPostProcessPass.FilteringOperation.Point;
+                }
+#else
+                if (cameraData.upscalingFilter == ImageUpscalingFilter.Point)
+                {
+                    filteringOperation = UberPostProcessPass.FilteringOperation.Point;
+                }
+#endif
+            }
+
             bool renderOverlayUI = requireHDROutput && enableColorEncodingIfNeeded;
-            m_UberPass.Setup(ditherTexture, hdrOperations, applySrgbEncoding, !hasFinalPass, renderOverlayUI);
+            m_UberPass.Setup(ditherTexture, filteringOperation, hdrOperations, applySrgbEncoding, !hasFinalPass, renderOverlayUI);
             m_UberPass.RecordRenderGraph(renderGraph, frameData);
         }
 

Packages/com.unity.render-pipelines.universal/Shaders/PostProcessing/UberPost.shader

@@ -1,6 +1,7 @@
 Shader "Hidden/Universal Render Pipeline/UberPost"
 {
     HLSLINCLUDE
+        #pragma multi_compile_local_fragment _ _POINT_SAMPLING
         #pragma multi_compile_local_fragment _ _DISTORTION
         #pragma multi_compile_local_fragment _ _CHROMATIC_ABERRATION
         #pragma multi_compile_local_fragment _ _BLOOM_LQ _BLOOM_HQ _BLOOM_LQ_DIRT _BLOOM_HQ_DIRT
@@ -146,6 +147,15 @@ Shader "Hidden/Universal Render Pipeline/UberPost"
             return uv;
         }
 
+        half4 SampleColor(float2 uv)
+        {
+            #if _POINT_SAMPLING
+            return SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_PointClamp, uv);
+            #else
+            return SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, uv);
+            #endif
+        }
+
         half4 FragUberPost(Varyings input) : SV_Target
         {
             UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input);
@@ -155,7 +165,7 @@ Shader "Hidden/Universal Render Pipeline/UberPost"
 
             // NOTE: Hlsl specifies missing input.a to fill 1 (0 for .rgb).
             // InputColor is a "bottom" layer for alpha output.
-            half4 inputColor = SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, ClampUVForBilinear(SCREEN_COORD_REMOVE_SCALEBIAS(uvDistorted), _BlitTexture_TexelSize.xy));
+            half4 inputColor = SampleColor(ClampUVForBilinear(SCREEN_COORD_REMOVE_SCALEBIAS(uvDistorted), _BlitTexture_TexelSize.xy));
             half3 color = inputColor.rgb;
 
             #if _CHROMATIC_ABERRATION
@@ -167,8 +177,8 @@ Shader "Hidden/Universal Render Pipeline/UberPost"
                 float2 delta = (end - uv) / 3.0;
 
                 half r = color.r;
-                half g = SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, ClampUVForBilinear(SCREEN_COORD_REMOVE_SCALEBIAS(DistortUV(delta + uv)      ), _BlitTexture_TexelSize.xy)).y;
-                half b = SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, ClampUVForBilinear(SCREEN_COORD_REMOVE_SCALEBIAS(DistortUV(delta * 2.0 + uv)), _BlitTexture_TexelSize.xy)).z;
+                half g = SampleColor(ClampUVForBilinear(SCREEN_COORD_REMOVE_SCALEBIAS(DistortUV(delta + uv)      ), _BlitTexture_TexelSize.xy)).y;
+                half b = SampleColor(ClampUVForBilinear(SCREEN_COORD_REMOVE_SCALEBIAS(DistortUV(delta * 2.0 + uv)), _BlitTexture_TexelSize.xy)).z;
 
                 color = half3(r, g, b);
             }