[UUM-138256] Added shader variant stripping for point sampling upsampling

Author: CalChiu

Packages/com.unity.render-pipelines.universal/Editor/ShaderBuildPreprocessor.cs

@@ -73,13 +73,14 @@ enum ShaderFeatures : long
         StencilLODCrossFade = (1L << 50),
         DeferredPlus = (1L << 51),
         ReflectionProbeAtlas = (1L << 52),
+        PointSamplingUpsampling = (1L << 53),
 #if SURFACE_CACHE
-        SurfaceCache = (1L << 53),
+        SurfaceCache = (1L << 54),
 #endif
 #if URP_SCREEN_SPACE_REFLECTION
-        ScreenSpaceReflection = (1L << 54),
+        ScreenSpaceReflection = (1L << 55),
 #endif
-        RenderObjectDepthInputAttachment = (1L << 55),
+        RenderObjectDepthInputAttachment = (1L << 56),
         All = ~0
     }
 
@@ -605,6 +606,9 @@ internal static ShaderFeatures GetSupportedShaderFeaturesFromAsset(
             if(urpAsset.allowPostProcessAlphaOutput)
                 urpAssetShaderFeatures |= ShaderFeatures.AlphaOutput;
 
+            if (urpAsset.upscalingFilter == UpscalingFilterSelection.Point)
+                urpAssetShaderFeatures |= ShaderFeatures.PointSamplingUpsampling;
+
             // Check each renderer & renderer feature
             urpAssetShaderFeatures = GetSupportedShaderFeaturesFromRenderers(
                 ref urpAsset,
@@ -1206,6 +1210,9 @@ ref List<ScreenSpaceAmbientOcclusionSettings> ssaoRendererFeatures
                 spd.stripSSAOSampleCountHigh   &= ssaoSettings.Samples != ScreenSpaceAmbientOcclusionSettings.AOSampleOption.High;
             }
 
+            // Upscaling
+            spd.stripPointSamplingUpsampling = !IsFeatureEnabled(shaderFeatures, ShaderFeatures.PointSamplingUpsampling);
+
             return spd;
         }
 

Packages/com.unity.render-pipelines.universal/Editor/ShaderScriptableStripper.cs

@@ -116,6 +116,7 @@ public bool PassHasKeyword(LocalKeyword keyword)
         Shader m_StencilDeferred = Shader.Find("Hidden/Universal Render Pipeline/StencilDeferred");
         Shader m_ClusterDeferred = Shader.Find("Hidden/Universal Render Pipeline/ClusterDeferred");
         Shader m_UberPostShader = Shader.Find("Hidden/Universal Render Pipeline/UberPost");
+        Shader m_FinalPostShader = Shader.Find("Hidden/Universal Render Pipeline/FinalPost");
         Shader m_HDROutputBlitShader = Shader.Find("Hidden/Universal/BlitHDROverlay");
         Shader m_DataDrivenLensFlareShader = Shader.Find("Hidden/Universal Render Pipeline/LensFlareDataDriven");
         Shader m_ScreenSpaceLensFlareShader = Shader.Find("Hidden/Universal Render Pipeline/LensFlareScreenSpace");
@@ -201,6 +202,7 @@ public bool PassHasKeyword(LocalKeyword keyword)
         LocalKeyword m_ProceduralInstancing;
         LocalKeyword m_DepthAsInputAttachment;
         LocalKeyword m_DepthAsInputAttachmentMSAA;
+        LocalKeyword m_PointSampling;
 
         private LocalKeyword TryGetLocalKeyword(Shader shader, string name)
         {
@@ -276,6 +278,7 @@ private void InitializeLocalShaderKeywords([DisallowNull] Shader shader)
             m_FilmGrain = TryGetLocalKeyword(shader, ShaderKeywordStrings.FilmGrain);
             m_SHPerVertex = TryGetLocalKeyword(shader, ShaderKeywordStrings.EVALUATE_SH_VERTEX);
             m_SHMixed = TryGetLocalKeyword(shader, ShaderKeywordStrings.EVALUATE_SH_MIXED);
+            m_PointSampling = TryGetLocalKeyword(shader, ShaderKeywordStrings.PointSampling);
 
             m_Instancing = TryGetLocalKeyword(shader, "INSTANCING_ON");
             m_DotsInstancing = TryGetLocalKeyword(shader, "DOTS_INSTANCING_ON");
@@ -866,6 +869,14 @@ internal bool StripUnusedFeatures_CrossFadeLod(ref IShaderScriptableStrippingDat
             return !strippingData.IsShaderFeatureEnabled(ShaderFeatures.LODCrossFade);
         }
 
+        internal bool StripUnusedFeatures_PointSamplingUpsampling(ref IShaderScriptableStrippingData strippingData, ref ShaderStripTool<ShaderFeatures> stripTool)
+        {
+            if (strippingData.shader != m_UberPostShader && strippingData.shader != m_FinalPostShader)
+                return false;
+
+            return stripTool.StripMultiCompile(m_PointSampling, ShaderFeatures.PointSamplingUpsampling);
+        }
+
         internal bool StripUnusedFeatures(ref IShaderScriptableStrippingData strippingData)
         {
             if (StripUnusedFeatures_DebugDisplay(ref strippingData))
@@ -982,6 +993,9 @@ internal bool StripUnusedFeatures(ref IShaderScriptableStrippingData strippingDa
             if (StripUnusedFeatures_RenderObjectDepthInputAttachment(ref strippingData))
                 return true;
 
+            if (StripUnusedFeatures_PointSamplingUpsampling(ref strippingData, ref stripTool))
+                return true;
+
             return false;
         }
 

Packages/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineAssetPrefiltering.cs

@@ -219,6 +219,10 @@ internal enum PrefilteringModeAdditionalLights
         [ShaderKeywordFilter.RemoveIf(true, keywordNames: ShaderKeywordStrings.ReflectionProbeAtlas)]
         [SerializeField] private bool m_PrefilterReflectionProbeAtlas = false;
 
+        // Point Sampling Upscaling (_POINT_SAMPLING)
+        [ShaderKeywordFilter.RemoveIf(true, keywordNames: ShaderKeywordStrings.PointSampling)]
+        [SerializeField] private bool m_PrefilterPointSamplingUpsampling = false;
+
         /// <summary>
         /// Data used for Shader Prefiltering. Gathered after going through the URP Assets,
         /// Renderers and Renderer Features in OnPreprocessBuild() inside ShaderPreprocessor.cs.
@@ -264,6 +268,8 @@ internal struct ShaderPrefilteringData
             public bool stripReflectionProbeBoxProjection;
             public bool stripReflectionProbeAtlas;
 
+            public bool stripPointSamplingUpsampling;
+
             public bool stripScreenSpaceIrradiance;
 
             // Keyword used by the DepthNormalOnly pass to write smoothness into alpha channel for screen space reflections.
@@ -331,6 +337,8 @@ internal void UpdateShaderKeywordPrefiltering(ref ShaderPrefilteringData prefilt
             m_PrefilterReflectionProbeBoxProjection  = prefilteringData.stripReflectionProbeBoxProjection;
             m_PrefilterReflectionProbeAtlas          = prefilteringData.stripReflectionProbeAtlas;
 
+            m_PrefilterPointSamplingUpsampling       = prefilteringData.stripPointSamplingUpsampling;
+
             m_PrefilterScreenSpaceIrradiance         = prefilteringData.stripScreenSpaceIrradiance;
 
             m_PrefilterWriteSmoothness               = prefilteringData.stripWriteSmoothness;