Integrating latest 47acbe8

Code/Framework/AzFramework/AzFramework/Platform/PlatformDefaults.cpp

@@ -17,7 +17,7 @@
 
 namespace AzFramework
 {
-    static const char* PlatformNames[PlatformId::NumPlatformIds] = { PlatformPC, PlatformES3, PlatformIOS, PlatformOSX, PlatformXenia, PlatformProvo, PlatformSalem, PlatformJasper, PlatformServer, PlatformAll, PlatformAllClient };
+    static const char* PlatformNames[PlatformId::NumPlatformIds] = { PlatformPC, PlatformES3, PlatformIOS, PlatformOSX, PlatformProvo, PlatformSalem, PlatformJasper, PlatformServer, PlatformAll, PlatformAllClient };
 
     const char* PlatformIdToPalFolder(AzFramework::PlatformId platform)
     {
@@ -35,8 +35,6 @@ namespace AzFramework
             return "iOS";
         case AzFramework::OSX:
             return "Mac";
-        case AzFramework::XENIA:
-            return "Xenia";
         case AzFramework::PROVO:
             return "Provo";
         case AzFramework::SALEM:
@@ -84,10 +82,6 @@ namespace AzFramework
         {
             return PlatformSalem;
         }
-        else if (osPlatform == PlatformCodeNameXenia)
-        {
-            return PlatformCodeNameXenia;
-        }
         else if (osPlatform == PlatformCodeNameJasper)
         {
             return PlatformJasper;
@@ -220,9 +214,6 @@ namespace AzFramework
         case PlatformId::OSX:
             platformCodes.emplace_back(PlatformCodeNameMac);
             break;
-        case PlatformId::XENIA:
-            platformCodes.emplace_back(PlatformCodeNameXenia);
-            break;
         case PlatformId::PROVO:
             platformCodes.emplace_back(PlatformCodeNameProvo);
             break;

Code/Framework/AzFramework/AzFramework/Platform/PlatformDefaults.h

@@ -28,7 +28,6 @@ namespace AzFramework
     constexpr char PlatformES3[] = "es3";
     constexpr char PlatformIOS[] = "ios";
     constexpr char PlatformOSX[] = "osx_gl";
-    constexpr char PlatformXenia[] = "xenia";
     constexpr char PlatformProvo[] = "provo";
     constexpr char PlatformSalem[] = "salem";
     constexpr char PlatformJasper[] = "jasper";
@@ -39,7 +38,6 @@ namespace AzFramework
     constexpr char PlatformCodeNameAndroid[] = "Android";
     constexpr char PlatformCodeNameiOS[] = "iOS";
     constexpr char PlatformCodeNameMac[] = "Mac";
-    constexpr char PlatformCodeNameXenia[] = "Xenia";
     constexpr char PlatformCodeNameProvo[] = "Provo";
     constexpr char PlatformCodeNameSalem[] = "Salem";
     constexpr char PlatformCodeNameJasper[] = "Jasper";
@@ -57,7 +55,6 @@ namespace AzFramework
         ES3,
         IOS,
         OSX,
-        XENIA,
         PROVO,
         SALEM,
         JASPER,
@@ -68,7 +65,7 @@ namespace AzFramework
         // Add new platforms above this
         NumPlatformIds
     );
-    constexpr int NumClientPlatforms = 8;
+    constexpr int NumClientPlatforms = 7;
     constexpr int NumPlatforms = NumClientPlatforms + 1; // 1 "Server" platform currently
     enum class PlatformFlags : AZ::u32
     {
@@ -77,7 +74,6 @@ namespace AzFramework
         Platform_ES3 = 1 << PlatformId::ES3,
         Platform_IOS = 1 << PlatformId::IOS,
         Platform_OSX = 1 << PlatformId::OSX,
-        Platform_XENIA = 1 << PlatformId::XENIA,
         Platform_PROVO = 1 << PlatformId::PROVO,
         Platform_SALEM = 1 << PlatformId::SALEM,
         Platform_JASPER = 1 << PlatformId::JASPER,
@@ -89,7 +85,7 @@ namespace AzFramework
         // A special platform that will always correspond to all non-server platforms, even if new ones are added
         Platform_ALL_CLIENT = 1ULL << 31,
 
-        AllNamedPlatforms = Platform_PC | Platform_ES3 | Platform_IOS | Platform_OSX | Platform_XENIA | Platform_PROVO | Platform_SALEM | Platform_JASPER | Platform_SERVER,
+        AllNamedPlatforms = Platform_PC | Platform_ES3 | Platform_IOS | Platform_OSX | Platform_PROVO | Platform_SALEM | Platform_JASPER | Platform_SERVER,
     };
 
     AZ_DEFINE_ENUM_BITWISE_OPERATORS(PlatformFlags);