removal of old XboxOneStuff

Source/Editor/Cooker/GameCooker.cpp

@@ -31,7 +31,7 @@
 #include "Platform/Windows/WindowsPlatformTools.h"
 #include "Engine/Platform/Windows/WindowsPlatformSettings.h"
 #endif
-#if PLATFORM_TOOLS_UWP || PLATFORM_TOOLS_XBOX_ONE
+#if PLATFORM_TOOLS_UWP
 #include "Platform/UWP/UWPPlatformTools.h"
 #include "Engine/Platform/UWP/UWPPlatformSettings.h"
 #endif
@@ -42,6 +42,9 @@
 #if PLATFORM_TOOLS_PS4
 #include "Platforms/PS4/Editor/PlatformTools/PS4PlatformTools.h"
 #endif
+#if PLATFORM_TOOLS_XBOX_ONE
+#include "Platforms/XboxOne/Editor/PlatformTools/XboxOnePlatformTools.h"
+#endif
 #if PLATFORM_TOOLS_XBOX_SCARLETT
 #include "Platforms/XboxScarlett/Editor/PlatformTools/XboxScarlettPlatformTools.h"
 #endif

Source/Editor/Cooker/Platform/UWP/UWPPlatformTools.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) 2012-2019 Wojciech Figat. All rights reserved.
 
-#if PLATFORM_TOOLS_UWP || PLATFORM_TOOLS_XBOX_ONE
+#if PLATFORM_TOOLS_UWP
 
 #include "UWPPlatformTools.h"
 #include "Engine/Platform/FileSystem.h"
@@ -523,24 +523,4 @@ ArchitectureType WSAPlatformTools::GetArchitecture() const
     return _arch;
 }
 
-const Char* XboxOnePlatformTools::GetDisplayName() const
-{
-    return TEXT("Xbox One");
-}
-
-const Char* XboxOnePlatformTools::GetName() const
-{
-    return TEXT("XboxOne");
-}
-
-PlatformType XboxOnePlatformTools::GetPlatform() const
-{
-    return PlatformType::XboxOne;
-}
-
-ArchitectureType XboxOnePlatformTools::GetArchitecture() const
-{
-    return ArchitectureType::x64;
-}
-
 #endif

Source/Editor/Cooker/Platform/UWP/UWPPlatformTools.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#if PLATFORM_TOOLS_UWP || PLATFORM_TOOLS_XBOX_ONE
+#if PLATFORM_TOOLS_UWP
 
 #include "../../PlatformTools.h"
 
@@ -47,18 +47,5 @@ public:
     ArchitectureType GetArchitecture() const override;
 };
 
-/// <summary>
-/// The Xbox One platform support tools.
-/// </summary>
-class XboxOnePlatformTools : public UWPPlatformTools
-{
-public:
-
-    // [PlatformTools]
-    const Char* GetDisplayName() const override;
-    const Char* GetName() const override;
-    PlatformType GetPlatform() const override;
-    ArchitectureType GetArchitecture() const override;
-};
 
 #endif

Source/Editor/Cooker/Steps/CookAssetsStep.cpp

@@ -463,14 +463,6 @@ bool ProcessShaderBase(CookAssetsStep::AssetCookData& data, ShaderAssetBase* ass
         break;
     }
 #endif
-#if PLATFORM_TOOLS_UWP
-    case BuildPlatform::XboxOne:
-    {
-        const char* platformDefineName = "PLATFORM_XBOX_ONE";
-        COMPILE_PROFILE(DirectX_SM4, SHADER_FILE_CHUNK_INTERNAL_D3D_SM4_CACHE);
-        break;
-    }
-#endif
 #if PLATFORM_TOOLS_LINUX
     case BuildPlatform::LinuxX64:
     {
@@ -491,6 +483,14 @@ bool ProcessShaderBase(CookAssetsStep::AssetCookData& data, ShaderAssetBase* ass
         break;
     }
 #endif
+#if PLATFORM_TOOLS_XBOX_ONE
+    case BuildPlatform::XboxOne:
+    {
+        const char* platformDefineName = "PLATFORM_XBOX_ONE";
+        COMPILE_PROFILE(DirectX_SM6, SHADER_FILE_CHUNK_INTERNAL_D3D_SM6_CACHE);
+        break;
+    }
+#endif
 #if PLATFORM_TOOLS_XBOX_SCARLETT
     case BuildPlatform::XboxScarlett:
     {