Merge branch 'master' into d3d12

src/xenia/app/premake5.lua

@@ -54,6 +54,10 @@ project("xenia-app")
     "xenia_main.cc",
     "../base/main_"..platform_suffix..".cc",
   })
+
+  filter("files:xenia_main.cc or ../base/main_"..platform_suffix..".cc")
+    vectorextensions("IA32")  -- Disable AVX for main_win.cc so our AVX check/error can happen.
+
   filter("platforms:Windows")
     files({
       "main_resources.rc",

src/xenia/app/xenia_main.cc

@@ -40,8 +40,6 @@
 #include "xenia/hid/xinput/xinput_hid.h"
 #endif  // XE_PLATFORM_WIN32
 
-#include "third_party/xbyak/xbyak/xbyak_util.h"
-
 DEFINE_string(apu, "any", "Audio system. Use: [any, nop, xaudio2]");
 DEFINE_string(gpu, "any", "Graphics system. Use: [any, vulkan, null]");
 DEFINE_string(hid, "any", "Input system. Use: [any, nop, winkey, xinput]");
@@ -155,14 +153,6 @@ int xenia_main(const std::vector<std::wstring>& args) {
   Profiler::Initialize();
   Profiler::ThreadEnter("main");
 
-  Xbyak::util::Cpu cpu;
-  if (!cpu.has(Xbyak::util::Cpu::tAVX)) {
-    xe::FatalError(
-        "Your CPU does not support AVX, which is required by Xenia. See the "
-        "FAQ for system requirements at https://xenia.jp");
-    return -1;
-  }
-
   // Figure out where content should go.
   std::wstring content_root;
   if (!FLAGS_content_root.empty()) {

src/xenia/base/main_win.cc

@@ -22,6 +22,8 @@
 #include "xenia/base/platform_win.h"
 #include "xenia/base/string.h"
 
+#include "third_party/xbyak/xbyak/xbyak_util.h"
+
 #include <bcrypt.h>
 
 DEFINE_bool(win32_high_freq, true,
@@ -85,11 +87,6 @@ static void RequestHighPerformance() {
 int Main() {
   auto entry_info = xe::GetEntryInfo();
 
-  // Request high performance timing.
-  if (FLAGS_win32_high_freq) {
-    RequestHighPerformance();
-  }
-
   // Convert command line to an argv-like format so we can share code/use
   // gflags.
   auto command_line = GetCommandLineW();
@@ -132,10 +129,23 @@ int Main() {
   // Initialize logging. Needs parsed FLAGS.
   xe::InitializeLogging(entry_info.name);
 
+  Xbyak::util::Cpu cpu;
+  if (!cpu.has(Xbyak::util::Cpu::tAVX)) {
+    xe::FatalError(
+        "Your CPU does not support AVX, which is required by Xenia. See the "
+        "FAQ for system requirements at https://xenia.jp");
+    return -1;
+  }
+
   // Print version info.
   XELOGI("Build: %s / %s on %s", XE_BUILD_BRANCH, XE_BUILD_COMMIT,
          XE_BUILD_DATE);
 
+  // Request high performance timing.
+  if (FLAGS_win32_high_freq) {
+    RequestHighPerformance();
+  }
+
   // Call app-provided entry point.
   int result = entry_info.entry_point(args);