Skip to content

Commit 4ce8781

Browse files
jrs-unityEvergreen
authored andcommitted
HDRP: Removed Environmental Variable Check for Switch 2 as it is Now a Supported Platform
1 parent 5b57f53 commit 4ce8781

1 file changed

Lines changed: 3 additions & 19 deletions

File tree

  • Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility

Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/HDUtils.cs

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -810,9 +810,6 @@ internal static bool IsSupportedGraphicDevice(GraphicsDeviceType graphicDevice)
810810
if (graphicDevice == GraphicsDeviceType.Switch) // Switch support only enabled when forced by env variable for CI
811811
return Environment.GetEnvironmentVariable("ENABLE_HDRP_SWITCH_SUPPORT") != null || Application.platform == RuntimePlatform.Switch;
812812

813-
if (graphicDevice == GraphicsDeviceType.Switch2) // Switch2 support only enabled when forced by env variable for CI
814-
return Environment.GetEnvironmentVariable("ENABLE_HDRP_SWITCH2_SUPPORT") != null || Application.platform == RuntimePlatform.Switch2;
815-
816813
return (graphicDevice == GraphicsDeviceType.Direct3D11 ||
817814
graphicDevice == GraphicsDeviceType.Direct3D12 ||
818815
graphicDevice == GraphicsDeviceType.PlayStation4 ||
@@ -823,8 +820,8 @@ internal static bool IsSupportedGraphicDevice(GraphicsDeviceType graphicDevice)
823820
graphicDevice == GraphicsDeviceType.GameCoreXboxOne ||
824821
graphicDevice == GraphicsDeviceType.GameCoreXboxSeries ||
825822
graphicDevice == GraphicsDeviceType.Metal ||
826-
graphicDevice == GraphicsDeviceType.Vulkan
827-
// || graphicDevice == GraphicsDeviceType.Switch2
823+
graphicDevice == GraphicsDeviceType.Vulkan ||
824+
graphicDevice == GraphicsDeviceType.Switch2
828825
);
829826
}
830827

@@ -843,8 +840,7 @@ internal static bool IsSupportedBuildTarget(UnityEditor.BuildTarget buildTarget)
843840
{
844841
if (buildTarget == UnityEditor.BuildTarget.Switch) // Switch support only enabled when forced by env variable for CI
845842
return Environment.GetEnvironmentVariable("ENABLE_HDRP_SWITCH_SUPPORT") != null;
846-
if (buildTarget == UnityEditor.BuildTarget.Switch2) // Switch2 support only enabled when forced by env variable for CI
847-
return Environment.GetEnvironmentVariable("ENABLE_HDRP_SWITCH2_SUPPORT") != null;
843+
848844
return (buildTarget == UnityEditor.BuildTarget.StandaloneWindows ||
849845
buildTarget == UnityEditor.BuildTarget.StandaloneWindows64 ||
850846
buildTarget == UnityEditor.BuildTarget.StandaloneLinux64 ||
@@ -1277,18 +1273,6 @@ internal static string GetUnsupportedAPIMessage(string graphicAPI)
12771273
else
12781274
{
12791275
msg = "Platform " + currentPlatform + " is not supported with HDRP";
1280-
1281-
#if UNITY_EDITOR
1282-
if (buildTarget == UnityEditor.BuildTarget.Switch2)
1283-
{
1284-
msg += ". (For testing purpose only, un-hide by defining environment variable ENABLE_HDRP_SWITCH2_SUPPORT)";
1285-
}
1286-
#else
1287-
if (currentPlatform == "Switch2 OS")
1288-
{
1289-
msg += ". (For testing purpose only, un-hide by defining environment variable ENABLE_HDRP_SWITCH2_SUPPORT)";
1290-
}
1291-
#endif
12921276
}
12931277

12941278
// Display more information to the users when it should have use Metal instead of OpenGL

0 commit comments

Comments
 (0)