[2023.3][URP] Changing check for Auto Mode in ShAutoDetect.

Users have complained about performance issues on some platforms due to a change in SH Evaluation mode causing them to use PerPixel instead of PerVertex. This PR makes sure those platform use PerVertex when set to Auto.

This PR does the following: 
- Adds a few platforms to ShAutoDetect to use PerVertex when Auto is selected.
- Renames `XRPlatformBuildTimeDetect` to `PlatformBuildTimeDetect` as it's now used for more than XR.
- Fixes a few typos and indentation.

Author: ellioman

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

@@ -134,18 +134,21 @@ public static VolumeFeatures volumeFeatures
         private static VolumeFeatures s_VolumeFeatures;
         private static List<ShaderFeatures> s_SupportedFeaturesList = new();
 
-        // Helper calss to detect XR build targets at build time.
-        internal sealed class XRPlatformBuildTimeDetect
+        // Helper class to detect XR build targets at build time.
+        internal sealed class PlatformBuildTimeDetect
         {
-            private static XRPlatformBuildTimeDetect xrPlatformInfo;
+            private static PlatformBuildTimeDetect s_PlatformInfo;
             internal bool isStandaloneXR { get; private set; }
             internal bool isHololens { get; private set; }
             internal bool isQuest { get; private set; }
+            internal bool isSwitch { get; private set; }
 
-            private XRPlatformBuildTimeDetect()
+            private PlatformBuildTimeDetect()
             {
+                BuildTargetGroup buildTargetGroup = BuildPipeline.GetBuildTargetGroup(EditorUserBuildSettings.activeBuildTarget);
+                isSwitch = buildTargetGroup == BuildTargetGroup.Switch;
+
 #if XR_MANAGEMENT_4_0_1_OR_NEWER
-                var buildTargetGroup = BuildPipeline.GetBuildTargetGroup(EditorUserBuildSettings.activeBuildTarget);
                 var buildTargetSettings = XRGeneralSettingsPerBuildTarget.XRGeneralSettingsForBuildTarget(buildTargetGroup);
                 if (buildTargetSettings != null && buildTargetSettings.AssignedSettings != null && buildTargetSettings.AssignedSettings.activeLoaders.Count > 0)
                 {
@@ -156,17 +159,17 @@ private XRPlatformBuildTimeDetect()
 #endif
             }
 
-            internal static XRPlatformBuildTimeDetect GetInstance()
+            internal static PlatformBuildTimeDetect GetInstance()
             {
-                if (xrPlatformInfo == null)
-                    xrPlatformInfo = new XRPlatformBuildTimeDetect();
+                if (s_PlatformInfo == null)
+                    s_PlatformInfo = new PlatformBuildTimeDetect();
 
-                return xrPlatformInfo;
+                return s_PlatformInfo;
             }
 
             internal static void ClearInstance()
             {
-                xrPlatformInfo = null;
+                s_PlatformInfo = null;
             }
         }
 
@@ -207,7 +210,7 @@ public void OnPreprocessBuild(BuildReport report)
         // Called after the build has finished...
         public void OnPostprocessBuild(BuildReport report)
         {
-            XRPlatformBuildTimeDetect.ClearInstance();
+            PlatformBuildTimeDetect.ClearInstance();
 #if PROFILE_BUILD
             Profiler.enabled = false;
 #endif
@@ -237,13 +240,9 @@ private static void GatherShaderFeatures(bool isDevelopmentBuild)
         private static void GetGlobalAndPlatformSettings(bool isDevelopmentBuild)
         {
             if (GraphicsSettings.TryGetRenderPipelineSettings<ShaderStrippingSetting>(out var shaderStrippingSettings))
-            {
                 s_StripDebugDisplayShaders = !isDevelopmentBuild || shaderStrippingSettings.stripRuntimeDebugShaders;
-            }
             else
-            {
                 s_StripDebugDisplayShaders = true;
-            }
 
             if (GraphicsSettings.TryGetRenderPipelineSettings<URPShaderStrippingSetting>(out var urpShaderStrippingSettings))
             {
@@ -252,30 +251,29 @@ private static void GetGlobalAndPlatformSettings(bool isDevelopmentBuild)
                 s_StripScreenCoordOverrideVariants  = urpShaderStrippingSettings.stripScreenCoordOverrideVariants;
             }
 
-            #if XR_MANAGEMENT_4_0_1_OR_NEWER
-            // XR Stripping
-            XRGeneralSettings generalSettings = XRGeneralSettingsPerBuildTarget.XRGeneralSettingsForBuildTarget(BuildPipeline.GetBuildTargetGroup(EditorUserBuildSettings.activeBuildTarget));
-            s_StripXRVariants = generalSettings == null || generalSettings.Manager == null || generalSettings.Manager.activeLoaders.Count <= 0;
+            PlatformBuildTimeDetect platformBuildTimeDetect = PlatformBuildTimeDetect.GetInstance();
+            bool isShaderAPIMobileDefined = GraphicsSettings.HasShaderDefine(BuiltinShaderDefine.SHADER_API_MOBILE);
+            if (platformBuildTimeDetect.isSwitch || isShaderAPIMobileDefined)
+                s_UseSHPerVertexForSHAuto = true;
 
-            if (XRPlatformBuildTimeDetect.GetInstance().isStandaloneXR)
-                s_StripDebugDisplayShaders = true;
+            // XR Stripping
+            #if XR_MANAGEMENT_4_0_1_OR_NEWER
+                BuildTargetGroup buildTargetGroup = BuildPipeline.GetBuildTargetGroup(EditorUserBuildSettings.activeBuildTarget);
+                XRGeneralSettings generalSettings = XRGeneralSettingsPerBuildTarget.XRGeneralSettingsForBuildTarget(buildTargetGroup);
+                s_StripXRVariants = generalSettings == null || generalSettings.Manager == null || generalSettings.Manager.activeLoaders.Count <= 0;
 
-            if (XRPlatformBuildTimeDetect.GetInstance().isHololens)
-            {
-                s_KeepOffVariantForAdditionalLights = true;
-                s_UseSoftShadowQualityLevelKeywords = true;
-                s_UseSHPerVertexForSHAuto = true;
-            }
+                if (platformBuildTimeDetect.isStandaloneXR)
+                    s_StripDebugDisplayShaders = true;
 
-            if (XRPlatformBuildTimeDetect.GetInstance().isQuest)
-            {
-                s_KeepOffVariantForAdditionalLights = true;
-                s_UseSoftShadowQualityLevelKeywords = true;
-                s_UseSHPerVertexForSHAuto = true;
-            }
+                if (platformBuildTimeDetect.isHololens || platformBuildTimeDetect.isQuest)
+                {
+                    s_KeepOffVariantForAdditionalLights = true;
+                    s_UseSoftShadowQualityLevelKeywords = true;
+                    s_UseSHPerVertexForSHAuto = true;
+                }
             #else
-            s_UseSoftShadowQualityLevelKeywords = false;
-            s_StripXRVariants = true;
+                s_UseSoftShadowQualityLevelKeywords = false;
+                s_StripXRVariants = true;
             #endif
         }
 

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

@@ -1918,9 +1918,9 @@ internal enum URPProfileId
     }
 
     // Internal class to detect and cache runtime platform information.
-    // TODO: refine the logic to provide platform abstraction. Eg, we should devide platforms based on capabilities and perf budget.
-    // TODO: isXRMobile is a bad catagory. Alignment and refactor needed.
-    // TODO: Compress all the query data into "isXRMobile" style bools and enums.
+    // TODO: refine the logic to provide platform abstraction. Eg, we should divide platforms based on capabilities and perf budget.
+    // TODO: isXRMobile is a bad category. Alignment and refactor needed.
+    // TODO: Compress all the query data into "isXRMobile" style booleans and enums.
     internal static class PlatformAutoDetect
     {
         /// <summary>
@@ -1929,17 +1929,19 @@ internal static class PlatformAutoDetect
         internal static void Initialize()
         {
             bool isRunningMobile = false;
-#if ENABLE_VR && ENABLE_VR_MODULE
-#if PLATFORM_WINRT || PLATFORM_ANDROID
-            isRunningMobile = IsRunningXRMobile();
-#endif
-#endif
+            #if ENABLE_VR && ENABLE_VR_MODULE
+                #if PLATFORM_WINRT || PLATFORM_ANDROID
+                    isRunningMobile = IsRunningXRMobile();
+                #endif
+            #endif
+
             isXRMobile = isRunningMobile;
             isShaderAPIMobileDefined = GraphicsSettings.HasShaderDefine(BuiltinShaderDefine.SHADER_API_MOBILE);
+            isSwitch = Application.platform == RuntimePlatform.Switch;
         }
 
 #if ENABLE_VR && ENABLE_VR_MODULE
-#if PLATFORM_WINRT || PLATFORM_ANDROID
+    #if PLATFORM_WINRT || PLATFORM_ANDROID
         // XR mobile platforms are not treated as dedicated mobile platforms in Core. Handle them specially here. (Quest and HL).
         private static List<XR.XRDisplaySubsystem> displaySubsystemList = new List<XR.XRDisplaySubsystem>();
         private static bool IsRunningXRMobile()
@@ -1958,7 +1960,7 @@ private static bool IsRunningXRMobile()
             }
             return false;
         }
-#endif
+    #endif
 #endif
 
         /// <summary>
@@ -1971,6 +1973,11 @@ private static bool IsRunningXRMobile()
         /// </summary>
         internal static bool isShaderAPIMobileDefined { get; private set; } = false;
 
+        /// <summary>
+        /// If true, then the runtime platform is set to Switch.
+        /// </summary>
+        internal static bool isSwitch { get; private set; } = false;
+
         /// <summary>
         /// Gives the SH evaluation mode when set to automatically detect.
         /// </summary>
@@ -1980,7 +1987,7 @@ internal static ShEvalMode ShAutoDetect(ShEvalMode mode)
         {
             if (mode == ShEvalMode.Auto)
             {
-                if (PlatformAutoDetect.isXRMobile)
+                if (isXRMobile || isShaderAPIMobileDefined || isSwitch)
                     return ShEvalMode.PerVertex;
                 else
                     return ShEvalMode.PerPixel;