Merge branch 'linux'

.travis.yml

@@ -4,47 +4,52 @@
 #sudo: false
 
 language: cpp
-compiler:
-  - clang
-  # - gcc
-
 os:
   - linux
   # - osx
 
-env:
-  - LINT=true
-  - BUILD=true CONFIG=Debug
-  - BUILD=true CONFIG=Release
-
 matrix:
+  include:
+    - compiler: clang
+      env: C_COMPILER=clang-3.9 CXX_COMPILER=clang++-3.9 LINT=true
+    - compiler: clang
+      env: C_COMPILER=clang-3.9 CXX_COMPILER=clang++-3.9 BUILD=true CONFIG=Debug
+    - compiler: clang
+      env: C_COMPILER=clang-3.9 CXX_COMPILER=clang++-3.9 BUILD=true CONFIG=Release
   allow_failures:
     # LLVMGold.so is not installed correctly
-    - env: BUILD=true CONFIG=Release
+    - env: C_COMPILER=clang-3.9 CXX_COMPILER=clang++-3.9 BUILD=true CONFIG=Release
 
-dist: trusty
 sudo: required
 addons:
   apt:
     sources:
-      # - ubuntu-toolchain-r-test
-      - llvm-toolchain-precise
+      - ubuntu-toolchain-r-test
+      - llvm-toolchain-trusty
     packages:
-      - clang-3.8
-      - clang-format-3.8
+      - clang-3.9
+      - clang-format-3.9
+      #- g++-6
       - libc++-dev
       - python3
+      - libc++abi-dev
+      - libgtk-3-dev
+      - liblz4-dev
 
 git:
   # We handle submodules ourselves in xenia-build setup.
   submodules: false
 
 before_script:
-  - export CXX=clang++-3.8
-  - export CC=clang-3.8
+  - export CXX=$CXX_COMPILER
+  - export CC=$C_COMPILER
   # Dump useful info.
   - $CXX --version
   - python3 --version
+  # Add Vulkan dependencies
+  - travis_retry wget http://mirrors.kernel.org/ubuntu/pool/universe/v/vulkan/libvulkan1_1.0.42.0+dfsg1-1ubuntu1~16.04.1_amd64.deb
+  - travis_retry wget http://mirrors.kernel.org/ubuntu/pool/universe/v/vulkan/libvulkan-dev_1.0.42.0+dfsg1-1ubuntu1~16.04.1_amd64.deb
+  - sudo dpkg -i libvulkan1_1.0.42.0+dfsg1-1ubuntu1~16.04.1_amd64.deb libvulkan-dev_1.0.42.0+dfsg1-1ubuntu1~16.04.1_amd64.deb
   # Prepare environment (pull dependencies, build tools).
   - travis_retry ./xenia-build setup
 
@@ -59,9 +64,8 @@ script:
   - if [[ $BUILD == true ]]; then ./xenia-build build --config=$CONFIG --target=xenia-cpu-ppc-tests; fi
   # - if [[ $BUILD == true ]]; then ./build/bin/Linux/$CONFIG/xenia-cpu-ppc-tests --log_file=stdout; fi
 
-  # TODO(DrChat): Enable builds in the future.
   # Build all of xenia.
-  #- ./xenia-build build --config=debug
+  #- if [[ $BUILD == true ]]; then ./xenia-build build --config=$CONFIG; fi
   # All tests (without haswell support).
   #- ./xenia-build test --config=debug --no-build -- --enable_haswell_instructions=false
   # All tests (with haswell support).

docs/building.md

@@ -52,6 +52,14 @@ sudo -E apt-get -yq update &>> ~/apt-get-update.log
 sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install clang-3.8 clang-format-3.8
 ```
 
+You will also need some development libraries. To get them on an ubuntu system:
+```
+sudo apt-get install libgtk-3-dev libpthread-stubs0-dev liblz4-dev libglew-dev libx11-dev
+```
+
+In addition, you will need the latest OpenGL libraries and drivers for your hardware. Intel and the open source
+drivers are not supported as they do not yet support OpenGL 4.5.
+
 ## Running
 
 To make life easier you can use `--flagfile=myflags.txt` to specify all

premake5.lua

@@ -87,10 +87,30 @@ filter("platforms:Linux")
   toolset("clang")
   buildoptions({
     -- "-mlzcnt",  -- (don't) Assume lzcnt is supported.
+    "`pkg-config --cflags gtk+-x11-3.0`"
   })
   links({
     "pthread",
+    "dl",
+    "lz4",
+    "X11",
+    "xcb",
+    "X11-xcb",
+    "GL",
+    "GLEW",
+    "vulkan",
+    "c++",
+    "c++abi"
   })
+  linkoptions({
+    "`pkg-config --libs gtk+-3.0`",
+  })
+  disablewarnings({
+    "deprecated-register"
+  })
+
+filter({"platforms:Linux", "kind:*App"})
+  linkgroups("On")
 
 filter({"platforms:Linux", "language:C++", "toolset:gcc"})
   buildoptions({
@@ -105,7 +125,6 @@ filter({"platforms:Linux", "language:C++", "toolset:clang"})
     "-stdlib=libc++",
   })
   links({
-    "c++",
   })
 
 filter("platforms:Windows")

src/xenia/app/emulator_window.cc

@@ -28,11 +28,11 @@
 namespace xe {
 namespace app {
 
+using xe::ui::FileDropEvent;
 using xe::ui::KeyEvent;
 using xe::ui::MenuItem;
 using xe::ui::MouseEvent;
 using xe::ui::UIEvent;
-using xe::ui::FileDropEvent;
 
 const std::wstring kBaseTitle = L"xenia";
 

src/xenia/app/premake5.lua

@@ -8,8 +8,15 @@ project("xenia-app")
   targetname("xenia")
   language("C++")
   links({
+    "capstone",
     "gflags",
+    "glslang-spirv",
     "imgui",
+    "libavcodec",
+    "libavutil",
+    "snappy",
+    "spirv-tools",
+    "vulkan-loader",
     "xenia-apu",
     "xenia-apu-nop",
     "xenia-base",
@@ -21,11 +28,15 @@ project("xenia-app")
     "xenia-gpu-gl4",
     "xenia-gpu-null",
     "xenia-gpu-vulkan",
+    "xenia-hid",
     "xenia-hid-nop",
     "xenia-kernel",
     "xenia-ui",
     "xenia-ui-gl",
+    "xenia-ui-spirv",
+    "xenia-ui-vulkan",
     "xenia-vfs",
+    "xxhash",
   })
   flags({
     "WinMain",  -- Use WinMain instead of main.
@@ -40,9 +51,10 @@ project("xenia-app")
     "xenia_main.cc",
     "../base/main_"..platform_suffix..".cc",
   })
-  files({
-    "main_resources.rc",
-  })
+  filter("platforms:Windows")
+    files({
+      "main_resources.rc",
+    })
   resincludedirs({
     project_root,
   })

src/xenia/app/xenia_main.cc

@@ -149,21 +149,23 @@ int xenia_main(const std::vector<std::wstring>& args) {
   // This will respond to debugging requests so we can open the debug UI.
   std::unique_ptr<xe::debug::ui::DebugWindow> debug_window;
   if (FLAGS_debug) {
-    emulator->processor()->set_debug_listener_request_handler([&](
-        xe::cpu::Processor* processor) {
-      if (debug_window) {
-        return debug_window.get();
-      }
-      emulator_window->loop()->PostSynchronous([&]() {
-        debug_window = xe::debug::ui::DebugWindow::Create(
-            emulator.get(), emulator_window->loop());
-        debug_window->window()->on_closed.AddListener([&](xe::ui::UIEvent* e) {
-          emulator->processor()->set_debug_listener(nullptr);
-          emulator_window->loop()->Post([&]() { debug_window.reset(); });
+    emulator->processor()->set_debug_listener_request_handler(
+        [&](xe::cpu::Processor* processor) {
+          if (debug_window) {
+            return debug_window.get();
+          }
+          emulator_window->loop()->PostSynchronous([&]() {
+            debug_window = xe::debug::ui::DebugWindow::Create(
+                emulator.get(), emulator_window->loop());
+            debug_window->window()->on_closed.AddListener(
+                [&](xe::ui::UIEvent* e) {
+                  emulator->processor()->set_debug_listener(nullptr);
+                  emulator_window->loop()->Post(
+                      [&]() { debug_window.reset(); });
+                });
+          });
+          return debug_window.get();
         });
-      });
-      return debug_window.get();
-    });
   }
 
   auto evt = xe::threading::Event::CreateAutoResetEvent(false);

src/xenia/apu/xaudio2/xaudio2_audio_driver.cc

@@ -53,9 +53,14 @@ XAudio2AudioDriver::XAudio2AudioDriver(Memory* memory,
 XAudio2AudioDriver::~XAudio2AudioDriver() = default;
 
 const DWORD ChannelMasks[] = {
-    0, 0, SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_LOW_FREQUENCY, 0,
-    0, 0, SPEAKER_FRONT_LEFT | SPEAKER_FRONT_CENTER | SPEAKER_FRONT_RIGHT |
-              SPEAKER_LOW_FREQUENCY | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT,
+    0,
+    0,
+    SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_LOW_FREQUENCY,
+    0,
+    0,
+    0,
+    SPEAKER_FRONT_LEFT | SPEAKER_FRONT_CENTER | SPEAKER_FRONT_RIGHT |
+        SPEAKER_LOW_FREQUENCY | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT,
     0,
 };
 

src/xenia/base/bit_field.h

@@ -29,7 +29,8 @@ struct bf {
   // For enum values, we strip them down to an underlying type.
   typedef
       typename std::conditional<std::is_enum<T>::value, std::underlying_type<T>,
-                                std::identity<T>>::type::type value_type;
+                                std::remove_reference<T>>::type::type
+          value_type;
   inline value_type mask() const {
     return (((value_type)~0) >> (8 * sizeof(value_type) - n_bits)) << position;
   }

src/xenia/base/exception_handler_linux.cc

@@ -0,0 +1,35 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2015 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#include "xenia/base/exception_handler.h"
+
+#include "xenia/base/assert.h"
+#include "xenia/base/math.h"
+#include "xenia/base/platform_linux.h"
+
+namespace xe {
+
+// This can be as large as needed, but isn't often needed.
+// As we will be sometimes firing many exceptions we want to avoid having to
+// scan the table too much or invoke many custom handlers.
+constexpr size_t kMaxHandlerCount = 8;
+
+// All custom handlers, left-aligned and null terminated.
+// Executed in order.
+std::pair<ExceptionHandler::Handler, void*> handlers_[kMaxHandlerCount];
+
+void ExceptionHandler::Install(Handler fn, void* data) {
+  // TODO(dougvj) stub
+}
+
+void ExceptionHandler::Uninstall(Handler fn, void* data) {
+  // TODO(dougvj) stub
+}
+
+}  // namespace xe

src/xenia/base/filesystem_posix.cc

@@ -12,6 +12,8 @@
 #include "xenia/base/string.h"
 
 #include <dirent.h>
+#include <fcntl.h>
+#include <ftw.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -33,6 +35,124 @@ bool CreateFolder(const std::wstring& path) {
   return mkdir(xe::to_string(path).c_str(), 0774);
 }
 
+static int removeCallback(const char* fpath, const struct stat* sb,
+                          int typeflag, struct FTW* ftwbuf) {
+  int rv = remove(fpath);
+  return rv;
+}
+
+bool DeleteFolder(const std::wstring& path) {
+  return nftw(xe::to_string(path).c_str(), removeCallback, 64,
+              FTW_DEPTH | FTW_PHYS) == 0
+             ? true
+             : false;
+}
+
+static uint64_t convertUnixtimeToWinFiletime(time_t unixtime) {
+  // Linux uses number of seconds since 1/1/1970, and Windows uses
+  // number of nanoseconds since 1/1/1601
+  // so we convert linux time to nanoseconds and then add the number of
+  // nanoseconds from 1601 to 1970
+  // see https://msdn.microsoft.com/en-us/library/ms724228
+  uint64_t filetime = filetime = (unixtime * 10000000) + 116444736000000000;
+  return filetime;
+}
+
+bool IsFolder(const std::wstring& path) {
+  struct stat st;
+  if (stat(xe::to_string(path).c_str(), &st) == 0) {
+    if (S_ISDIR(st.st_mode)) return true;
+  }
+  return false;
+}
+
+bool CreateFile(const std::wstring& path) {
+  int file = creat(xe::to_string(path).c_str(), 0774);
+  if (file >= 0) {
+    close(file);
+    return true;
+  }
+  return false;
+}
+
+bool DeleteFile(const std::wstring& path) {
+  return (xe::to_string(path).c_str()) == 0 ? true : false;
+}
+
+class PosixFileHandle : public FileHandle {
+ public:
+  PosixFileHandle(std::wstring path, int handle)
+      : FileHandle(std::move(path)), handle_(handle) {}
+  ~PosixFileHandle() override {
+    close(handle_);
+    handle_ = -1;
+  }
+  bool Read(size_t file_offset, void* buffer, size_t buffer_length,
+            size_t* out_bytes_read) override {
+    ssize_t out = pread(handle_, buffer, buffer_length, file_offset);
+    *out_bytes_read = out;
+    return out >= 0 ? true : false;
+  }
+  bool Write(size_t file_offset, const void* buffer, size_t buffer_length,
+             size_t* out_bytes_written) override {
+    ssize_t out = pwrite(handle_, buffer, buffer_length, file_offset);
+    *out_bytes_written = out;
+    return out >= 0 ? true : false;
+  }
+  void Flush() override { fsync(handle_); }
+
+ private:
+  int handle_ = -1;
+};
+
+std::unique_ptr<FileHandle> FileHandle::OpenExisting(std::wstring path,
+                                                     uint32_t desired_access) {
+  int open_access;
+  if (desired_access & FileAccess::kGenericRead) {
+    open_access |= O_RDONLY;
+  }
+  if (desired_access & FileAccess::kGenericWrite) {
+    open_access |= O_WRONLY;
+  }
+  if (desired_access & FileAccess::kGenericExecute) {
+    open_access |= O_RDONLY;
+  }
+  if (desired_access & FileAccess::kGenericAll) {
+    open_access |= O_RDWR;
+  }
+  if (desired_access & FileAccess::kFileReadData) {
+    open_access |= O_RDONLY;
+  }
+  if (desired_access & FileAccess::kFileWriteData) {
+    open_access |= O_WRONLY;
+  }
+  if (desired_access & FileAccess::kFileAppendData) {
+    open_access |= O_APPEND;
+  }
+  int handle = open(xe::to_string(path).c_str(), open_access);
+  if (handle == -1) {
+    // TODO(benvanik): pick correct response.
+    return nullptr;
+  }
+  return std::make_unique<PosixFileHandle>(path, handle);
+}
+
+bool GetInfo(const std::wstring& path, FileInfo* out_info) {
+  struct stat st;
+  if (stat(xe::to_string(path).c_str(), &st) == 0) {
+    if (S_ISDIR(st.st_mode)) {
+      out_info->type = FileInfo::Type::kDirectory;
+    } else {
+      out_info->type = FileInfo::Type::kFile;
+    }
+    out_info->create_timestamp = convertUnixtimeToWinFiletime(st.st_ctime);
+    out_info->access_timestamp = convertUnixtimeToWinFiletime(st.st_atime);
+    out_info->write_timestamp = convertUnixtimeToWinFiletime(st.st_mtime);
+    return true;
+  }
+  return false;
+}
+
 std::vector<FileInfo> ListFiles(const std::wstring& path) {
   std::vector<FileInfo> result;
 
@@ -43,18 +163,20 @@ std::vector<FileInfo> ListFiles(const std::wstring& path) {
 
   while (auto ent = readdir(dir)) {
     FileInfo info;
+
+    info.name = xe::to_wstring(ent->d_name);
+    struct stat st;
+    stat((xe::to_string(path) + xe::to_string(info.name)).c_str(), &st);
+    info.create_timestamp = convertUnixtimeToWinFiletime(st.st_ctime);
+    info.access_timestamp = convertUnixtimeToWinFiletime(st.st_atime);
+    info.write_timestamp = convertUnixtimeToWinFiletime(st.st_mtime);
     if (ent->d_type == DT_DIR) {
       info.type = FileInfo::Type::kDirectory;
       info.total_size = 0;
     } else {
       info.type = FileInfo::Type::kFile;
-      info.total_size = 0;  // TODO(DrChat): Find a way to get this
+      info.total_size = st.st_size;
     }
-
-    info.create_timestamp = 0;
-    info.access_timestamp = 0;
-    info.write_timestamp = 0;
-    info.name = xe::to_wstring(ent->d_name);
     result.push_back(info);
   }
 

src/xenia/base/math.h

@@ -11,10 +11,10 @@
 #define XENIA_BASE_MATH_H_
 
 #include <algorithm>
+#include <cmath>
 #include <cstdint>
 #include <cstring>
 #include <type_traits>
-
 #include "xenia/base/platform.h"
 
 #if XE_ARCH_AMD64

src/xenia/base/platform_linux.cc

@@ -0,0 +1,21 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2015 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#include "xenia/base/platform_linux.h"
+#include <stdlib.h>
+#include <string>
+
+namespace xe {
+
+void LaunchBrowser(const char* url) {
+  auto cmd = std::string("xdg-open " + std::string(url));
+  system(cmd.c_str());
+}
+
+}  // namespace xe

src/xenia/base/platform_linux.h

@@ -0,0 +1,32 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2015 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#ifndef XENIA_BASE_PLATFORM_X11_H_
+#define XENIA_BASE_PLATFORM_X11_H_
+
+// NOTE: if you're including this file it means you are explicitly depending
+// on Linux headers. Including this file outside of linux platform specific
+// source code will break portability
+
+#include "xenia/base/platform.h"
+
+// Xlib/Xcb is used only for GLX/Vulkan interaction, the window management
+// and input events are done with gtk/gdk
+#include <X11/Xlib-xcb.h>
+#include <X11/Xlib.h>
+#include <X11/Xos.h>
+#include <X11/Xutil.h>
+#include <xcb/xcb.h>
+
+// Used for window management. Gtk is for GUI and wigets, gdk is for lower
+// level events like key presses, mouse events, window handles, etc
+#include <gdk/gdkx.h>
+#include <gtk/gtk.h>
+
+#endif  // XENIA_BASE_PLATFORM_X11_H_

src/xenia/base/profiling.cc

@@ -268,6 +268,7 @@ void Profiler::ToggleDisplay() {}
 void Profiler::TogglePause() {}
 void Profiler::set_window(ui::Window* window) {}
 void Profiler::Present() {}
+void Profiler::Flip() {}
 
 #endif  // XE_OPTION_PROFILING
 

src/xenia/base/socket_win.cc

@@ -259,29 +259,26 @@ class Win32SocketServer : public SocketServer {
       return false;
     }
 
-    accept_thread_ = xe::threading::Thread::Create(
-        {},
-        [this, port]() {
-          xe::threading::set_name(std::string("xe::SocketServer localhost:") +
-                                  std::to_string(port));
-          while (socket_ != INVALID_SOCKET) {
-            sockaddr_in6 client_addr;
-            int client_count = sizeof(client_addr);
-            SOCKET client_socket =
-                accept(socket_, reinterpret_cast<sockaddr*>(&client_addr),
-                       &client_count);
-            if (client_socket == INVALID_SOCKET) {
-              continue;
-            }
+    accept_thread_ = xe::threading::Thread::Create({}, [this, port]() {
+      xe::threading::set_name(std::string("xe::SocketServer localhost:") +
+                              std::to_string(port));
+      while (socket_ != INVALID_SOCKET) {
+        sockaddr_in6 client_addr;
+        int client_count = sizeof(client_addr);
+        SOCKET client_socket = accept(
+            socket_, reinterpret_cast<sockaddr*>(&client_addr), &client_count);
+        if (client_socket == INVALID_SOCKET) {
+          continue;
+        }
 
-            auto client = std::make_unique<Win32Socket>();
-            if (!client->Accept(client_socket)) {
-              XELOGE("Unable to accept socket; ignoring");
-              continue;
-            }
-            accept_callback_(std::move(client));
-          }
-        });
+        auto client = std::make_unique<Win32Socket>();
+        if (!client->Accept(client_socket)) {
+          XELOGE("Unable to accept socket; ignoring");
+          continue;
+        }
+        accept_callback_(std::move(client));
+      }
+    });
 
     return true;
   }

src/xenia/base/threading.h

@@ -16,6 +16,7 @@
 #include <climits>
 #include <condition_variable>
 #include <cstdint>
+#include <functional>
 #include <memory>
 #include <mutex>
 #include <string>

src/xenia/base/threading_linux.cc

@@ -13,9 +13,5 @@
 #include <time.h>
 
 namespace xe {
-namespace threading {
-
-void MaybeYield() { pthread_yield(); }
-
-}  // namespace threading
+namespace threading {}  // namespace threading
 }  // namespace xe

src/xenia/base/threading_posix.cc

@@ -14,6 +14,7 @@
 
 #include <pthread.h>
 #include <sys/syscall.h>
+#include <sys/time.h>
 #include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
@@ -21,6 +22,9 @@
 namespace xe {
 namespace threading {
 
+// TODO(dougvj)
+void EnableAffinityConfiguration() {}
+
 // uint64_t ticks() { return mach_absolute_time(); }
 
 uint32_t current_thread_system_id() {
@@ -32,9 +36,16 @@ void set_name(const std::string& name) {
 }
 
 void set_name(std::thread::native_handle_type handle, const std::string& name) {
-  pthread_setname_np(pthread_self(), name.c_str());
+  pthread_setname_np(handle, name.c_str());
 }
 
+void MaybeYield() {
+  pthread_yield();
+  __sync_synchronize();
+}
+
+void SyncMemory() { __sync_synchronize(); }
+
 void Sleep(std::chrono::microseconds duration) {
   timespec rqtp = {time_t(duration.count() / 1000000),
                    time_t(duration.count() % 1000)};
@@ -42,11 +53,133 @@ void Sleep(std::chrono::microseconds duration) {
   // TODO(benvanik): spin while rmtp >0?
 }
 
-template <typename T>
-class PosixHandle : public T {
+// TODO(dougvj) Not sure how to implement the equivalent of this on POSIX.
+SleepResult AlertableSleep(std::chrono::microseconds duration) {
+  sleep(duration.count() / 1000);
+  return SleepResult::kSuccess;
+}
+
+// TODO(dougvj) We can probably wrap this with pthread_key_t but the type of
+// TlsHandle probably needs to be refactored
+TlsHandle AllocateTlsHandle() {
+  assert_always();
+  return 0;
+}
+
+bool FreeTlsHandle(TlsHandle handle) { return true; }
+
+uintptr_t GetTlsValue(TlsHandle handle) {
+  assert_always();
+  return 0;
+}
+
+bool SetTlsValue(TlsHandle handle, uintptr_t value) {
+  assert_always();
+  return false;
+}
+
+// TODO(dougvj)
+class PosixHighResolutionTimer : public HighResolutionTimer {
  public:
-  explicit PosixHandle(pthread_t handle) : handle_(handle) {}
-  ~PosixHandle() override {}
+  PosixHighResolutionTimer(std::function<void()> callback)
+      : callback_(callback) {}
+  ~PosixHighResolutionTimer() override {}
+
+  bool Initialize(std::chrono::milliseconds period) {
+    assert_always();
+    return false;
+  }
+
+ private:
+  std::function<void()> callback_;
+};
+
+std::unique_ptr<HighResolutionTimer> HighResolutionTimer::CreateRepeating(
+    std::chrono::milliseconds period, std::function<void()> callback) {
+  auto timer = std::make_unique<PosixHighResolutionTimer>(std::move(callback));
+  if (!timer->Initialize(period)) {
+    return nullptr;
+  }
+  return std::unique_ptr<HighResolutionTimer>(timer.release());
+}
+
+// TODO(dougvj) There really is no native POSIX handle for a single wait/signal
+// construct pthreads is at a lower level with more handles for such a mechanism
+// This simple wrapper class could function as our handle, but probably needs
+// some more functionality
+class PosixCondition {
+ public:
+  PosixCondition() : signal_(false) {
+    pthread_mutex_init(&mutex_, NULL);
+    pthread_cond_init(&cond_, NULL);
+  }
+
+  ~PosixCondition() {
+    pthread_mutex_destroy(&mutex_);
+    pthread_cond_destroy(&cond_);
+  }
+
+  void Signal() {
+    pthread_mutex_lock(&mutex_);
+    signal_ = true;
+    pthread_cond_broadcast(&cond_);
+    pthread_mutex_unlock(&mutex_);
+  }
+
+  void Reset() {
+    pthread_mutex_lock(&mutex_);
+    signal_ = false;
+    pthread_mutex_unlock(&mutex_);
+  }
+
+  bool Wait(unsigned int timeout_ms) {
+    // Assume 0 means no timeout, not instant timeout
+    if (timeout_ms == 0) {
+      Wait();
+    }
+    struct timespec time_to_wait;
+    struct timeval now;
+    gettimeofday(&now, NULL);
+
+    // Add the number of seconds we want to wait to the current time
+    time_to_wait.tv_sec = now.tv_sec + (timeout_ms / 1000);
+    // Add the number of nanoseconds we want to wait to the current nanosecond
+    // stride
+    long nsec = (now.tv_usec + (timeout_ms % 1000)) * 1000;
+    // If we overflowed the nanosecond count then we add a second
+    time_to_wait.tv_sec += nsec / 1000000000UL;
+    // We only add nanoseconds within the 1 second stride
+    time_to_wait.tv_nsec = nsec % 1000000000UL;
+    pthread_mutex_lock(&mutex_);
+    while (!signal_) {
+      int status = pthread_cond_timedwait(&cond_, &mutex_, &time_to_wait);
+      if (status == ETIMEDOUT) return false;  // We timed out
+    }
+    pthread_mutex_unlock(&mutex_);
+    return true;  // We didn't time out
+  }
+
+  bool Wait() {
+    pthread_mutex_lock(&mutex_);
+    while (!signal_) {
+      pthread_cond_wait(&cond_, &mutex_);
+    }
+    pthread_mutex_unlock(&mutex_);
+    return true;  // Did not time out;
+  }
+
+ private:
+  bool signal_;
+  pthread_cond_t cond_;
+  pthread_mutex_t mutex_;
+};
+
+// Native posix thread handle
+template <typename T>
+class PosixThreadHandle : public T {
+ public:
+  explicit PosixThreadHandle(pthread_t handle) : handle_(handle) {}
+  ~PosixThreadHandle() override {}
 
  protected:
   void* native_handle() const override {
@@ -56,13 +189,134 @@ class PosixHandle : public T {
   pthread_t handle_;
 };
 
-class PosixThread : public PosixHandle<Thread> {
+// This is wraps a condition object as our handle because posix has no single
+// native handle for higher level concurrency constructs such as semaphores
+template <typename T>
+class PosixConditionHandle : public T {
  public:
-  explicit PosixThread(pthread_t handle) : PosixHandle(handle) {}
+  ~PosixConditionHandle() override {}
+
+ protected:
+  void* native_handle() const override {
+    return reinterpret_cast<void*>(const_cast<PosixCondition*>(&handle_));
+  }
+
+  PosixCondition handle_;
+};
+
+// TODO(dougvj)
+WaitResult Wait(WaitHandle* wait_handle, bool is_alertable,
+                std::chrono::milliseconds timeout) {
+  assert_always();
+  return WaitResult::kFailed;
+}
+
+// TODO(dougvj)
+WaitResult SignalAndWait(WaitHandle* wait_handle_to_signal,
+                         WaitHandle* wait_handle_to_wait_on, bool is_alertable,
+                         std::chrono::milliseconds timeout) {
+  assert_always();
+  return WaitResult::kFailed;
+}
+
+// TODO(dougvj)
+std::pair<WaitResult, size_t> WaitMultiple(WaitHandle* wait_handles[],
+                                           size_t wait_handle_count,
+                                           bool wait_all, bool is_alertable,
+                                           std::chrono::milliseconds timeout) {
+  assert_always();
+  return std::pair<WaitResult, size_t>(WaitResult::kFailed, 0);
+}
+
+// TODO(dougvj)
+class PosixEvent : public PosixConditionHandle<Event> {
+ public:
+  PosixEvent(bool initial_state, int auto_reset) { assert_always(); }
+  ~PosixEvent() override = default;
+  void Set() override { assert_always(); }
+  void Reset() override { assert_always(); }
+  void Pulse() override { assert_always(); }
+
+ private:
+  PosixCondition condition_;
+};
+
+std::unique_ptr<Event> Event::CreateManualResetEvent(bool initial_state) {
+  return std::make_unique<PosixEvent>(PosixEvent(initial_state, false));
+}
+
+std::unique_ptr<Event> Event::CreateAutoResetEvent(bool initial_state) {
+  return std::make_unique<PosixEvent>(PosixEvent(initial_state, true));
+}
+
+// TODO(dougvj)
+class PosixSemaphore : public PosixConditionHandle<Semaphore> {
+ public:
+  PosixSemaphore(int initial_count, int maximum_count) { assert_always(); }
+  ~PosixSemaphore() override = default;
+  bool Release(int release_count, int* out_previous_count) override {
+    assert_always();
+    return false;
+  }
+};
+
+std::unique_ptr<Semaphore> Semaphore::Create(int initial_count,
+                                             int maximum_count) {
+  return std::make_unique<PosixSemaphore>(initial_count, maximum_count);
+}
+
+// TODO(dougvj)
+class PosixMutant : public PosixConditionHandle<Mutant> {
+ public:
+  PosixMutant(bool initial_owner) { assert_always(); }
+  ~PosixMutant() = default;
+  bool Release() override {
+    assert_always();
+    return false;
+  }
+};
+
+std::unique_ptr<Mutant> Mutant::Create(bool initial_owner) {
+  return std::make_unique<PosixMutant>(initial_owner);
+}
+
+// TODO(dougvj)
+class PosixTimer : public PosixConditionHandle<Timer> {
+ public:
+  PosixTimer(bool manual_reset) { assert_always(); }
+  ~PosixTimer() = default;
+  bool SetOnce(std::chrono::nanoseconds due_time,
+               std::function<void()> opt_callback) override {
+    assert_always();
+    return false;
+  }
+  bool SetRepeating(std::chrono::nanoseconds due_time,
+                    std::chrono::milliseconds period,
+                    std::function<void()> opt_callback) override {
+    assert_always();
+    return false;
+  }
+  bool Cancel() override {
+    assert_always();
+    return false;
+  }
+};
+
+std::unique_ptr<Timer> Timer::CreateManualResetTimer() {
+  return std::make_unique<PosixTimer>(true);
+}
+
+std::unique_ptr<Timer> Timer::CreateSynchronizationTimer() {
+  return std::make_unique<PosixTimer>(false);
+}
+
+class PosixThread : public PosixThreadHandle<Thread> {
+ public:
+  explicit PosixThread(pthread_t handle) : PosixThreadHandle(handle) {}
   ~PosixThread() = default;
 
   void set_name(std::string name) override {
-    // TODO(DrChat)
+    pthread_setname_np(handle_, name.c_str());
   }
 
   uint32_t system_id() const override { return 0; }
@@ -141,5 +395,20 @@ std::unique_ptr<Thread> Thread::Create(CreationParameters params,
   return std::unique_ptr<PosixThread>(new PosixThread(handle));
 }
 
+Thread* Thread::GetCurrentThread() {
+  if (current_thread_) {
+    return current_thread_.get();
+  }
+
+  pthread_t handle = pthread_self();
+
+  current_thread_ = std::make_unique<PosixThread>(handle);
+  return current_thread_.get();
+}
+
+void Thread::Exit(int exit_code) {
+  pthread_exit(reinterpret_cast<void*>(exit_code));
+}
+
 }  // namespace threading
 }  // namespace xe

src/xenia/cpu/backend/x64/x64_code_cache_win.cc

@@ -202,11 +202,11 @@ typedef struct _UNWIND_INFO {
   uint8_t FrameOffset : 4;
   UNWIND_CODE UnwindCode[1];
   /*  UNWIND_CODE MoreUnwindCode[((CountOfCodes + 1) & ~1) - 1];
-  *   union {
-  *       OPTIONAL ULONG ExceptionHandler;
-  *       OPTIONAL ULONG FunctionEntry;
-  *   };
-  *   OPTIONAL ULONG ExceptionData[]; */
+   *   union {
+   *       OPTIONAL ULONG ExceptionHandler;
+   *       OPTIONAL ULONG FunctionEntry;
+   *   };
+   *   OPTIONAL ULONG ExceptionData[]; */
 } UNWIND_INFO, *PUNWIND_INFO;
 
 void Win32X64CodeCache::InitializeUnwindEntry(uint8_t* unwind_entry_address,

src/xenia/cpu/backend/x64/x64_emitter.cc

@@ -600,78 +600,78 @@ static const vec128_t xmm_consts[] = {
     /* XMMZero                */ vec128f(0.0f),
     /* XMMOne                 */ vec128f(1.0f),
     /* XMMNegativeOne         */ vec128f(-1.0f, -1.0f, -1.0f, -1.0f),
-    /* XMMFFFF                */ vec128i(0xFFFFFFFFu, 0xFFFFFFFFu, 0xFFFFFFFFu,
-                                         0xFFFFFFFFu),
-    /* XMMMaskX16Y16          */ vec128i(0x0000FFFFu, 0xFFFF0000u, 0x00000000u,
-                                         0x00000000u),
-    /* XMMFlipX16Y16          */ vec128i(0x00008000u, 0x00000000u, 0x00000000u,
-                                         0x00000000u),
+    /* XMMFFFF                */
+    vec128i(0xFFFFFFFFu, 0xFFFFFFFFu, 0xFFFFFFFFu, 0xFFFFFFFFu),
+    /* XMMMaskX16Y16          */
+    vec128i(0x0000FFFFu, 0xFFFF0000u, 0x00000000u, 0x00000000u),
+    /* XMMFlipX16Y16          */
+    vec128i(0x00008000u, 0x00000000u, 0x00000000u, 0x00000000u),
     /* XMMFixX16Y16           */ vec128f(-32768.0f, 0.0f, 0.0f, 0.0f),
-    /* XMMNormalizeX16Y16     */ vec128f(
-        1.0f / 32767.0f, 1.0f / (32767.0f * 65536.0f), 0.0f, 0.0f),
+    /* XMMNormalizeX16Y16     */
+    vec128f(1.0f / 32767.0f, 1.0f / (32767.0f * 65536.0f), 0.0f, 0.0f),
     /* XMM0001                */ vec128f(0.0f, 0.0f, 0.0f, 1.0f),
     /* XMM3301                */ vec128f(3.0f, 3.0f, 0.0f, 1.0f),
     /* XMM3333                */ vec128f(3.0f, 3.0f, 3.0f, 3.0f),
-    /* XMMSignMaskPS          */ vec128i(0x80000000u, 0x80000000u, 0x80000000u,
-                                         0x80000000u),
-    /* XMMSignMaskPD          */ vec128i(0x00000000u, 0x80000000u, 0x00000000u,
-                                         0x80000000u),
-    /* XMMAbsMaskPS           */ vec128i(0x7FFFFFFFu, 0x7FFFFFFFu, 0x7FFFFFFFu,
-                                         0x7FFFFFFFu),
-    /* XMMAbsMaskPD           */ vec128i(0xFFFFFFFFu, 0x7FFFFFFFu, 0xFFFFFFFFu,
-                                         0x7FFFFFFFu),
-    /* XMMByteSwapMask        */ vec128i(0x00010203u, 0x04050607u, 0x08090A0Bu,
-                                         0x0C0D0E0Fu),
-    /* XMMByteOrderMask       */ vec128i(0x01000302u, 0x05040706u, 0x09080B0Au,
-                                         0x0D0C0F0Eu),
+    /* XMMSignMaskPS          */
+    vec128i(0x80000000u, 0x80000000u, 0x80000000u, 0x80000000u),
+    /* XMMSignMaskPD          */
+    vec128i(0x00000000u, 0x80000000u, 0x00000000u, 0x80000000u),
+    /* XMMAbsMaskPS           */
+    vec128i(0x7FFFFFFFu, 0x7FFFFFFFu, 0x7FFFFFFFu, 0x7FFFFFFFu),
+    /* XMMAbsMaskPD           */
+    vec128i(0xFFFFFFFFu, 0x7FFFFFFFu, 0xFFFFFFFFu, 0x7FFFFFFFu),
+    /* XMMByteSwapMask        */
+    vec128i(0x00010203u, 0x04050607u, 0x08090A0Bu, 0x0C0D0E0Fu),
+    /* XMMByteOrderMask       */
+    vec128i(0x01000302u, 0x05040706u, 0x09080B0Au, 0x0D0C0F0Eu),
     /* XMMPermuteControl15    */ vec128b(15),
     /* XMMPermuteByteMask     */ vec128b(0x1F),
     /* XMMPackD3DCOLORSat     */ vec128i(0x404000FFu),
-    /* XMMPackD3DCOLOR        */ vec128i(0xFFFFFFFFu, 0xFFFFFFFFu, 0xFFFFFFFFu,
-                                         0x0C000408u),
-    /* XMMUnpackD3DCOLOR      */ vec128i(0xFFFFFF0Eu, 0xFFFFFF0Du, 0xFFFFFF0Cu,
-                                         0xFFFFFF0Fu),
-    /* XMMPackFLOAT16_2       */ vec128i(0xFFFFFFFFu, 0xFFFFFFFFu, 0xFFFFFFFFu,
-                                         0x01000302u),
-    /* XMMUnpackFLOAT16_2     */ vec128i(0x0D0C0F0Eu, 0xFFFFFFFFu, 0xFFFFFFFFu,
-                                         0xFFFFFFFFu),
-    /* XMMPackFLOAT16_4       */ vec128i(0xFFFFFFFFu, 0xFFFFFFFFu, 0x05040706u,
-                                         0x01000302u),
-    /* XMMUnpackFLOAT16_4     */ vec128i(0x09080B0Au, 0x0D0C0F0Eu, 0xFFFFFFFFu,
-                                         0xFFFFFFFFu),
+    /* XMMPackD3DCOLOR        */
+    vec128i(0xFFFFFFFFu, 0xFFFFFFFFu, 0xFFFFFFFFu, 0x0C000408u),
+    /* XMMUnpackD3DCOLOR      */
+    vec128i(0xFFFFFF0Eu, 0xFFFFFF0Du, 0xFFFFFF0Cu, 0xFFFFFF0Fu),
+    /* XMMPackFLOAT16_2       */
+    vec128i(0xFFFFFFFFu, 0xFFFFFFFFu, 0xFFFFFFFFu, 0x01000302u),
+    /* XMMUnpackFLOAT16_2     */
+    vec128i(0x0D0C0F0Eu, 0xFFFFFFFFu, 0xFFFFFFFFu, 0xFFFFFFFFu),
+    /* XMMPackFLOAT16_4       */
+    vec128i(0xFFFFFFFFu, 0xFFFFFFFFu, 0x05040706u, 0x01000302u),
+    /* XMMUnpackFLOAT16_4     */
+    vec128i(0x09080B0Au, 0x0D0C0F0Eu, 0xFFFFFFFFu, 0xFFFFFFFFu),
     /* XMMPackSHORT_Min       */ vec128i(0x403F8001u),
     /* XMMPackSHORT_Max       */ vec128i(0x40407FFFu),
-    /* XMMPackSHORT_2         */ vec128i(0xFFFFFFFFu, 0xFFFFFFFFu, 0xFFFFFFFFu,
-                                         0x01000504u),
-    /* XMMPackSHORT_4         */ vec128i(0xFFFFFFFFu, 0xFFFFFFFFu, 0x01000504u,
-                                         0x09080D0Cu),
-    /* XMMUnpackSHORT_2       */ vec128i(0xFFFF0F0Eu, 0xFFFF0D0Cu, 0xFFFFFFFFu,
-                                         0xFFFFFFFFu),
-    /* XMMUnpackSHORT_4       */ vec128i(0xFFFF0B0Au, 0xFFFF0908u, 0xFFFF0F0Eu,
-                                         0xFFFF0D0Cu),
+    /* XMMPackSHORT_2         */
+    vec128i(0xFFFFFFFFu, 0xFFFFFFFFu, 0xFFFFFFFFu, 0x01000504u),
+    /* XMMPackSHORT_4         */
+    vec128i(0xFFFFFFFFu, 0xFFFFFFFFu, 0x01000504u, 0x09080D0Cu),
+    /* XMMUnpackSHORT_2       */
+    vec128i(0xFFFF0F0Eu, 0xFFFF0D0Cu, 0xFFFFFFFFu, 0xFFFFFFFFu),
+    /* XMMUnpackSHORT_4       */
+    vec128i(0xFFFF0B0Au, 0xFFFF0908u, 0xFFFF0F0Eu, 0xFFFF0D0Cu),
     /* XMMOneOver255          */ vec128f(1.0f / 255.0f),
-    /* XMMMaskEvenPI16        */ vec128i(0x0000FFFFu, 0x0000FFFFu, 0x0000FFFFu,
-                                         0x0000FFFFu),
-    /* XMMShiftMaskEvenPI16   */ vec128i(0x0000000Fu, 0x0000000Fu, 0x0000000Fu,
-                                         0x0000000Fu),
-    /* XMMShiftMaskPS         */ vec128i(0x0000001Fu, 0x0000001Fu, 0x0000001Fu,
-                                         0x0000001Fu),
-    /* XMMShiftByteMask       */ vec128i(0x000000FFu, 0x000000FFu, 0x000000FFu,
-                                         0x000000FFu),
-    /* XMMSwapWordMask        */ vec128i(0x03030303u, 0x03030303u, 0x03030303u,
-                                         0x03030303u),
-    /* XMMUnsignedDwordMax    */ vec128i(0xFFFFFFFFu, 0x00000000u, 0xFFFFFFFFu,
-                                         0x00000000u),
+    /* XMMMaskEvenPI16        */
+    vec128i(0x0000FFFFu, 0x0000FFFFu, 0x0000FFFFu, 0x0000FFFFu),
+    /* XMMShiftMaskEvenPI16   */
+    vec128i(0x0000000Fu, 0x0000000Fu, 0x0000000Fu, 0x0000000Fu),
+    /* XMMShiftMaskPS         */
+    vec128i(0x0000001Fu, 0x0000001Fu, 0x0000001Fu, 0x0000001Fu),
+    /* XMMShiftByteMask       */
+    vec128i(0x000000FFu, 0x000000FFu, 0x000000FFu, 0x000000FFu),
+    /* XMMSwapWordMask        */
+    vec128i(0x03030303u, 0x03030303u, 0x03030303u, 0x03030303u),
+    /* XMMUnsignedDwordMax    */
+    vec128i(0xFFFFFFFFu, 0x00000000u, 0xFFFFFFFFu, 0x00000000u),
     /* XMM255                 */ vec128f(255.0f),
     /* XMMPI32                */ vec128i(32),
-    /* XMMSignMaskI8          */ vec128i(0x80808080u, 0x80808080u, 0x80808080u,
-                                         0x80808080u),
-    /* XMMSignMaskI16         */ vec128i(0x80008000u, 0x80008000u, 0x80008000u,
-                                         0x80008000u),
-    /* XMMSignMaskI32         */ vec128i(0x80000000u, 0x80000000u, 0x80000000u,
-                                         0x80000000u),
-    /* XMMSignMaskF32         */ vec128i(0x80000000u, 0x80000000u, 0x80000000u,
-                                         0x80000000u),
+    /* XMMSignMaskI8          */
+    vec128i(0x80808080u, 0x80808080u, 0x80808080u, 0x80808080u),
+    /* XMMSignMaskI16         */
+    vec128i(0x80008000u, 0x80008000u, 0x80008000u, 0x80008000u),
+    /* XMMSignMaskI32         */
+    vec128i(0x80000000u, 0x80000000u, 0x80000000u, 0x80000000u),
+    /* XMMSignMaskF32         */
+    vec128i(0x80000000u, 0x80000000u, 0x80000000u, 0x80000000u),
     /* XMMShortMinPS          */ vec128f(SHRT_MIN),
     /* XMMShortMaxPS          */ vec128f(SHRT_MAX),
     /* XMMIntMin              */ vec128i(INT_MIN),

src/xenia/cpu/backend/x64/x64_sequences.cc

@@ -2988,8 +2988,9 @@ EMITTER_OPCODE_TABLE(OPCODE_IS_NAN, IS_NAN_F32, IS_NAN_F64);
 struct COMPARE_EQ_I8
     : Sequence<COMPARE_EQ_I8, I<OPCODE_COMPARE_EQ, I8Op, I8Op, I8Op>> {
   static void Emit(X64Emitter& e, const EmitArgType& i) {
-    EmitCommutativeCompareOp(e, i, [](X64Emitter& e, const Reg8& src1,
-                                      const Reg8& src2) { e.cmp(src1, src2); },
+    EmitCommutativeCompareOp(e, i,
+                             [](X64Emitter& e, const Reg8& src1,
+                                const Reg8& src2) { e.cmp(src1, src2); },
                              [](X64Emitter& e, const Reg8& src1,
                                 int32_t constant) { e.cmp(src1, constant); });
     e.sete(i.dest);
@@ -2998,8 +2999,9 @@ struct COMPARE_EQ_I8
 struct COMPARE_EQ_I16
     : Sequence<COMPARE_EQ_I16, I<OPCODE_COMPARE_EQ, I8Op, I16Op, I16Op>> {
   static void Emit(X64Emitter& e, const EmitArgType& i) {
-    EmitCommutativeCompareOp(e, i, [](X64Emitter& e, const Reg16& src1,
-                                      const Reg16& src2) { e.cmp(src1, src2); },
+    EmitCommutativeCompareOp(e, i,
+                             [](X64Emitter& e, const Reg16& src1,
+                                const Reg16& src2) { e.cmp(src1, src2); },
                              [](X64Emitter& e, const Reg16& src1,
                                 int32_t constant) { e.cmp(src1, constant); });
     e.sete(i.dest);
@@ -3008,8 +3010,9 @@ struct COMPARE_EQ_I16
 struct COMPARE_EQ_I32
     : Sequence<COMPARE_EQ_I32, I<OPCODE_COMPARE_EQ, I8Op, I32Op, I32Op>> {
   static void Emit(X64Emitter& e, const EmitArgType& i) {
-    EmitCommutativeCompareOp(e, i, [](X64Emitter& e, const Reg32& src1,
-                                      const Reg32& src2) { e.cmp(src1, src2); },
+    EmitCommutativeCompareOp(e, i,
+                             [](X64Emitter& e, const Reg32& src1,
+                                const Reg32& src2) { e.cmp(src1, src2); },
                              [](X64Emitter& e, const Reg32& src1,
                                 int32_t constant) { e.cmp(src1, constant); });
     e.sete(i.dest);
@@ -3018,8 +3021,9 @@ struct COMPARE_EQ_I32
 struct COMPARE_EQ_I64
     : Sequence<COMPARE_EQ_I64, I<OPCODE_COMPARE_EQ, I8Op, I64Op, I64Op>> {
   static void Emit(X64Emitter& e, const EmitArgType& i) {
-    EmitCommutativeCompareOp(e, i, [](X64Emitter& e, const Reg64& src1,
-                                      const Reg64& src2) { e.cmp(src1, src2); },
+    EmitCommutativeCompareOp(e, i,
+                             [](X64Emitter& e, const Reg64& src1,
+                                const Reg64& src2) { e.cmp(src1, src2); },
                              [](X64Emitter& e, const Reg64& src1,
                                 int32_t constant) { e.cmp(src1, constant); });
     e.sete(i.dest);
@@ -3055,8 +3059,9 @@ EMITTER_OPCODE_TABLE(OPCODE_COMPARE_EQ, COMPARE_EQ_I8, COMPARE_EQ_I16,
 struct COMPARE_NE_I8
     : Sequence<COMPARE_NE_I8, I<OPCODE_COMPARE_NE, I8Op, I8Op, I8Op>> {
   static void Emit(X64Emitter& e, const EmitArgType& i) {
-    EmitCommutativeCompareOp(e, i, [](X64Emitter& e, const Reg8& src1,
-                                      const Reg8& src2) { e.cmp(src1, src2); },
+    EmitCommutativeCompareOp(e, i,
+                             [](X64Emitter& e, const Reg8& src1,
+                                const Reg8& src2) { e.cmp(src1, src2); },
                              [](X64Emitter& e, const Reg8& src1,
                                 int32_t constant) { e.cmp(src1, constant); });
     e.setne(i.dest);
@@ -3065,8 +3070,9 @@ struct COMPARE_NE_I8
 struct COMPARE_NE_I16
     : Sequence<COMPARE_NE_I16, I<OPCODE_COMPARE_NE, I8Op, I16Op, I16Op>> {
   static void Emit(X64Emitter& e, const EmitArgType& i) {
-    EmitCommutativeCompareOp(e, i, [](X64Emitter& e, const Reg16& src1,
-                                      const Reg16& src2) { e.cmp(src1, src2); },
+    EmitCommutativeCompareOp(e, i,
+                             [](X64Emitter& e, const Reg16& src1,
+                                const Reg16& src2) { e.cmp(src1, src2); },
                              [](X64Emitter& e, const Reg16& src1,
                                 int32_t constant) { e.cmp(src1, constant); });
     e.setne(i.dest);
@@ -3075,8 +3081,9 @@ struct COMPARE_NE_I16
 struct COMPARE_NE_I32
     : Sequence<COMPARE_NE_I32, I<OPCODE_COMPARE_NE, I8Op, I32Op, I32Op>> {
   static void Emit(X64Emitter& e, const EmitArgType& i) {
-    EmitCommutativeCompareOp(e, i, [](X64Emitter& e, const Reg32& src1,
-                                      const Reg32& src2) { e.cmp(src1, src2); },
+    EmitCommutativeCompareOp(e, i,
+                             [](X64Emitter& e, const Reg32& src1,
+                                const Reg32& src2) { e.cmp(src1, src2); },
                              [](X64Emitter& e, const Reg32& src1,
                                 int32_t constant) { e.cmp(src1, constant); });
     e.setne(i.dest);
@@ -3085,8 +3092,9 @@ struct COMPARE_NE_I32
 struct COMPARE_NE_I64
     : Sequence<COMPARE_NE_I64, I<OPCODE_COMPARE_NE, I8Op, I64Op, I64Op>> {
   static void Emit(X64Emitter& e, const EmitArgType& i) {
-    EmitCommutativeCompareOp(e, i, [](X64Emitter& e, const Reg64& src1,
-                                      const Reg64& src2) { e.cmp(src1, src2); },
+    EmitCommutativeCompareOp(e, i,
+                             [](X64Emitter& e, const Reg64& src1,
+                                const Reg64& src2) { e.cmp(src1, src2); },
                              [](X64Emitter& e, const Reg64& src1,
                                 int32_t constant) { e.cmp(src1, constant); });
     e.setne(i.dest);
@@ -3421,8 +3429,10 @@ EMITTER_OPCODE_TABLE(OPCODE_VECTOR_COMPARE_UGE, VECTOR_COMPARE_UGE_V128);
 template <typename SEQ, typename REG, typename ARGS>
 void EmitAddXX(X64Emitter& e, const ARGS& i) {
   SEQ::EmitCommutativeBinaryOp(
-      e, i, [](X64Emitter& e, const REG& dest_src,
-               const REG& src) { e.add(dest_src, src); },
+      e, i,
+      [](X64Emitter& e, const REG& dest_src, const REG& src) {
+        e.add(dest_src, src);
+      },
       [](X64Emitter& e, const REG& dest_src, int32_t constant) {
         e.add(dest_src, constant);
       });
@@ -3491,8 +3501,10 @@ void EmitAddCarryXX(X64Emitter& e, const ARGS& i) {
     e.sahf();
   }
   SEQ::EmitCommutativeBinaryOp(
-      e, i, [](X64Emitter& e, const REG& dest_src,
-               const REG& src) { e.adc(dest_src, src); },
+      e, i,
+      [](X64Emitter& e, const REG& dest_src, const REG& src) {
+        e.adc(dest_src, src);
+      },
       [](X64Emitter& e, const REG& dest_src, int32_t constant) {
         e.adc(dest_src, constant);
       });
@@ -3530,105 +3542,110 @@ EMITTER_OPCODE_TABLE(OPCODE_ADD_CARRY, ADD_CARRY_I8, ADD_CARRY_I16,
 struct VECTOR_ADD
     : Sequence<VECTOR_ADD, I<OPCODE_VECTOR_ADD, V128Op, V128Op, V128Op>> {
   static void Emit(X64Emitter& e, const EmitArgType& i) {
-    EmitCommutativeBinaryXmmOp(e, i, [&i](X64Emitter& e, const Xmm& dest,
-                                          Xmm src1, Xmm src2) {
-      const TypeName part_type = static_cast<TypeName>(i.instr->flags & 0xFF);
-      const uint32_t arithmetic_flags = i.instr->flags >> 8;
-      bool is_unsigned = !!(arithmetic_flags & ARITHMETIC_UNSIGNED);
-      bool saturate = !!(arithmetic_flags & ARITHMETIC_SATURATE);
-      switch (part_type) {
-        case INT8_TYPE:
-          if (saturate) {
-            // TODO(benvanik): trace DID_SATURATE
-            if (is_unsigned) {
-              e.vpaddusb(dest, src1, src2);
-            } else {
-              e.vpaddsb(dest, src1, src2);
-            }
-          } else {
-            e.vpaddb(dest, src1, src2);
-          }
-          break;
-        case INT16_TYPE:
-          if (saturate) {
-            // TODO(benvanik): trace DID_SATURATE
-            if (is_unsigned) {
-              e.vpaddusw(dest, src1, src2);
-            } else {
-              e.vpaddsw(dest, src1, src2);
-            }
-          } else {
-            e.vpaddw(dest, src1, src2);
-          }
-          break;
-        case INT32_TYPE:
-          if (saturate) {
-            if (is_unsigned) {
-              // xmm0 is the only temp register that can be used by src1/src2.
-              e.vpaddd(e.xmm1, src1, src2);
-
-              // If result is smaller than either of the inputs, we've
-              // overflowed (only need to check one input)
-              // if (src1 > res) then overflowed
-              // http://locklessinc.com/articles/sat_arithmetic/
-              e.vpxor(e.xmm2, src1, e.GetXmmConstPtr(XMMSignMaskI32));
-              e.vpxor(e.xmm0, e.xmm1, e.GetXmmConstPtr(XMMSignMaskI32));
-              e.vpcmpgtd(e.xmm0, e.xmm2, e.xmm0);
-              e.vpor(dest, e.xmm1, e.xmm0);
-            } else {
-              // Preserve the sources.
-              if (dest == src1) {
-                e.vmovdqa(e.xmm2, src1);
-                src1 = e.xmm2;
+    EmitCommutativeBinaryXmmOp(
+        e, i, [&i](X64Emitter& e, const Xmm& dest, Xmm src1, Xmm src2) {
+          const TypeName part_type =
+              static_cast<TypeName>(i.instr->flags & 0xFF);
+          const uint32_t arithmetic_flags = i.instr->flags >> 8;
+          bool is_unsigned = !!(arithmetic_flags & ARITHMETIC_UNSIGNED);
+          bool saturate = !!(arithmetic_flags & ARITHMETIC_SATURATE);
+          switch (part_type) {
+            case INT8_TYPE:
+              if (saturate) {
+                // TODO(benvanik): trace DID_SATURATE
+                if (is_unsigned) {
+                  e.vpaddusb(dest, src1, src2);
+                } else {
+                  e.vpaddsb(dest, src1, src2);
+                }
+              } else {
+                e.vpaddb(dest, src1, src2);
               }
-              if (dest == src2) {
-                e.vmovdqa(e.xmm1, src2);
-                src2 = e.xmm1;
+              break;
+            case INT16_TYPE:
+              if (saturate) {
+                // TODO(benvanik): trace DID_SATURATE
+                if (is_unsigned) {
+                  e.vpaddusw(dest, src1, src2);
+                } else {
+                  e.vpaddsw(dest, src1, src2);
+                }
+              } else {
+                e.vpaddw(dest, src1, src2);
               }
+              break;
+            case INT32_TYPE:
+              if (saturate) {
+                if (is_unsigned) {
+                  // xmm0 is the only temp register that can be used by
+                  // src1/src2.
+                  e.vpaddd(e.xmm1, src1, src2);
 
-              // xmm0 is the only temp register that can be used by src1/src2.
-              e.vpaddd(dest, src1, src2);
+                  // If result is smaller than either of the inputs, we've
+                  // overflowed (only need to check one input)
+                  // if (src1 > res) then overflowed
+                  // http://locklessinc.com/articles/sat_arithmetic/
+                  e.vpxor(e.xmm2, src1, e.GetXmmConstPtr(XMMSignMaskI32));
+                  e.vpxor(e.xmm0, e.xmm1, e.GetXmmConstPtr(XMMSignMaskI32));
+                  e.vpcmpgtd(e.xmm0, e.xmm2, e.xmm0);
+                  e.vpor(dest, e.xmm1, e.xmm0);
+                } else {
+                  // Preserve the sources.
+                  if (dest == src1) {
+                    e.vmovdqa(e.xmm2, src1);
+                    src1 = e.xmm2;
+                  }
+                  if (dest == src2) {
+                    e.vmovdqa(e.xmm1, src2);
+                    src2 = e.xmm1;
+                  }
 
-              // Overflow results if two inputs are the same sign and the result
-              // isn't the same sign.
-              // if ((s32b)(~(src1 ^ src2) & (src1 ^ res)) < 0) then overflowed
-              // http://locklessinc.com/articles/sat_arithmetic/
-              e.vpxor(e.xmm1, src1, src2);
+                  // xmm0 is the only temp register that can be used by
+                  // src1/src2.
+                  e.vpaddd(dest, src1, src2);
 
-              // Move src1 to xmm0 in-case it was the same register as the dest.
-              // This kills src2 if it's a constant.
-              if (src1 != e.xmm0) {
-                e.vmovdqa(e.xmm0, src1);
-                src1 = e.xmm0;
+                  // Overflow results if two inputs are the same sign and the
+                  // result isn't the same sign. if ((s32b)(~(src1 ^ src2) &
+                  // (src1 ^ res)) < 0) then overflowed
+                  // http://locklessinc.com/articles/sat_arithmetic/
+                  e.vpxor(e.xmm1, src1, src2);
+
+                  // Move src1 to xmm0 in-case it was the same register as the
+                  // dest. This kills src2 if it's a constant.
+                  if (src1 != e.xmm0) {
+                    e.vmovdqa(e.xmm0, src1);
+                    src1 = e.xmm0;
+                  }
+
+                  e.vpxor(e.xmm2, src1, dest);
+                  e.vpandn(e.xmm1, e.xmm1, e.xmm2);
+
+                  // High bit of xmm1 is now set if overflowed.
+
+                  // Set any negative overflowed elements of src1 to INT_MIN
+                  e.vpand(e.xmm2, src1, e.xmm1);
+                  e.vblendvps(dest, dest, e.GetXmmConstPtr(XMMSignMaskI32),
+                              e.xmm2);
+
+                  // Set any positive overflowed elements of src1 to INT_MAX
+                  e.vpandn(e.xmm2, src1, e.xmm1);
+                  e.vblendvps(dest, dest, e.GetXmmConstPtr(XMMAbsMaskPS),
+                              e.xmm2);
+                }
+              } else {
+                e.vpaddd(dest, src1, src2);
               }
-
-              e.vpxor(e.xmm2, src1, dest);
-              e.vpandn(e.xmm1, e.xmm1, e.xmm2);
-
-              // High bit of xmm1 is now set if overflowed.
-
-              // Set any negative overflowed elements of src1 to INT_MIN
-              e.vpand(e.xmm2, src1, e.xmm1);
-              e.vblendvps(dest, dest, e.GetXmmConstPtr(XMMSignMaskI32), e.xmm2);
-
-              // Set any positive overflowed elements of src1 to INT_MAX
-              e.vpandn(e.xmm2, src1, e.xmm1);
-              e.vblendvps(dest, dest, e.GetXmmConstPtr(XMMAbsMaskPS), e.xmm2);
-            }
-          } else {
-            e.vpaddd(dest, src1, src2);
+              break;
+            case FLOAT32_TYPE:
+              assert_false(is_unsigned);
+              assert_false(saturate);
+              e.vaddps(dest, src1, src2);
+              break;
+            default:
+              assert_unhandled_case(part_type);
+              break;
           }
-          break;
-        case FLOAT32_TYPE:
-          assert_false(is_unsigned);
-          assert_false(saturate);
-          e.vaddps(dest, src1, src2);
-          break;
-        default:
-          assert_unhandled_case(part_type);
-          break;
-      }
-    });
+        });
   }
 };
 EMITTER_OPCODE_TABLE(OPCODE_VECTOR_ADD, VECTOR_ADD);
@@ -3640,8 +3657,10 @@ EMITTER_OPCODE_TABLE(OPCODE_VECTOR_ADD, VECTOR_ADD);
 template <typename SEQ, typename REG, typename ARGS>
 void EmitSubXX(X64Emitter& e, const ARGS& i) {
   SEQ::EmitAssociativeBinaryOp(
-      e, i, [](X64Emitter& e, const REG& dest_src,
-               const REG& src) { e.sub(dest_src, src); },
+      e, i,
+      [](X64Emitter& e, const REG& dest_src, const REG& src) {
+        e.sub(dest_src, src);
+      },
       [](X64Emitter& e, const REG& dest_src, int32_t constant) {
         e.sub(dest_src, constant);
       });
@@ -3693,104 +3712,109 @@ EMITTER_OPCODE_TABLE(OPCODE_SUB, SUB_I8, SUB_I16, SUB_I32, SUB_I64, SUB_F32,
 struct VECTOR_SUB
     : Sequence<VECTOR_SUB, I<OPCODE_VECTOR_SUB, V128Op, V128Op, V128Op>> {
   static void Emit(X64Emitter& e, const EmitArgType& i) {
-    EmitCommutativeBinaryXmmOp(e, i, [&i](X64Emitter& e, const Xmm& dest,
-                                          Xmm src1, Xmm src2) {
-      const TypeName part_type = static_cast<TypeName>(i.instr->flags & 0xFF);
-      const uint32_t arithmetic_flags = i.instr->flags >> 8;
-      bool is_unsigned = !!(arithmetic_flags & ARITHMETIC_UNSIGNED);
-      bool saturate = !!(arithmetic_flags & ARITHMETIC_SATURATE);
-      switch (part_type) {
-        case INT8_TYPE:
-          if (saturate) {
-            // TODO(benvanik): trace DID_SATURATE
-            if (is_unsigned) {
-              e.vpsubusb(dest, src1, src2);
-            } else {
-              e.vpsubsb(dest, src1, src2);
-            }
-          } else {
-            e.vpsubb(dest, src1, src2);
-          }
-          break;
-        case INT16_TYPE:
-          if (saturate) {
-            // TODO(benvanik): trace DID_SATURATE
-            if (is_unsigned) {
-              e.vpsubusw(dest, src1, src2);
-            } else {
-              e.vpsubsw(dest, src1, src2);
-            }
-          } else {
-            e.vpsubw(dest, src1, src2);
-          }
-          break;
-        case INT32_TYPE:
-          if (saturate) {
-            if (is_unsigned) {
-              // xmm0 is the only temp register that can be used by src1/src2.
-              e.vpsubd(e.xmm1, src1, src2);
-
-              // If result is greater than either of the inputs, we've
-              // underflowed (only need to check one input)
-              // if (res > src1) then underflowed
-              // http://locklessinc.com/articles/sat_arithmetic/
-              e.vpxor(e.xmm2, src1, e.GetXmmConstPtr(XMMSignMaskI32));
-              e.vpxor(e.xmm0, e.xmm1, e.GetXmmConstPtr(XMMSignMaskI32));
-              e.vpcmpgtd(e.xmm0, e.xmm0, e.xmm2);
-              e.vpandn(dest, e.xmm0, e.xmm1);
-            } else {
-              // Preserve the sources.
-              if (dest == src1) {
-                e.vmovdqa(e.xmm2, src1);
-                src1 = e.xmm2;
+    EmitCommutativeBinaryXmmOp(
+        e, i, [&i](X64Emitter& e, const Xmm& dest, Xmm src1, Xmm src2) {
+          const TypeName part_type =
+              static_cast<TypeName>(i.instr->flags & 0xFF);
+          const uint32_t arithmetic_flags = i.instr->flags >> 8;
+          bool is_unsigned = !!(arithmetic_flags & ARITHMETIC_UNSIGNED);
+          bool saturate = !!(arithmetic_flags & ARITHMETIC_SATURATE);
+          switch (part_type) {
+            case INT8_TYPE:
+              if (saturate) {
+                // TODO(benvanik): trace DID_SATURATE
+                if (is_unsigned) {
+                  e.vpsubusb(dest, src1, src2);
+                } else {
+                  e.vpsubsb(dest, src1, src2);
+                }
+              } else {
+                e.vpsubb(dest, src1, src2);
               }
-              if (dest == src2) {
-                e.vmovdqa(e.xmm1, src2);
-                src2 = e.xmm1;
+              break;
+            case INT16_TYPE:
+              if (saturate) {
+                // TODO(benvanik): trace DID_SATURATE
+                if (is_unsigned) {
+                  e.vpsubusw(dest, src1, src2);
+                } else {
+                  e.vpsubsw(dest, src1, src2);
+                }
+              } else {
+                e.vpsubw(dest, src1, src2);
               }
+              break;
+            case INT32_TYPE:
+              if (saturate) {
+                if (is_unsigned) {
+                  // xmm0 is the only temp register that can be used by
+                  // src1/src2.
+                  e.vpsubd(e.xmm1, src1, src2);
 
-              // xmm0 is the only temp register that can be used by src1/src2.
-              e.vpsubd(dest, src1, src2);
+                  // If result is greater than either of the inputs, we've
+                  // underflowed (only need to check one input)
+                  // if (res > src1) then underflowed
+                  // http://locklessinc.com/articles/sat_arithmetic/
+                  e.vpxor(e.xmm2, src1, e.GetXmmConstPtr(XMMSignMaskI32));
+                  e.vpxor(e.xmm0, e.xmm1, e.GetXmmConstPtr(XMMSignMaskI32));
+                  e.vpcmpgtd(e.xmm0, e.xmm0, e.xmm2);
+                  e.vpandn(dest, e.xmm0, e.xmm1);
+                } else {
+                  // Preserve the sources.
+                  if (dest == src1) {
+                    e.vmovdqa(e.xmm2, src1);
+                    src1 = e.xmm2;
+                  }
+                  if (dest == src2) {
+                    e.vmovdqa(e.xmm1, src2);
+                    src2 = e.xmm1;
+                  }
 
-              // We can only overflow if the signs of the operands are opposite.
-              // If signs are opposite and result sign isn't the same as src1's
-              // sign, we've overflowed.
-              // if ((s32b)((src1 ^ src2) & (src1 ^ res)) < 0) then overflowed
-              // http://locklessinc.com/articles/sat_arithmetic/
-              e.vpxor(e.xmm1, src1, src2);
+                  // xmm0 is the only temp register that can be used by
+                  // src1/src2.
+                  e.vpsubd(dest, src1, src2);
 
-              // Move src1 to xmm0 in-case it's the same register as the dest.
-              // This kills src2 if it's a constant.
-              if (src1 != e.xmm0) {
-                e.vmovdqa(e.xmm0, src1);
-                src1 = e.xmm0;
+                  // We can only overflow if the signs of the operands are
+                  // opposite. If signs are opposite and result sign isn't the
+                  // same as src1's sign, we've overflowed. if ((s32b)((src1 ^
+                  // src2) & (src1 ^ res)) < 0) then overflowed
+                  // http://locklessinc.com/articles/sat_arithmetic/
+                  e.vpxor(e.xmm1, src1, src2);
+
+                  // Move src1 to xmm0 in-case it's the same register as the
+                  // dest. This kills src2 if it's a constant.
+                  if (src1 != e.xmm0) {
+                    e.vmovdqa(e.xmm0, src1);
+                    src1 = e.xmm0;
+                  }
+
+                  e.vpxor(e.xmm2, src1, dest);
+                  e.vpand(e.xmm1, e.xmm1, e.xmm2);
+
+                  // High bit of xmm1 is now set if overflowed.
+
+                  // Set any negative overflowed elements of src1 to INT_MIN
+                  e.vpand(e.xmm2, src1, e.xmm1);
+                  e.vblendvps(dest, dest, e.GetXmmConstPtr(XMMSignMaskI32),
+                              e.xmm2);
+
+                  // Set any positive overflowed elements of src1 to INT_MAX
+                  e.vpandn(e.xmm2, src1, e.xmm1);
+                  e.vblendvps(dest, dest, e.GetXmmConstPtr(XMMAbsMaskPS),
+                              e.xmm2);
+                }
+              } else {
+                e.vpsubd(dest, src1, src2);
               }
-
-              e.vpxor(e.xmm2, src1, dest);
-              e.vpand(e.xmm1, e.xmm1, e.xmm2);
-
-              // High bit of xmm1 is now set if overflowed.
-
-              // Set any negative overflowed elements of src1 to INT_MIN
-              e.vpand(e.xmm2, src1, e.xmm1);
-              e.vblendvps(dest, dest, e.GetXmmConstPtr(XMMSignMaskI32), e.xmm2);
-
-              // Set any positive overflowed elements of src1 to INT_MAX
-              e.vpandn(e.xmm2, src1, e.xmm1);
-              e.vblendvps(dest, dest, e.GetXmmConstPtr(XMMAbsMaskPS), e.xmm2);
-            }
-          } else {
-            e.vpsubd(dest, src1, src2);
+              break;
+            case FLOAT32_TYPE:
+              e.vsubps(dest, src1, src2);
+              break;
+            default:
+              assert_unhandled_case(part_type);
+              break;
           }
-          break;
-        case FLOAT32_TYPE:
-          e.vsubps(dest, src1, src2);
-          break;
-        default:
-          assert_unhandled_case(part_type);
-          break;
-      }
-    });
+        });
   }
 };
 EMITTER_OPCODE_TABLE(OPCODE_VECTOR_SUB, VECTOR_SUB);
@@ -4469,24 +4493,26 @@ struct MUL_ADD_F32
 
     // FMA extension
     if (e.IsFeatureEnabled(kX64EmitFMA)) {
-      EmitCommutativeBinaryXmmOp(e, i, [&i](X64Emitter& e, const Xmm& dest,
-                                            const Xmm& src1, const Xmm& src2) {
-        Xmm src3 = i.src3.is_constant ? e.xmm1 : i.src3;
-        if (i.src3.is_constant) {
-          e.LoadConstantXmm(e.xmm1, i.src3.constant());
-        }
-        if (i.dest == src1) {
-          e.vfmadd213ss(i.dest, src2, src3);
-        } else if (i.dest == src2) {
-          e.vfmadd213ss(i.dest, src1, src3);
-        } else if (i.dest == i.src3) {
-          e.vfmadd231ss(i.dest, src1, src2);
-        } else {
-          // Dest not equal to anything
-          e.vmovss(i.dest, src1);
-          e.vfmadd213ss(i.dest, src2, src3);
-        }
-      });
+      EmitCommutativeBinaryXmmOp(
+          e, i,
+          [&i](X64Emitter& e, const Xmm& dest, const Xmm& src1,
+               const Xmm& src2) {
+            Xmm src3 = i.src3.is_constant ? e.xmm1 : i.src3;
+            if (i.src3.is_constant) {
+              e.LoadConstantXmm(e.xmm1, i.src3.constant());
+            }
+            if (i.dest == src1) {
+              e.vfmadd213ss(i.dest, src2, src3);
+            } else if (i.dest == src2) {
+              e.vfmadd213ss(i.dest, src1, src3);
+            } else if (i.dest == i.src3) {
+              e.vfmadd231ss(i.dest, src1, src2);
+            } else {
+              // Dest not equal to anything
+              e.vmovss(i.dest, src1);
+              e.vfmadd213ss(i.dest, src2, src3);
+            }
+          });
     } else {
       Xmm src3;
       if (i.src3.is_constant) {
@@ -4526,24 +4552,26 @@ struct MUL_ADD_F64
 
     // FMA extension
     if (e.IsFeatureEnabled(kX64EmitFMA)) {
-      EmitCommutativeBinaryXmmOp(e, i, [&i](X64Emitter& e, const Xmm& dest,
-                                            const Xmm& src1, const Xmm& src2) {
-        Xmm src3 = i.src3.is_constant ? e.xmm1 : i.src3;
-        if (i.src3.is_constant) {
-          e.LoadConstantXmm(e.xmm1, i.src3.constant());
-        }
-        if (i.dest == src1) {
-          e.vfmadd213sd(i.dest, src2, src3);
-        } else if (i.dest == src2) {
-          e.vfmadd213sd(i.dest, src1, src3);
-        } else if (i.dest == i.src3) {
-          e.vfmadd231sd(i.dest, src1, src2);
-        } else {
-          // Dest not equal to anything
-          e.vmovsd(i.dest, src1);
-          e.vfmadd213sd(i.dest, src2, src3);
-        }
-      });
+      EmitCommutativeBinaryXmmOp(
+          e, i,
+          [&i](X64Emitter& e, const Xmm& dest, const Xmm& src1,
+               const Xmm& src2) {
+            Xmm src3 = i.src3.is_constant ? e.xmm1 : i.src3;
+            if (i.src3.is_constant) {
+              e.LoadConstantXmm(e.xmm1, i.src3.constant());
+            }
+            if (i.dest == src1) {
+              e.vfmadd213sd(i.dest, src2, src3);
+            } else if (i.dest == src2) {
+              e.vfmadd213sd(i.dest, src1, src3);
+            } else if (i.dest == i.src3) {
+              e.vfmadd231sd(i.dest, src1, src2);
+            } else {
+              // Dest not equal to anything
+              e.vmovsd(i.dest, src1);
+              e.vfmadd213sd(i.dest, src2, src3);
+            }
+          });
     } else {
       Xmm src3;
       if (i.src3.is_constant) {
@@ -4589,24 +4617,26 @@ struct MUL_ADD_V128
     // than vmul+vadd and it'd be nice to know why. Until we know, it's
     // disabled so tests pass.
     if (false && e.IsFeatureEnabled(kX64EmitFMA)) {
-      EmitCommutativeBinaryXmmOp(e, i, [&i](X64Emitter& e, const Xmm& dest,
-                                            const Xmm& src1, const Xmm& src2) {
-        Xmm src3 = i.src3.is_constant ? e.xmm1 : i.src3;
-        if (i.src3.is_constant) {
-          e.LoadConstantXmm(e.xmm1, i.src3.constant());
-        }
-        if (i.dest == src1) {
-          e.vfmadd213ps(i.dest, src2, src3);
-        } else if (i.dest == src2) {
-          e.vfmadd213ps(i.dest, src1, src3);
-        } else if (i.dest == i.src3) {
-          e.vfmadd231ps(i.dest, src1, src2);
-        } else {
-          // Dest not equal to anything
-          e.vmovdqa(i.dest, src1);
-          e.vfmadd213ps(i.dest, src2, src3);
-        }
-      });
+      EmitCommutativeBinaryXmmOp(
+          e, i,
+          [&i](X64Emitter& e, const Xmm& dest, const Xmm& src1,
+               const Xmm& src2) {
+            Xmm src3 = i.src3.is_constant ? e.xmm1 : i.src3;
+            if (i.src3.is_constant) {
+              e.LoadConstantXmm(e.xmm1, i.src3.constant());
+            }
+            if (i.dest == src1) {
+              e.vfmadd213ps(i.dest, src2, src3);
+            } else if (i.dest == src2) {
+              e.vfmadd213ps(i.dest, src1, src3);
+            } else if (i.dest == i.src3) {
+              e.vfmadd231ps(i.dest, src1, src2);
+            } else {
+              // Dest not equal to anything
+              e.vmovdqa(i.dest, src1);
+              e.vfmadd213ps(i.dest, src2, src3);
+            }
+          });
     } else {
       Xmm src3;
       if (i.src3.is_constant) {
@@ -4660,24 +4690,26 @@ struct MUL_SUB_F32
 
     // FMA extension
     if (e.IsFeatureEnabled(kX64EmitFMA)) {
-      EmitCommutativeBinaryXmmOp(e, i, [&i](X64Emitter& e, const Xmm& dest,
-                                            const Xmm& src1, const Xmm& src2) {
-        Xmm src3 = i.src3.is_constant ? e.xmm1 : i.src3;
-        if (i.src3.is_constant) {
-          e.LoadConstantXmm(e.xmm1, i.src3.constant());
-        }
-        if (i.dest == src1) {
-          e.vfmsub213ss(i.dest, src2, src3);
-        } else if (i.dest == src2) {
-          e.vfmsub213ss(i.dest, src1, src3);
-        } else if (i.dest == i.src3) {
-          e.vfmsub231ss(i.dest, src1, src2);
-        } else {
-          // Dest not equal to anything
-          e.vmovss(i.dest, src1);
-          e.vfmsub213ss(i.dest, src2, src3);
-        }
-      });
+      EmitCommutativeBinaryXmmOp(
+          e, i,
+          [&i](X64Emitter& e, const Xmm& dest, const Xmm& src1,
+               const Xmm& src2) {
+            Xmm src3 = i.src3.is_constant ? e.xmm1 : i.src3;
+            if (i.src3.is_constant) {
+              e.LoadConstantXmm(e.xmm1, i.src3.constant());
+            }
+            if (i.dest == src1) {
+              e.vfmsub213ss(i.dest, src2, src3);
+            } else if (i.dest == src2) {
+              e.vfmsub213ss(i.dest, src1, src3);
+            } else if (i.dest == i.src3) {
+              e.vfmsub231ss(i.dest, src1, src2);
+            } else {
+              // Dest not equal to anything
+              e.vmovss(i.dest, src1);
+              e.vfmsub213ss(i.dest, src2, src3);
+            }
+          });
     } else {
       Xmm src3;
       if (i.src3.is_constant) {
@@ -4717,24 +4749,26 @@ struct MUL_SUB_F64
 
     // FMA extension
     if (e.IsFeatureEnabled(kX64EmitFMA)) {
-      EmitCommutativeBinaryXmmOp(e, i, [&i](X64Emitter& e, const Xmm& dest,
-                                            const Xmm& src1, const Xmm& src2) {
-        Xmm src3 = i.src3.is_constant ? e.xmm1 : i.src3;
-        if (i.src3.is_constant) {
-          e.LoadConstantXmm(e.xmm1, i.src3.constant());
-        }
-        if (i.dest == src1) {
-          e.vfmsub213sd(i.dest, src2, src3);
-        } else if (i.dest == src2) {
-          e.vfmsub213sd(i.dest, src1, src3);
-        } else if (i.dest == i.src3) {
-          e.vfmsub231sd(i.dest, src1, src2);
-        } else {
-          // Dest not equal to anything
-          e.vmovsd(i.dest, src1);
-          e.vfmsub213sd(i.dest, src2, src3);
-        }
-      });
+      EmitCommutativeBinaryXmmOp(
+          e, i,
+          [&i](X64Emitter& e, const Xmm& dest, const Xmm& src1,
+               const Xmm& src2) {
+            Xmm src3 = i.src3.is_constant ? e.xmm1 : i.src3;
+            if (i.src3.is_constant) {
+              e.LoadConstantXmm(e.xmm1, i.src3.constant());
+            }
+            if (i.dest == src1) {
+              e.vfmsub213sd(i.dest, src2, src3);
+            } else if (i.dest == src2) {
+              e.vfmsub213sd(i.dest, src1, src3);
+            } else if (i.dest == i.src3) {
+              e.vfmsub231sd(i.dest, src1, src2);
+            } else {
+              // Dest not equal to anything
+              e.vmovsd(i.dest, src1);
+              e.vfmsub213sd(i.dest, src2, src3);
+            }
+          });
     } else {
       Xmm src3;
       if (i.src3.is_constant) {
@@ -4778,24 +4812,26 @@ struct MUL_SUB_V128
 
     // FMA extension
     if (e.IsFeatureEnabled(kX64EmitFMA)) {
-      EmitCommutativeBinaryXmmOp(e, i, [&i](X64Emitter& e, const Xmm& dest,
-                                            const Xmm& src1, const Xmm& src2) {
-        Xmm src3 = i.src3.is_constant ? e.xmm1 : i.src3;
-        if (i.src3.is_constant) {
-          e.LoadConstantXmm(e.xmm1, i.src3.constant());
-        }
-        if (i.dest == src1) {
-          e.vfmsub213ps(i.dest, src2, src3);
-        } else if (i.dest == src2) {
-          e.vfmsub213ps(i.dest, src1, src3);
-        } else if (i.dest == i.src3) {
-          e.vfmsub231ps(i.dest, src1, src2);
-        } else {
-          // Dest not equal to anything
-          e.vmovdqa(i.dest, src1);
-          e.vfmsub213ps(i.dest, src2, src3);
-        }
-      });
+      EmitCommutativeBinaryXmmOp(
+          e, i,
+          [&i](X64Emitter& e, const Xmm& dest, const Xmm& src1,
+               const Xmm& src2) {
+            Xmm src3 = i.src3.is_constant ? e.xmm1 : i.src3;
+            if (i.src3.is_constant) {
+              e.LoadConstantXmm(e.xmm1, i.src3.constant());
+            }
+            if (i.dest == src1) {
+              e.vfmsub213ps(i.dest, src2, src3);
+            } else if (i.dest == src2) {
+              e.vfmsub213ps(i.dest, src1, src3);
+            } else if (i.dest == i.src3) {
+              e.vfmsub231ps(i.dest, src1, src2);
+            } else {
+              // Dest not equal to anything
+              e.vmovdqa(i.dest, src1);
+              e.vfmsub213ps(i.dest, src2, src3);
+            }
+          });
     } else {
       Xmm src3;
       if (i.src3.is_constant) {
@@ -5098,8 +5134,10 @@ EMITTER_OPCODE_TABLE(OPCODE_DOT_PRODUCT_4, DOT_PRODUCT_4_V128);
 template <typename SEQ, typename REG, typename ARGS>
 void EmitAndXX(X64Emitter& e, const ARGS& i) {
   SEQ::EmitCommutativeBinaryOp(
-      e, i, [](X64Emitter& e, const REG& dest_src,
-               const REG& src) { e.and_(dest_src, src); },
+      e, i,
+      [](X64Emitter& e, const REG& dest_src, const REG& src) {
+        e.and_(dest_src, src);
+      },
       [](X64Emitter& e, const REG& dest_src, int32_t constant) {
         e.and_(dest_src, constant);
       });
@@ -5141,8 +5179,10 @@ EMITTER_OPCODE_TABLE(OPCODE_AND, AND_I8, AND_I16, AND_I32, AND_I64, AND_V128);
 template <typename SEQ, typename REG, typename ARGS>
 void EmitOrXX(X64Emitter& e, const ARGS& i) {
   SEQ::EmitCommutativeBinaryOp(
-      e, i, [](X64Emitter& e, const REG& dest_src,
-               const REG& src) { e.or_(dest_src, src); },
+      e, i,
+      [](X64Emitter& e, const REG& dest_src, const REG& src) {
+        e.or_(dest_src, src);
+      },
       [](X64Emitter& e, const REG& dest_src, int32_t constant) {
         e.or_(dest_src, constant);
       });
@@ -5184,8 +5224,10 @@ EMITTER_OPCODE_TABLE(OPCODE_OR, OR_I8, OR_I16, OR_I32, OR_I64, OR_V128);
 template <typename SEQ, typename REG, typename ARGS>
 void EmitXorXX(X64Emitter& e, const ARGS& i) {
   SEQ::EmitCommutativeBinaryOp(
-      e, i, [](X64Emitter& e, const REG& dest_src,
-               const REG& src) { e.xor_(dest_src, src); },
+      e, i,
+      [](X64Emitter& e, const REG& dest_src, const REG& src) {
+        e.xor_(dest_src, src);
+      },
       [](X64Emitter& e, const REG& dest_src, int32_t constant) {
         e.xor_(dest_src, constant);
       });
@@ -6209,57 +6251,59 @@ struct VECTOR_AVERAGE
     return _mm_load_si128(reinterpret_cast<__m128i*>(value));
   }
   static void Emit(X64Emitter& e, const EmitArgType& i) {
-    EmitCommutativeBinaryXmmOp(e, i, [&i](X64Emitter& e, const Xmm& dest,
-                                          const Xmm& src1, const Xmm& src2) {
-      const TypeName part_type = static_cast<TypeName>(i.instr->flags & 0xFF);
-      const uint32_t arithmetic_flags = i.instr->flags >> 8;
-      bool is_unsigned = !!(arithmetic_flags & ARITHMETIC_UNSIGNED);
-      switch (part_type) {
-        case INT8_TYPE:
-          if (is_unsigned) {
-            e.vpavgb(dest, src1, src2);
-          } else {
-            assert_always();
+    EmitCommutativeBinaryXmmOp(
+        e, i,
+        [&i](X64Emitter& e, const Xmm& dest, const Xmm& src1, const Xmm& src2) {
+          const TypeName part_type =
+              static_cast<TypeName>(i.instr->flags & 0xFF);
+          const uint32_t arithmetic_flags = i.instr->flags >> 8;
+          bool is_unsigned = !!(arithmetic_flags & ARITHMETIC_UNSIGNED);
+          switch (part_type) {
+            case INT8_TYPE:
+              if (is_unsigned) {
+                e.vpavgb(dest, src1, src2);
+              } else {
+                assert_always();
+              }
+              break;
+            case INT16_TYPE:
+              if (is_unsigned) {
+                e.vpavgw(dest, src1, src2);
+              } else {
+                assert_always();
+              }
+              break;
+            case INT32_TYPE:
+              // No 32bit averages in AVX.
+              if (is_unsigned) {
+                if (i.src2.is_constant) {
+                  e.LoadConstantXmm(e.xmm0, i.src2.constant());
+                  e.lea(e.r9, e.StashXmm(1, e.xmm0));
+                } else {
+                  e.lea(e.r9, e.StashXmm(1, i.src2));
+                }
+                e.lea(e.r8, e.StashXmm(0, i.src1));
+                e.CallNativeSafe(
+                    reinterpret_cast<void*>(EmulateVectorAverageUnsignedI32));
+                e.vmovaps(i.dest, e.xmm0);
+              } else {
+                if (i.src2.is_constant) {
+                  e.LoadConstantXmm(e.xmm0, i.src2.constant());
+                  e.lea(e.r9, e.StashXmm(1, e.xmm0));
+                } else {
+                  e.lea(e.r9, e.StashXmm(1, i.src2));
+                }
+                e.lea(e.r8, e.StashXmm(0, i.src1));
+                e.CallNativeSafe(
+                    reinterpret_cast<void*>(EmulateVectorAverageSignedI32));
+                e.vmovaps(i.dest, e.xmm0);
+              }
+              break;
+            default:
+              assert_unhandled_case(part_type);
+              break;
           }
-          break;
-        case INT16_TYPE:
-          if (is_unsigned) {
-            e.vpavgw(dest, src1, src2);
-          } else {
-            assert_always();
-          }
-          break;
-        case INT32_TYPE:
-          // No 32bit averages in AVX.
-          if (is_unsigned) {
-            if (i.src2.is_constant) {
-              e.LoadConstantXmm(e.xmm0, i.src2.constant());
-              e.lea(e.r9, e.StashXmm(1, e.xmm0));
-            } else {
-              e.lea(e.r9, e.StashXmm(1, i.src2));
-            }
-            e.lea(e.r8, e.StashXmm(0, i.src1));
-            e.CallNativeSafe(
-                reinterpret_cast<void*>(EmulateVectorAverageUnsignedI32));
-            e.vmovaps(i.dest, e.xmm0);
-          } else {
-            if (i.src2.is_constant) {
-              e.LoadConstantXmm(e.xmm0, i.src2.constant());
-              e.lea(e.r9, e.StashXmm(1, e.xmm0));
-            } else {
-              e.lea(e.r9, e.StashXmm(1, i.src2));
-            }
-            e.lea(e.r8, e.StashXmm(0, i.src1));
-            e.CallNativeSafe(
-                reinterpret_cast<void*>(EmulateVectorAverageSignedI32));
-            e.vmovaps(i.dest, e.xmm0);
-          }
-          break;
-        default:
-          assert_unhandled_case(part_type);
-          break;
-      }
-    });
+        });
   }
 };
 EMITTER_OPCODE_TABLE(OPCODE_VECTOR_AVERAGE, VECTOR_AVERAGE);

src/xenia/cpu/compiler/passes/data_flow_analysis_pass.cc

@@ -24,6 +24,7 @@
 #pragma warning(pop)
 #else
 #include <llvm/ADT/BitVector.h>
+#include <cmath>
 #endif  // XE_COMPILER_MSVC
 
 namespace xe {

src/xenia/cpu/compiler/passes/register_allocation_pass.cc

@@ -420,7 +420,7 @@ bool RegisterAllocationPass::SpillOneRegister(HIRBuilder* builder, Block* block,
   auto new_value = builder->LoadLocal(spill_value->local_slot);
   auto spill_load = builder->last_instr();
   spill_load->MoveBefore(next_use->instr);
-// Note: implicit first use added.
+  // Note: implicit first use added.
 
 #if ASSERT_NO_CYCLES
   builder->AssertNoCycles();

src/xenia/cpu/compiler/passes/value_reduction_pass.cc

@@ -23,6 +23,7 @@
 #pragma warning(pop)
 #else
 #include <llvm/ADT/BitVector.h>
+#include <cmath>
 #endif  // XE_COMPILER_MSVC
 
 namespace xe {

src/xenia/cpu/hir/hir_builder.cc

@@ -1963,7 +1963,10 @@ Value* HIRBuilder::CountLeadingZeros(Value* value) {
 
   if (value->IsConstantZero()) {
     static const uint8_t zeros[] = {
-        8, 16, 32, 64,
+        8,
+        16,
+        32,
+        64,
     };
     assert_true(value->type <= INT64_TYPE);
     return LoadConstantUint8(zeros[value->type]);

src/xenia/cpu/hir/opcodes.cc

@@ -15,7 +15,10 @@ namespace hir {
 
 #define DEFINE_OPCODE(num, name, sig, flags) \
   const OpcodeInfo num##_info = {            \
-      flags, sig, name, num,                 \
+      flags,                                 \
+      sig,                                   \
+      name,                                  \
+      num,                                   \
   };
 #include "xenia/cpu/hir/opcodes.inl"
 #undef DEFINE_OPCODE

src/xenia/cpu/hir/opcodes.h

@@ -87,8 +87,7 @@ enum PackType : uint16_t {
   PACK_TYPE_16_IN_32 = 7,
 
   PACK_TYPE_MODE = 0x000F,  // just to get the mode
-
-  // Unpack to low or high parts.
+                            // Unpack to low or high parts.
   PACK_TYPE_TO_LO = 0 << 12,
   PACK_TYPE_TO_HI = 1 << 12,
 

src/xenia/cpu/mmio_handler.cc

@@ -52,7 +52,12 @@ bool MMIOHandler::RegisterRange(uint32_t virtual_address, uint32_t mask,
                                 MMIOReadCallback read_callback,
                                 MMIOWriteCallback write_callback) {
   mapped_ranges_.push_back({
-      virtual_address, mask, size, context, read_callback, write_callback,
+      virtual_address,
+      mask,
+      size,
+      context,
+      read_callback,
+      write_callback,
   });
   return true;
 }

src/xenia/cpu/ppc/ppc_emit_altivec.cc

@@ -2073,7 +2073,7 @@ int InstrEmit_vpkd3d128(PPCHIRBuilder& f, const InstrData& i) {
   uint32_t control = kIdentityPermuteMask;  // original
   switch (pack) {
     case 1:  // VPACK_32
-      // VPACK_32 & shift = 3 puts lower 32 bits in x (leftmost slot).
+             // VPACK_32 & shift = 3 puts lower 32 bits in x (leftmost slot).
       switch (shift) {
         case 0:
           control = MakePermuteMask(0, 0, 0, 1, 0, 2, 1, 3);

src/xenia/cpu/ppc/ppc_emit_control.cc

@@ -143,7 +143,7 @@ int InstrEmit_branch(PPCHIRBuilder& f, const char* src, uint64_t cia,
 }
 
 return 0;
-}
+}  // namespace ppc
 
 int InstrEmit_bx(PPCHIRBuilder& f, const InstrData& i) {
   // if AA then
@@ -799,6 +799,6 @@ void RegisterEmitCategoryControl() {
   XEREGISTERINSTR(mtmsrd);
 }
 
-}  // namespace ppc
 }  // namespace cpu
 }  // namespace xe
+}  // namespace xe

src/xenia/cpu/ppc/ppc_scanner.cc

@@ -341,14 +341,16 @@ std::vector<BlockInfo> PPCScanner::FindBlocks(GuestFunction* function) {
     if (ends_block) {
       in_block = false;
       block_map[block_start] = {
-          block_start, address,
+          block_start,
+          address,
       };
     }
   }
 
   if (in_block) {
     block_map[block_start] = {
-        block_start, end_address,
+        block_start,
+        end_address,
     };
   }
 

src/xenia/cpu/testing/add_test.cc

@@ -18,9 +18,10 @@ using xe::cpu::ppc::PPCContext;
 
 TEST_CASE("ADD_I8", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreGPR(b, 3, b.ZeroExtend(b.Add(b.Truncate(LoadGPR(b, 4), INT8_TYPE),
-                                      b.Truncate(LoadGPR(b, 5), INT8_TYPE)),
-                                INT64_TYPE));
+    StoreGPR(b, 3,
+             b.ZeroExtend(b.Add(b.Truncate(LoadGPR(b, 4), INT8_TYPE),
+                                b.Truncate(LoadGPR(b, 5), INT8_TYPE)),
+                          INT64_TYPE));
     b.Return();
   });
   test.Run(
@@ -90,9 +91,10 @@ TEST_CASE("ADD_I8", "[instr]") {
 
 TEST_CASE("ADD_I16", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreGPR(b, 3, b.ZeroExtend(b.Add(b.Truncate(LoadGPR(b, 4), INT16_TYPE),
-                                      b.Truncate(LoadGPR(b, 5), INT16_TYPE)),
-                                INT64_TYPE));
+    StoreGPR(b, 3,
+             b.ZeroExtend(b.Add(b.Truncate(LoadGPR(b, 4), INT16_TYPE),
+                                b.Truncate(LoadGPR(b, 5), INT16_TYPE)),
+                          INT64_TYPE));
     b.Return();
   });
   test.Run(
@@ -162,9 +164,10 @@ TEST_CASE("ADD_I16", "[instr]") {
 
 TEST_CASE("ADD_I32", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreGPR(b, 3, b.ZeroExtend(b.Add(b.Truncate(LoadGPR(b, 4), INT32_TYPE),
-                                      b.Truncate(LoadGPR(b, 5), INT32_TYPE)),
-                                INT64_TYPE));
+    StoreGPR(b, 3,
+             b.ZeroExtend(b.Add(b.Truncate(LoadGPR(b, 4), INT32_TYPE),
+                                b.Truncate(LoadGPR(b, 5), INT32_TYPE)),
+                          INT64_TYPE));
     b.Return();
   });
   test.Run(
@@ -304,9 +307,10 @@ TEST_CASE("ADD_I64", "[instr]") {
 
 TEST_CASE("ADD_F32", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreFPR(b, 3, b.Convert(b.Add(b.Convert(LoadFPR(b, 4), FLOAT32_TYPE),
-                                   b.Convert(LoadFPR(b, 5), FLOAT32_TYPE)),
-                             FLOAT64_TYPE));
+    StoreFPR(b, 3,
+             b.Convert(b.Add(b.Convert(LoadFPR(b, 4), FLOAT32_TYPE),
+                             b.Convert(LoadFPR(b, 5), FLOAT32_TYPE)),
+                       FLOAT64_TYPE));
     b.Return();
   });
   test.Run(

src/xenia/cpu/testing/extract_test.cc

@@ -19,10 +19,11 @@ using xe::cpu::ppc::PPCContext;
 
 TEST_CASE("EXTRACT_INT8", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreGPR(b, 3, b.ZeroExtend(b.Extract(LoadVR(b, 4),
-                                          b.Truncate(LoadGPR(b, 4), INT8_TYPE),
-                                          INT8_TYPE),
-                                INT64_TYPE));
+    StoreGPR(
+        b, 3,
+        b.ZeroExtend(b.Extract(LoadVR(b, 4),
+                               b.Truncate(LoadGPR(b, 4), INT8_TYPE), INT8_TYPE),
+                     INT64_TYPE));
     b.Return();
   });
   for (int i = 0; i < 16; ++i) {
@@ -42,9 +43,10 @@ TEST_CASE("EXTRACT_INT8", "[instr]") {
 TEST_CASE("EXTRACT_INT8_CONSTANT", "[instr]") {
   for (int i = 0; i < 16; ++i) {
     TestFunction([i](HIRBuilder& b) {
-      StoreGPR(b, 3, b.ZeroExtend(b.Extract(LoadVR(b, 4), b.LoadConstantInt8(i),
-                                            INT8_TYPE),
-                                  INT64_TYPE));
+      StoreGPR(b, 3,
+               b.ZeroExtend(
+                   b.Extract(LoadVR(b, 4), b.LoadConstantInt8(i), INT8_TYPE),
+                   INT64_TYPE));
       b.Return();
     })
         .Run(
@@ -62,10 +64,11 @@ TEST_CASE("EXTRACT_INT8_CONSTANT", "[instr]") {
 
 TEST_CASE("EXTRACT_INT16", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreGPR(b, 3, b.ZeroExtend(b.Extract(LoadVR(b, 4),
-                                          b.Truncate(LoadGPR(b, 4), INT8_TYPE),
-                                          INT16_TYPE),
-                                INT64_TYPE));
+    StoreGPR(b, 3,
+             b.ZeroExtend(
+                 b.Extract(LoadVR(b, 4), b.Truncate(LoadGPR(b, 4), INT8_TYPE),
+                           INT16_TYPE),
+                 INT64_TYPE));
     b.Return();
   });
   for (int i = 0; i < 8; ++i) {
@@ -85,9 +88,10 @@ TEST_CASE("EXTRACT_INT16", "[instr]") {
 TEST_CASE("EXTRACT_INT16_CONSTANT", "[instr]") {
   for (int i = 0; i < 8; ++i) {
     TestFunction([i](HIRBuilder& b) {
-      StoreGPR(b, 3, b.ZeroExtend(b.Extract(LoadVR(b, 4), b.LoadConstantInt8(i),
-                                            INT16_TYPE),
-                                  INT64_TYPE));
+      StoreGPR(b, 3,
+               b.ZeroExtend(
+                   b.Extract(LoadVR(b, 4), b.LoadConstantInt8(i), INT16_TYPE),
+                   INT64_TYPE));
       b.Return();
     })
         .Run(
@@ -104,10 +108,11 @@ TEST_CASE("EXTRACT_INT16_CONSTANT", "[instr]") {
 
 TEST_CASE("EXTRACT_INT32", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreGPR(b, 3, b.ZeroExtend(b.Extract(LoadVR(b, 4),
-                                          b.Truncate(LoadGPR(b, 4), INT8_TYPE),
-                                          INT32_TYPE),
-                                INT64_TYPE));
+    StoreGPR(b, 3,
+             b.ZeroExtend(
+                 b.Extract(LoadVR(b, 4), b.Truncate(LoadGPR(b, 4), INT8_TYPE),
+                           INT32_TYPE),
+                 INT64_TYPE));
     b.Return();
   });
   for (int i = 0; i < 4; ++i) {
@@ -126,9 +131,10 @@ TEST_CASE("EXTRACT_INT32", "[instr]") {
 TEST_CASE("EXTRACT_INT32_CONSTANT", "[instr]") {
   for (int i = 0; i < 4; ++i) {
     TestFunction([i](HIRBuilder& b) {
-      StoreGPR(b, 3, b.ZeroExtend(b.Extract(LoadVR(b, 4), b.LoadConstantInt8(i),
-                                            INT32_TYPE),
-                                  INT64_TYPE));
+      StoreGPR(b, 3,
+               b.ZeroExtend(
+                   b.Extract(LoadVR(b, 4), b.LoadConstantInt8(i), INT32_TYPE),
+                   INT64_TYPE));
       b.Return();
     })
         .Run(

src/xenia/cpu/testing/insert_test.cc

@@ -20,8 +20,9 @@ using xe::cpu::ppc::PPCContext;
 TEST_CASE("INSERT_INT8", "[instr]") {
   for (int i = 0; i < 16; ++i) {
     TestFunction test([i](HIRBuilder& b) {
-      StoreVR(b, 3, b.Insert(LoadVR(b, 4), b.LoadConstantInt32(i),
-                             b.Truncate(LoadGPR(b, 5), INT8_TYPE)));
+      StoreVR(b, 3,
+              b.Insert(LoadVR(b, 4), b.LoadConstantInt32(i),
+                       b.Truncate(LoadGPR(b, 5), INT8_TYPE)));
       b.Return();
     });
     test.Run(
@@ -44,8 +45,9 @@ TEST_CASE("INSERT_INT8", "[instr]") {
 TEST_CASE("INSERT_INT16", "[instr]") {
   for (int i = 0; i < 8; ++i) {
     TestFunction test([i](HIRBuilder& b) {
-      StoreVR(b, 3, b.Insert(LoadVR(b, 4), b.LoadConstantInt32(i),
-                             b.Truncate(LoadGPR(b, 5), INT16_TYPE)));
+      StoreVR(b, 3,
+              b.Insert(LoadVR(b, 4), b.LoadConstantInt32(i),
+                       b.Truncate(LoadGPR(b, 5), INT16_TYPE)));
       b.Return();
     });
     test.Run(
@@ -66,8 +68,9 @@ TEST_CASE("INSERT_INT16", "[instr]") {
 TEST_CASE("INSERT_INT32", "[instr]") {
   for (int i = 0; i < 4; ++i) {
     TestFunction test([i](HIRBuilder& b) {
-      StoreVR(b, 3, b.Insert(LoadVR(b, 4), b.LoadConstantInt32(i),
-                             b.Truncate(LoadGPR(b, 5), INT32_TYPE)));
+      StoreVR(b, 3,
+              b.Insert(LoadVR(b, 4), b.LoadConstantInt32(i),
+                       b.Truncate(LoadGPR(b, 5), INT32_TYPE)));
       b.Return();
     });
     test.Run(

src/xenia/cpu/testing/permute_test.cc

@@ -19,8 +19,9 @@ TEST_CASE("PERMUTE_V128_BY_INT32_CONSTANT", "[instr]") {
   {
     uint32_t mask = MakePermuteMask(0, 0, 0, 1, 0, 2, 0, 3);
     TestFunction([mask](HIRBuilder& b) {
-      StoreVR(b, 3, b.Permute(b.LoadConstantUint32(mask), LoadVR(b, 4),
-                              LoadVR(b, 5), INT32_TYPE));
+      StoreVR(b, 3,
+              b.Permute(b.LoadConstantUint32(mask), LoadVR(b, 4), LoadVR(b, 5),
+                        INT32_TYPE));
       b.Return();
     })
         .Run(
@@ -36,8 +37,9 @@ TEST_CASE("PERMUTE_V128_BY_INT32_CONSTANT", "[instr]") {
   {
     uint32_t mask = MakePermuteMask(1, 0, 1, 1, 1, 2, 1, 3);
     TestFunction([mask](HIRBuilder& b) {
-      StoreVR(b, 3, b.Permute(b.LoadConstantUint32(mask), LoadVR(b, 4),
-                              LoadVR(b, 5), INT32_TYPE));
+      StoreVR(b, 3,
+              b.Permute(b.LoadConstantUint32(mask), LoadVR(b, 4), LoadVR(b, 5),
+                        INT32_TYPE));
       b.Return();
     })
         .Run(
@@ -53,8 +55,9 @@ TEST_CASE("PERMUTE_V128_BY_INT32_CONSTANT", "[instr]") {
   {
     uint32_t mask = MakePermuteMask(0, 3, 0, 2, 0, 1, 0, 0);
     TestFunction([mask](HIRBuilder& b) {
-      StoreVR(b, 3, b.Permute(b.LoadConstantUint32(mask), LoadVR(b, 4),
-                              LoadVR(b, 5), INT32_TYPE));
+      StoreVR(b, 3,
+              b.Permute(b.LoadConstantUint32(mask), LoadVR(b, 4), LoadVR(b, 5),
+                        INT32_TYPE));
       b.Return();
     })
         .Run(
@@ -70,8 +73,9 @@ TEST_CASE("PERMUTE_V128_BY_INT32_CONSTANT", "[instr]") {
   {
     uint32_t mask = MakePermuteMask(1, 3, 1, 2, 1, 1, 1, 0);
     TestFunction([mask](HIRBuilder& b) {
-      StoreVR(b, 3, b.Permute(b.LoadConstantUint32(mask), LoadVR(b, 4),
-                              LoadVR(b, 5), INT32_TYPE));
+      StoreVR(b, 3,
+              b.Permute(b.LoadConstantUint32(mask), LoadVR(b, 4), LoadVR(b, 5),
+                        INT32_TYPE));
       b.Return();
     })
         .Run(

src/xenia/cpu/testing/sandbox_main.cc

@@ -20,8 +20,8 @@ namespace xe {
 namespace cpu {
 namespace sandbox {
 
-using xe::cpu::ppc::PPCContext;
 using xe::cpu::Runtime;
+using xe::cpu::ppc::PPCContext;
 
 // TODO(benvanik): simple memory? move more into core?
 

src/xenia/cpu/testing/sha_test.cc

@@ -16,9 +16,10 @@ using xe::cpu::ppc::PPCContext;
 
 TEST_CASE("SHA_I8", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreGPR(b, 3, b.ZeroExtend(b.Sha(b.Truncate(LoadGPR(b, 4), INT8_TYPE),
-                                      b.Truncate(LoadGPR(b, 5), INT8_TYPE)),
-                                INT64_TYPE));
+    StoreGPR(b, 3,
+             b.ZeroExtend(b.Sha(b.Truncate(LoadGPR(b, 4), INT8_TYPE),
+                                b.Truncate(LoadGPR(b, 5), INT8_TYPE)),
+                          INT64_TYPE));
     b.Return();
   });
   test.Run(
@@ -70,9 +71,10 @@ TEST_CASE("SHA_I8", "[instr]") {
 
 TEST_CASE("SHA_I16", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreGPR(b, 3, b.ZeroExtend(b.Sha(b.Truncate(LoadGPR(b, 4), INT16_TYPE),
-                                      b.Truncate(LoadGPR(b, 5), INT8_TYPE)),
-                                INT64_TYPE));
+    StoreGPR(b, 3,
+             b.ZeroExtend(b.Sha(b.Truncate(LoadGPR(b, 4), INT16_TYPE),
+                                b.Truncate(LoadGPR(b, 5), INT8_TYPE)),
+                          INT64_TYPE));
     b.Return();
   });
   test.Run(
@@ -124,9 +126,10 @@ TEST_CASE("SHA_I16", "[instr]") {
 
 TEST_CASE("SHA_I32", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreGPR(b, 3, b.ZeroExtend(b.Sha(b.Truncate(LoadGPR(b, 4), INT32_TYPE),
-                                      b.Truncate(LoadGPR(b, 5), INT8_TYPE)),
-                                INT64_TYPE));
+    StoreGPR(b, 3,
+             b.ZeroExtend(b.Sha(b.Truncate(LoadGPR(b, 4), INT32_TYPE),
+                                b.Truncate(LoadGPR(b, 5), INT8_TYPE)),
+                          INT64_TYPE));
     b.Return();
   });
   test.Run(
@@ -178,8 +181,9 @@ TEST_CASE("SHA_I32", "[instr]") {
 
 TEST_CASE("SHA_I64", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreGPR(b, 3, b.Sha(b.Truncate(LoadGPR(b, 4), INT64_TYPE),
-                         b.Truncate(LoadGPR(b, 5), INT8_TYPE)));
+    StoreGPR(b, 3,
+             b.Sha(b.Truncate(LoadGPR(b, 4), INT64_TYPE),
+                   b.Truncate(LoadGPR(b, 5), INT8_TYPE)));
     b.Return();
   });
   test.Run(

src/xenia/cpu/testing/shl_test.cc

@@ -16,9 +16,10 @@ using xe::cpu::ppc::PPCContext;
 
 TEST_CASE("SHL_I8", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreGPR(b, 3, b.ZeroExtend(b.Shl(b.Truncate(LoadGPR(b, 4), INT8_TYPE),
-                                      b.Truncate(LoadGPR(b, 5), INT8_TYPE)),
-                                INT64_TYPE));
+    StoreGPR(b, 3,
+             b.ZeroExtend(b.Shl(b.Truncate(LoadGPR(b, 4), INT8_TYPE),
+                                b.Truncate(LoadGPR(b, 5), INT8_TYPE)),
+                          INT64_TYPE));
     b.Return();
   });
   test.Run(
@@ -70,9 +71,10 @@ TEST_CASE("SHL_I8", "[instr]") {
 
 TEST_CASE("SHL_I16", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreGPR(b, 3, b.ZeroExtend(b.Shl(b.Truncate(LoadGPR(b, 4), INT16_TYPE),
-                                      b.Truncate(LoadGPR(b, 5), INT8_TYPE)),
-                                INT64_TYPE));
+    StoreGPR(b, 3,
+             b.ZeroExtend(b.Shl(b.Truncate(LoadGPR(b, 4), INT16_TYPE),
+                                b.Truncate(LoadGPR(b, 5), INT8_TYPE)),
+                          INT64_TYPE));
     b.Return();
   });
   test.Run(
@@ -124,9 +126,10 @@ TEST_CASE("SHL_I16", "[instr]") {
 
 TEST_CASE("SHL_I32", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreGPR(b, 3, b.ZeroExtend(b.Shl(b.Truncate(LoadGPR(b, 4), INT32_TYPE),
-                                      b.Truncate(LoadGPR(b, 5), INT8_TYPE)),
-                                INT64_TYPE));
+    StoreGPR(b, 3,
+             b.ZeroExtend(b.Shl(b.Truncate(LoadGPR(b, 4), INT32_TYPE),
+                                b.Truncate(LoadGPR(b, 5), INT8_TYPE)),
+                          INT64_TYPE));
     b.Return();
   });
   test.Run(
@@ -178,8 +181,9 @@ TEST_CASE("SHL_I32", "[instr]") {
 
 TEST_CASE("SHL_I64", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreGPR(b, 3, b.Shl(b.Truncate(LoadGPR(b, 4), INT64_TYPE),
-                         b.Truncate(LoadGPR(b, 5), INT8_TYPE)));
+    StoreGPR(b, 3,
+             b.Shl(b.Truncate(LoadGPR(b, 4), INT64_TYPE),
+                   b.Truncate(LoadGPR(b, 5), INT8_TYPE)));
     b.Return();
   });
   test.Run(

src/xenia/cpu/testing/shr_test.cc

@@ -17,9 +17,10 @@ using xe::cpu::ppc::PPCContext;
 
 TEST_CASE("SHR_I8", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreGPR(b, 3, b.ZeroExtend(b.Shr(b.Truncate(LoadGPR(b, 4), INT8_TYPE),
-                                      b.Truncate(LoadGPR(b, 5), INT8_TYPE)),
-                                INT64_TYPE));
+    StoreGPR(b, 3,
+             b.ZeroExtend(b.Shr(b.Truncate(LoadGPR(b, 4), INT8_TYPE),
+                                b.Truncate(LoadGPR(b, 5), INT8_TYPE)),
+                          INT64_TYPE));
     b.Return();
   });
   test.Run(
@@ -71,9 +72,10 @@ TEST_CASE("SHR_I8", "[instr]") {
 
 TEST_CASE("SHR_I16", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreGPR(b, 3, b.ZeroExtend(b.Shr(b.Truncate(LoadGPR(b, 4), INT16_TYPE),
-                                      b.Truncate(LoadGPR(b, 5), INT8_TYPE)),
-                                INT64_TYPE));
+    StoreGPR(b, 3,
+             b.ZeroExtend(b.Shr(b.Truncate(LoadGPR(b, 4), INT16_TYPE),
+                                b.Truncate(LoadGPR(b, 5), INT8_TYPE)),
+                          INT64_TYPE));
     b.Return();
   });
   test.Run(
@@ -125,9 +127,10 @@ TEST_CASE("SHR_I16", "[instr]") {
 
 TEST_CASE("SHR_I32", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreGPR(b, 3, b.ZeroExtend(b.Shr(b.Truncate(LoadGPR(b, 4), INT32_TYPE),
-                                      b.Truncate(LoadGPR(b, 5), INT8_TYPE)),
-                                INT64_TYPE));
+    StoreGPR(b, 3,
+             b.ZeroExtend(b.Shr(b.Truncate(LoadGPR(b, 4), INT32_TYPE),
+                                b.Truncate(LoadGPR(b, 5), INT8_TYPE)),
+                          INT64_TYPE));
     b.Return();
   });
   test.Run(
@@ -179,8 +182,9 @@ TEST_CASE("SHR_I32", "[instr]") {
 
 TEST_CASE("SHR_I64", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreGPR(b, 3, b.Shr(b.Truncate(LoadGPR(b, 4), INT64_TYPE),
-                         b.Truncate(LoadGPR(b, 5), INT8_TYPE)));
+    StoreGPR(b, 3,
+             b.Shr(b.Truncate(LoadGPR(b, 4), INT64_TYPE),
+                   b.Truncate(LoadGPR(b, 5), INT8_TYPE)));
     b.Return();
   });
   test.Run(

src/xenia/cpu/testing/vector_add_test.cc

@@ -47,8 +47,9 @@ TEST_CASE("VECTOR_ADD_I8", "[instr]") {
 
 TEST_CASE("VECTOR_ADD_I8_SAT_SIGNED", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreVR(b, 3, b.VectorAdd(LoadVR(b, 4), LoadVR(b, 5), INT8_TYPE,
-                              ARITHMETIC_SATURATE));
+    StoreVR(b, 3,
+            b.VectorAdd(LoadVR(b, 4), LoadVR(b, 5), INT8_TYPE,
+                        ARITHMETIC_SATURATE));
     b.Return();
   });
   test.Run(
@@ -73,8 +74,9 @@ TEST_CASE("VECTOR_ADD_I8_SAT_SIGNED", "[instr]") {
 
 TEST_CASE("VECTOR_ADD_I8_SAT_UNSIGNED", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreVR(b, 3, b.VectorAdd(LoadVR(b, 4), LoadVR(b, 5), INT8_TYPE,
-                              ARITHMETIC_SATURATE | ARITHMETIC_UNSIGNED));
+    StoreVR(b, 3,
+            b.VectorAdd(LoadVR(b, 4), LoadVR(b, 5), INT8_TYPE,
+                        ARITHMETIC_SATURATE | ARITHMETIC_UNSIGNED));
     b.Return();
   });
   test.Run(
@@ -124,8 +126,9 @@ TEST_CASE("VECTOR_ADD_I16", "[instr]") {
 
 TEST_CASE("VECTOR_ADD_I16_SAT_SIGNED", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreVR(b, 3, b.VectorAdd(LoadVR(b, 4), LoadVR(b, 5), INT16_TYPE,
-                              ARITHMETIC_SATURATE));
+    StoreVR(b, 3,
+            b.VectorAdd(LoadVR(b, 4), LoadVR(b, 5), INT16_TYPE,
+                        ARITHMETIC_SATURATE));
     b.Return();
   });
   test.Run(
@@ -150,8 +153,9 @@ TEST_CASE("VECTOR_ADD_I16_SAT_SIGNED", "[instr]") {
 
 TEST_CASE("VECTOR_ADD_I16_SAT_UNSIGNED", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreVR(b, 3, b.VectorAdd(LoadVR(b, 4), LoadVR(b, 5), INT16_TYPE,
-                              ARITHMETIC_SATURATE | ARITHMETIC_UNSIGNED));
+    StoreVR(b, 3,
+            b.VectorAdd(LoadVR(b, 4), LoadVR(b, 5), INT16_TYPE,
+                        ARITHMETIC_SATURATE | ARITHMETIC_UNSIGNED));
     b.Return();
   });
   test.Run(
@@ -201,8 +205,9 @@ TEST_CASE("VECTOR_ADD_I32", "[instr]") {
 
 TEST_CASE("VECTOR_ADD_I32_SAT_SIGNED", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreVR(b, 3, b.VectorAdd(LoadVR(b, 4), LoadVR(b, 5), INT32_TYPE,
-                              ARITHMETIC_SATURATE));
+    StoreVR(b, 3,
+            b.VectorAdd(LoadVR(b, 4), LoadVR(b, 5), INT32_TYPE,
+                        ARITHMETIC_SATURATE));
     b.Return();
   });
   test.Run(
@@ -236,8 +241,9 @@ TEST_CASE("VECTOR_ADD_I32_SAT_SIGNED", "[instr]") {
 
 TEST_CASE("VECTOR_ADD_I32_SAT_UNSIGNED", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreVR(b, 3, b.VectorAdd(LoadVR(b, 4), LoadVR(b, 5), INT32_TYPE,
-                              ARITHMETIC_SATURATE | ARITHMETIC_UNSIGNED));
+    StoreVR(b, 3,
+            b.VectorAdd(LoadVR(b, 4), LoadVR(b, 5), INT32_TYPE,
+                        ARITHMETIC_SATURATE | ARITHMETIC_UNSIGNED));
     b.Return();
   });
   test.Run(

src/xenia/cpu/testing/vector_max_test.cc

@@ -39,8 +39,9 @@ TEST_CASE("VECTOR_MAX_I8_SIGNED", "[instr]") {
 
 TEST_CASE("VECTOR_MAX_I8_UNSIGNED", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreVR(b, 3, b.VectorMax(LoadVR(b, 4), LoadVR(b, 5), INT8_TYPE,
-                              ARITHMETIC_UNSIGNED));
+    StoreVR(b, 3,
+            b.VectorMax(LoadVR(b, 4), LoadVR(b, 5), INT8_TYPE,
+                        ARITHMETIC_UNSIGNED));
     b.Return();
   });
   test.Run(
@@ -75,8 +76,9 @@ TEST_CASE("VECTOR_MAX_I16_SIGNED", "[instr]") {
 
 TEST_CASE("VECTOR_MAX_I16_UNSIGNED", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreVR(b, 3, b.VectorMax(LoadVR(b, 4), LoadVR(b, 5), INT16_TYPE,
-                              ARITHMETIC_UNSIGNED));
+    StoreVR(b, 3,
+            b.VectorMax(LoadVR(b, 4), LoadVR(b, 5), INT16_TYPE,
+                        ARITHMETIC_UNSIGNED));
     b.Return();
   });
   test.Run(
@@ -108,8 +110,9 @@ TEST_CASE("VECTOR_MAX_I32_SIGNED", "[instr]") {
 
 TEST_CASE("VECTOR_MAX_I32_UNSIGNED", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreVR(b, 3, b.VectorMax(LoadVR(b, 4), LoadVR(b, 5), INT32_TYPE,
-                              ARITHMETIC_UNSIGNED));
+    StoreVR(b, 3,
+            b.VectorMax(LoadVR(b, 4), LoadVR(b, 5), INT32_TYPE,
+                        ARITHMETIC_UNSIGNED));
     b.Return();
   });
   test.Run(

src/xenia/cpu/testing/vector_min_test.cc

@@ -39,8 +39,9 @@ TEST_CASE("VECTOR_MIN_I8_SIGNED", "[instr]") {
 
 TEST_CASE("VECTOR_MIN_I8_UNSIGNED", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreVR(b, 3, b.VectorMin(LoadVR(b, 4), LoadVR(b, 5), INT8_TYPE,
-                              ARITHMETIC_UNSIGNED));
+    StoreVR(b, 3,
+            b.VectorMin(LoadVR(b, 4), LoadVR(b, 5), INT8_TYPE,
+                        ARITHMETIC_UNSIGNED));
     b.Return();
   });
   test.Run(
@@ -75,8 +76,9 @@ TEST_CASE("VECTOR_MIN_I16_SIGNED", "[instr]") {
 
 TEST_CASE("VECTOR_MIN_I16_UNSIGNED", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreVR(b, 3, b.VectorMin(LoadVR(b, 4), LoadVR(b, 5), INT16_TYPE,
-                              ARITHMETIC_UNSIGNED));
+    StoreVR(b, 3,
+            b.VectorMin(LoadVR(b, 4), LoadVR(b, 5), INT16_TYPE,
+                        ARITHMETIC_UNSIGNED));
     b.Return();
   });
   test.Run(
@@ -108,8 +110,9 @@ TEST_CASE("VECTOR_MIN_I32_SIGNED", "[instr]") {
 
 TEST_CASE("VECTOR_MIN_I32_UNSIGNED", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreVR(b, 3, b.VectorMin(LoadVR(b, 4), LoadVR(b, 5), INT32_TYPE,
-                              ARITHMETIC_UNSIGNED));
+    StoreVR(b, 3,
+            b.VectorMin(LoadVR(b, 4), LoadVR(b, 5), INT32_TYPE,
+                        ARITHMETIC_UNSIGNED));
     b.Return();
   });
   test.Run(

src/xenia/cpu/testing/vector_sha_test.cc

@@ -37,10 +37,12 @@ TEST_CASE("VECTOR_SHA_I8", "[instr]") {
 
 TEST_CASE("VECTOR_SHA_I8_CONSTANT", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreVR(b, 3, b.VectorSha(LoadVR(b, 4), b.LoadConstantVec128(vec128b(
-                                                0, 1, 2, 8, 4, 4, 6, 7, 8, 9,
-                                                10, 11, 12, 13, 14, 15)),
-                              INT8_TYPE));
+    StoreVR(
+        b, 3,
+        b.VectorSha(LoadVR(b, 4),
+                    b.LoadConstantVec128(vec128b(0, 1, 2, 8, 4, 4, 6, 7, 8, 9,
+                                                 10, 11, 12, 13, 14, 15)),
+                    INT8_TYPE));
     b.Return();
   });
   test.Run(
@@ -76,9 +78,11 @@ TEST_CASE("VECTOR_SHA_I16", "[instr]") {
 
 TEST_CASE("VECTOR_SHA_I16_CONSTANT", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreVR(b, 3, b.VectorSha(LoadVR(b, 4), b.LoadConstantVec128(vec128s(
-                                                0, 1, 8, 15, 15, 8, 1, 16)),
-                              INT16_TYPE));
+    StoreVR(
+        b, 3,
+        b.VectorSha(LoadVR(b, 4),
+                    b.LoadConstantVec128(vec128s(0, 1, 8, 15, 15, 8, 1, 16)),
+                    INT16_TYPE));
     b.Return();
   });
   test.Run(
@@ -122,12 +126,14 @@ TEST_CASE("VECTOR_SHA_I32", "[instr]") {
 
 TEST_CASE("VECTOR_SHA_I32_CONSTANT", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreVR(b, 3, b.VectorSha(LoadVR(b, 4),
-                              b.LoadConstantVec128(vec128i(0, 1, 16, 31)),
-                              INT32_TYPE));
-    StoreVR(b, 4, b.VectorSha(LoadVR(b, 5),
-                              b.LoadConstantVec128(vec128i(31, 16, 1, 32)),
-                              INT32_TYPE));
+    StoreVR(
+        b, 3,
+        b.VectorSha(LoadVR(b, 4), b.LoadConstantVec128(vec128i(0, 1, 16, 31)),
+                    INT32_TYPE));
+    StoreVR(
+        b, 4,
+        b.VectorSha(LoadVR(b, 5), b.LoadConstantVec128(vec128i(31, 16, 1, 32)),
+                    INT32_TYPE));
     b.Return();
   });
   test.Run(

src/xenia/cpu/testing/vector_shl_test.cc

@@ -37,10 +37,12 @@ TEST_CASE("VECTOR_SHL_I8", "[instr]") {
 
 TEST_CASE("VECTOR_SHL_I8_CONSTANT", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreVR(b, 3, b.VectorShl(LoadVR(b, 4), b.LoadConstantVec128(vec128b(
-                                                0, 1, 2, 8, 4, 4, 6, 7, 8, 9,
-                                                10, 11, 12, 13, 14, 15)),
-                              INT8_TYPE));
+    StoreVR(
+        b, 3,
+        b.VectorShl(LoadVR(b, 4),
+                    b.LoadConstantVec128(vec128b(0, 1, 2, 8, 4, 4, 6, 7, 8, 9,
+                                                 10, 11, 12, 13, 14, 15)),
+                    INT8_TYPE));
     b.Return();
   });
   test.Run(
@@ -76,9 +78,11 @@ TEST_CASE("VECTOR_SHL_I16", "[instr]") {
 
 TEST_CASE("VECTOR_SHL_I16_CONSTANT", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreVR(b, 3, b.VectorShl(LoadVR(b, 4), b.LoadConstantVec128(vec128s(
-                                                0, 1, 8, 15, 15, 8, 1, 16)),
-                              INT16_TYPE));
+    StoreVR(
+        b, 3,
+        b.VectorShl(LoadVR(b, 4),
+                    b.LoadConstantVec128(vec128s(0, 1, 8, 15, 15, 8, 1, 16)),
+                    INT16_TYPE));
     b.Return();
   });
   test.Run(
@@ -122,12 +126,14 @@ TEST_CASE("VECTOR_SHL_I32", "[instr]") {
 
 TEST_CASE("VECTOR_SHL_I32_CONSTANT", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreVR(b, 3, b.VectorShl(LoadVR(b, 4),
-                              b.LoadConstantVec128(vec128i(0, 1, 16, 31)),
-                              INT32_TYPE));
-    StoreVR(b, 4, b.VectorShl(LoadVR(b, 5),
-                              b.LoadConstantVec128(vec128i(31, 16, 1, 32)),
-                              INT32_TYPE));
+    StoreVR(
+        b, 3,
+        b.VectorShl(LoadVR(b, 4), b.LoadConstantVec128(vec128i(0, 1, 16, 31)),
+                    INT32_TYPE));
+    StoreVR(
+        b, 4,
+        b.VectorShl(LoadVR(b, 5), b.LoadConstantVec128(vec128i(31, 16, 1, 32)),
+                    INT32_TYPE));
     b.Return();
   });
   test.Run(

src/xenia/cpu/testing/vector_shr_test.cc

@@ -37,10 +37,12 @@ TEST_CASE("VECTOR_SHR_I8", "[instr]") {
 
 TEST_CASE("VECTOR_SHR_I8_CONSTANT", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreVR(b, 3, b.VectorShr(LoadVR(b, 4), b.LoadConstantVec128(vec128b(
-                                                0, 1, 2, 8, 4, 4, 6, 7, 8, 9,
-                                                10, 11, 12, 13, 14, 15)),
-                              INT8_TYPE));
+    StoreVR(
+        b, 3,
+        b.VectorShr(LoadVR(b, 4),
+                    b.LoadConstantVec128(vec128b(0, 1, 2, 8, 4, 4, 6, 7, 8, 9,
+                                                 10, 11, 12, 13, 14, 15)),
+                    INT8_TYPE));
     b.Return();
   });
   test.Run(
@@ -76,9 +78,11 @@ TEST_CASE("VECTOR_SHR_I16", "[instr]") {
 
 TEST_CASE("VECTOR_SHR_I16_CONSTANT", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreVR(b, 3, b.VectorShr(LoadVR(b, 4), b.LoadConstantVec128(vec128s(
-                                                0, 1, 8, 15, 15, 8, 1, 16)),
-                              INT16_TYPE));
+    StoreVR(
+        b, 3,
+        b.VectorShr(LoadVR(b, 4),
+                    b.LoadConstantVec128(vec128s(0, 1, 8, 15, 15, 8, 1, 16)),
+                    INT16_TYPE));
     b.Return();
   });
   test.Run(
@@ -122,12 +126,14 @@ TEST_CASE("VECTOR_SHR_I32", "[instr]") {
 
 TEST_CASE("VECTOR_SHR_I32_CONSTANT", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
-    StoreVR(b, 3, b.VectorShr(LoadVR(b, 4),
-                              b.LoadConstantVec128(vec128i(0, 1, 16, 31)),
-                              INT32_TYPE));
-    StoreVR(b, 4, b.VectorShr(LoadVR(b, 5),
-                              b.LoadConstantVec128(vec128i(31, 16, 1, 32)),
-                              INT32_TYPE));
+    StoreVR(
+        b, 3,
+        b.VectorShr(LoadVR(b, 4), b.LoadConstantVec128(vec128i(0, 1, 16, 31)),
+                    INT32_TYPE));
+    StoreVR(
+        b, 4,
+        b.VectorShr(LoadVR(b, 5), b.LoadConstantVec128(vec128i(31, 16, 1, 32)),
+                    INT32_TYPE));
     b.Return();
   });
   test.Run(

src/xenia/debug/ui/debug_window.cc

@@ -395,7 +395,10 @@ void DebugWindow::DrawSourcePane() {
   ImGui::SameLine();
   if (function->is_guest()) {
     const char* kSourceDisplayModes[] = {
-        "PPC", "PPC+HIR+x64", "PPC+HIR (opt)+x64", "PPC+x64",
+        "PPC",
+        "PPC+HIR+x64",
+        "PPC+HIR (opt)+x64",
+        "PPC+x64",
     };
     ImGui::PushItemWidth(90);
     ImGui::Combo("##display_mode", &state_.source_display_mode,
@@ -1338,8 +1341,9 @@ void DebugWindow::DrawBreakpointsPane() {
                              function->MapGuestAddressToMachineCode(
                                  breakpoint->guest_address()));
         } else {
-          NavigateToFunction(function, function->MapMachineCodeToGuestAddress(
-                                           breakpoint->host_address()),
+          NavigateToFunction(function,
+                             function->MapMachineCodeToGuestAddress(
+                                 breakpoint->host_address()),
                              breakpoint->host_address());
         }
       }

src/xenia/gpu/gl4/gl4_command_processor.cc

@@ -782,7 +782,9 @@ GL4CommandProcessor::UpdateStatus GL4CommandProcessor::UpdateRenderTargets() {
   GLuint color_targets[4] = {kAnyTarget, kAnyTarget, kAnyTarget, kAnyTarget};
   if (enable_mode == ModeControl::kColorDepth) {
     uint32_t color_info[4] = {
-        regs.rb_color_info, regs.rb_color1_info, regs.rb_color2_info,
+        regs.rb_color_info,
+        regs.rb_color1_info,
+        regs.rb_color2_info,
         regs.rb_color3_info,
     };
     // A2XX_RB_COLOR_MASK_WRITE_* == D3DRS_COLORWRITEENABLE
@@ -1099,7 +1101,9 @@ GL4CommandProcessor::UpdateStatus GL4CommandProcessor::UpdateRasterizerState(
   }
 
   static const GLenum kFillModes[3] = {
-      GL_POINT, GL_LINE, GL_FILL,
+      GL_POINT,
+      GL_LINE,
+      GL_FILL,
   };
   bool poly_mode = ((regs.pa_su_sc_mode_cntl >> 3) & 0x3) != 0;
   if (poly_mode) {
@@ -1590,7 +1594,8 @@ bool GL4CommandProcessor::IssueCopy() {
   if (copy_src_select <= 3 || color_clear_enabled) {
     // Source from a color target.
     uint32_t color_info[4] = {
-        regs[XE_GPU_REG_RB_COLOR_INFO].u32, regs[XE_GPU_REG_RB_COLOR1_INFO].u32,
+        regs[XE_GPU_REG_RB_COLOR_INFO].u32,
+        regs[XE_GPU_REG_RB_COLOR1_INFO].u32,
         regs[XE_GPU_REG_RB_COLOR2_INFO].u32,
         regs[XE_GPU_REG_RB_COLOR3_INFO].u32,
     };

src/xenia/gpu/gl4/gl4_shader_cache.h

@@ -11,8 +11,10 @@
 #define XENIA_GPU_GL4_SHADER_CACHE_H_
 
 #include <cstdint>
+#include <cstring>
 #include <memory>
 #include <unordered_map>
+#include <vector>
 
 #include "xenia/gpu/xenos.h"
 

src/xenia/gpu/gl4/texture_cache.cc

@@ -940,8 +940,9 @@ bool TextureCache::UploadTexture2D(GLuint texture,
                       texture_info.size_2d.logical_height);
          y++, output_base_offset += host_info.size_2d.output_pitch) {
       auto input_base_offset = TextureInfo::TiledOffset2DOuter(
-          offset_y + y, (texture_info.size_2d.input_width /
-                         texture_info.format_info()->block_width),
+          offset_y + y,
+          (texture_info.size_2d.input_width /
+           texture_info.format_info()->block_width),
           bpp);
       for (uint32_t x = 0, output_offset = output_base_offset;
            x < texture_info.size_2d.block_width;
@@ -1048,8 +1049,9 @@ bool TextureCache::UploadTextureCube(GLuint texture,
            y < texture_info.size_cube.block_height;
            y++, output_base_offset += host_info.size_cube.output_pitch) {
         auto input_base_offset = TextureInfo::TiledOffset2DOuter(
-            offset_y + y, (texture_info.size_cube.input_width /
-                           texture_info.format_info()->block_width),
+            offset_y + y,
+            (texture_info.size_cube.input_width /
+             texture_info.format_info()->block_width),
             bpp);
         for (uint32_t x = 0, output_offset = output_base_offset;
              x < texture_info.size_cube.block_width;

src/xenia/gpu/graphics_system.cc

@@ -159,8 +159,8 @@ uint32_t GraphicsSystem::ReadRegister(uint32_t addr) {
     case 0x1951:  // ? vblank pending?
       return 1;
     case 0x1961:  // AVIVO_D1MODE_VIEWPORT_SIZE
-      // Screen res - 1280x720
-      // [width(0x0FFF), height(0x0FFF)]
+                  // Screen res - 1280x720
+                  // [width(0x0FFF), height(0x0FFF)]
       return 0x050002D0;
     default:
       if (!register_file_.GetRegisterInfo(r)) {

src/xenia/gpu/register_file.cc

@@ -23,7 +23,8 @@ const RegisterInfo* RegisterFile::GetRegisterInfo(uint32_t index) {
 #define XE_GPU_REGISTER(index, type, name) \
   case index: {                            \
     static const RegisterInfo reg_info = { \
-        RegisterInfo::Type::type, #name,   \
+        RegisterInfo::Type::type,          \
+        #name,                             \
     };                                     \
     return &reg_info;                      \
   }

src/xenia/gpu/shader_translator_disasm.cc

@@ -356,7 +356,10 @@ void ParsedVertexFetchInstruction::Disassemble(StringBuffer* out) const {
 
 void ParsedTextureFetchInstruction::Disassemble(StringBuffer* out) const {
   static const char* kTextureFilterNames[] = {
-      "point", "linear", "BASEMAP", "keep",
+      "point",
+      "linear",
+      "BASEMAP",
+      "keep",
   };
   static const char* kAnisoFilterNames[] = {
       "disabled", "max1to1",  "max2to1", "max4to1",

src/xenia/gpu/spirv_shader_translator.cc

@@ -2,7 +2,7 @@
  ******************************************************************************
  * Xenia : Xbox 360 Emulator Research Project                                 *
  ******************************************************************************
- * Copyright 2016 Ben Vanik. All rights reserved.                             *
+ * Copyright 2017 Ben Vanik. All rights reserved.                             *
  * Released under the BSD license - see LICENSE in the root for more details. *
  ******************************************************************************
  */
@@ -13,6 +13,7 @@
 
 #include <cfloat>
 #include <cstring>
+#include <vector>
 
 #include "xenia/base/logging.h"
 #include "xenia/gpu/spirv/passes/control_flow_analysis_pass.h"
@@ -337,8 +338,7 @@ void SpirvShaderTranslator::StartTranslation() {
                                       registers_ptr_,
                                       std::vector<Id>({b.makeUintConstant(0)}));
     auto r0 = b.createLoad(r0_ptr);
-    r0 = b.createCompositeInsert(vertex_idx, r0, vec4_float_type_,
-                                 std::vector<uint32_t>({0}));
+    r0 = b.createCompositeInsert(vertex_idx, r0, vec4_float_type_, 0);
     b.createStore(r0, r0_ptr);
   } else {
     // Pixel inputs from vertex shader.

src/xenia/gpu/trace_viewer.cc

@@ -950,9 +950,8 @@ void TraceViewer::DrawVertexFetcher(Shader* shader,
     }
   }
   ImGui::Columns(1);
-  ImGui::SetCursorPosY(ImGui::GetCursorPosY() +
-                       (vertex_count - display_end) *
-                           ImGui::GetTextLineHeight());
+  ImGui::SetCursorPosY(ImGui::GetCursorPosY() + (vertex_count - display_end) *
+                                                    ImGui::GetTextLineHeight());
   ImGui::PopStyleVar();
   ImGui::EndChild();
 }
@@ -971,10 +970,14 @@ static const char* kStencilFuncNames[] = {
     "Decrement and Clamp",
 };
 static const char* kIndexFormatNames[] = {
-    "uint16", "uint32",
+    "uint16",
+    "uint32",
 };
 static const char* kEndiannessNames[] = {
-    "unspecified endianness", "8-in-16", "8-in-32", "16-in-32",
+    "unspecified endianness",
+    "8-in-16",
+    "8-in-32",
+    "16-in-32",
 };
 static const char* kColorFormatNames[] = {
     /* 0  */ "k_8_8_8_8",
@@ -995,7 +998,8 @@ static const char* kColorFormatNames[] = {
     /* 15 */ "k_32_32_FLOAT",
 };
 static const char* kDepthFormatNames[] = {
-    "kD24S8", "kD24FS8",
+    "kD24S8",
+    "kD24FS8",
 };
 
 void ProgressBar(float frac, float width, float height = 0,
@@ -1185,7 +1189,9 @@ void TraceViewer::DrawStateUI() {
     uint32_t surface_pitch = surface_info & 0x3FFF;
     auto surface_msaa = (surface_info >> 16) & 0x3;
     static const char* kMsaaNames[] = {
-        "1X", "2X", "4X",
+        "1X",
+        "2X",
+        "4X",
     };
     ImGui::BulletText("Surface Pitch: %d", surface_pitch);
     ImGui::BulletText("Surface HI-Z Pitch: %d", surface_hiz);
@@ -1270,7 +1276,9 @@ void TraceViewer::DrawStateUI() {
       ImGui::BulletText("Front-face: counter-clockwise");
     }
     static const char* kFillModeNames[3] = {
-        "point", "line", "fill",
+        "point",
+        "line",
+        "fill",
     };
     bool poly_mode = ((pa_su_sc_mode_cntl >> 3) & 0x3) != 0;
     if (poly_mode) {

src/xenia/gpu/trace_writer.cc

@@ -72,7 +72,9 @@ void TraceWriter::WritePrimaryBufferStart(uint32_t base_ptr, uint32_t count) {
     return;
   }
   PrimaryBufferStartCommand cmd = {
-      TraceCommandType::kPrimaryBufferStart, base_ptr, 0,
+      TraceCommandType::kPrimaryBufferStart,
+      base_ptr,
+      0,
   };
   fwrite(&cmd, 1, sizeof(cmd), file_);
 }
@@ -92,7 +94,9 @@ void TraceWriter::WriteIndirectBufferStart(uint32_t base_ptr, uint32_t count) {
     return;
   }
   IndirectBufferStartCommand cmd = {
-      TraceCommandType::kIndirectBufferStart, base_ptr, 0,
+      TraceCommandType::kIndirectBufferStart,
+      base_ptr,
+      0,
   };
   fwrite(&cmd, 1, sizeof(cmd), file_);
 }
@@ -112,7 +116,9 @@ void TraceWriter::WritePacketStart(uint32_t base_ptr, uint32_t count) {
     return;
   }
   PacketStartCommand cmd = {
-      TraceCommandType::kPacketStart, base_ptr, count,
+      TraceCommandType::kPacketStart,
+      base_ptr,
+      count,
   };
   fwrite(&cmd, 1, sizeof(cmd), file_);
   fwrite(membase_ + base_ptr, 4, count, file_);
@@ -220,7 +226,8 @@ void TraceWriter::WriteEvent(EventCommand::Type event_type) {
     return;
   }
   EventCommand cmd = {
-      TraceCommandType::kEvent, event_type,
+      TraceCommandType::kEvent,
+      event_type,
   };
   fwrite(&cmd, 1, sizeof(cmd), file_);
 }

src/xenia/gpu/vulkan/pipeline_cache.cc

@@ -1206,7 +1206,9 @@ PipelineCache::UpdateStatus PipelineCache::UpdateRasterizationState(
     // Vulkan only supports both matching.
     assert_true(front_poly_mode == back_poly_mode);
     static const VkPolygonMode kFillModes[3] = {
-        VK_POLYGON_MODE_POINT, VK_POLYGON_MODE_LINE, VK_POLYGON_MODE_FILL,
+        VK_POLYGON_MODE_POINT,
+        VK_POLYGON_MODE_LINE,
+        VK_POLYGON_MODE_FILL,
     };
     state_info.polygonMode = kFillModes[front_poly_mode];
   } else {

src/xenia/gpu/vulkan/render_cache.cc

@@ -223,7 +223,9 @@ CachedTileView::CachedTileView(ui::vulkan::VulkanDevice* device,
   image_view_info.format = image_info.format;
   // TODO(benvanik): manipulate? may not be able to when attached.
   image_view_info.components = {
-      VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_G, VK_COMPONENT_SWIZZLE_B,
+      VK_COMPONENT_SWIZZLE_R,
+      VK_COMPONENT_SWIZZLE_G,
+      VK_COMPONENT_SWIZZLE_B,
       VK_COMPONENT_SWIZZLE_A,
   };
   image_view_info.subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1};
@@ -766,7 +768,9 @@ bool RenderCache::ParseConfiguration(RenderConfiguration* config) {
   // Color attachment configuration.
   if (config->mode_control == ModeControl::kColorDepth) {
     reg::RB_COLOR_INFO color_info[4] = {
-        regs.rb_color_info, regs.rb_color1_info, regs.rb_color2_info,
+        regs.rb_color_info,
+        regs.rb_color1_info,
+        regs.rb_color2_info,
         regs.rb_color3_info,
     };
     for (int i = 0; i < 4; ++i) {
@@ -783,6 +787,9 @@ bool RenderCache::ParseConfiguration(RenderConfiguration* config) {
         case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_unknown:
           config->color[i].format = ColorRenderTargetFormat::k_2_10_10_10_FLOAT;
           break;
+        default:
+          // The rest are good
+          break;
       }
     }
   } else {
@@ -863,7 +870,7 @@ bool RenderCache::ConfigureRenderPass(VkCommandBuffer command_buffer,
       color_key.edram_format = static_cast<uint16_t>(config->color[i].format);
       target_color_attachments[i] =
           FindOrCreateTileView(command_buffer, color_key);
-      if (!target_color_attachments) {
+      if (!target_color_attachments[i]) {
         XELOGE("Failed to get tile view for color attachment");
         return false;
       }
@@ -926,6 +933,9 @@ CachedTileView* RenderCache::FindTileView(uint32_t base, uint32_t pitch,
       case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_unknown:
         format = uint32_t(ColorRenderTargetFormat::k_2_10_10_10_FLOAT);
         break;
+      default:
+        // Other types as-is.
+        break;
     }
   }
 
@@ -1165,6 +1175,9 @@ void RenderCache::BlitToImage(VkCommandBuffer command_buffer,
       case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_unknown:
         format = uint32_t(ColorRenderTargetFormat::k_2_10_10_10_FLOAT);
         break;
+      default:
+        // Rest are OK
+        break;
     }
   }
 
@@ -1278,6 +1291,9 @@ void RenderCache::ClearEDRAMColor(VkCommandBuffer command_buffer,
     case ColorRenderTargetFormat::k_2_10_10_10_FLOAT_unknown:
       format = ColorRenderTargetFormat::k_2_10_10_10_FLOAT;
       break;
+    default:
+      // Rest are OK
+      break;
   }
 
   uint32_t tile_width = num_samples == MsaaSamples::k4X ? 40 : 80;

src/xenia/gpu/vulkan/render_cache.h

@@ -84,7 +84,7 @@ class CachedTileView {
   }
 
   VkExtent2D GetSize() const {
-    return {key.tile_width * 80ul, key.tile_height * 16ul};
+    return {key.tile_width * 80u, key.tile_height * 16u};
   }
 
  private:

src/xenia/gpu/vulkan/texture_cache.cc

@@ -1116,8 +1116,10 @@ void TextureCache::WritebackTexture(Texture* texture) {
   auto command_buffer = wb_command_pool_->AcquireEntry();
 
   VkCommandBufferBeginInfo begin_info = {
-      VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, nullptr,
-      VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT, nullptr,
+      VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO,
+      nullptr,
+      VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT,
+      nullptr,
   };
   vkBeginCommandBuffer(command_buffer, &begin_info);
 

src/xenia/gpu/vulkan/vulkan_command_processor.cc

@@ -122,7 +122,9 @@ bool VulkanCommandProcessor::SetupContext() {
   }
 
   VkEventCreateInfo info = {
-      VK_STRUCTURE_TYPE_EVENT_CREATE_INFO, nullptr, 0,
+      VK_STRUCTURE_TYPE_EVENT_CREATE_INFO,
+      nullptr,
+      0,
   };
 
   status = vkCreateEvent(*device_, &info, nullptr,
@@ -469,7 +471,8 @@ void VulkanCommandProcessor::PerformSwap(uint32_t frontbuffer_ptr,
                          nullptr, 1, &barrier);
 
     VkRect2D src_rect = {
-        {0, 0}, {frontbuffer_width, frontbuffer_height},
+        {0, 0},
+        {frontbuffer_width, frontbuffer_height},
     };
     blitter_->BlitTexture2D(
         copy_commands, current_batch_fence_,
@@ -1032,7 +1035,8 @@ bool VulkanCommandProcessor::IssueCopy() {
   if (is_color_source) {
     // Source from a color target.
     uint32_t color_info[4] = {
-        regs[XE_GPU_REG_RB_COLOR_INFO].u32, regs[XE_GPU_REG_RB_COLOR1_INFO].u32,
+        regs[XE_GPU_REG_RB_COLOR_INFO].u32,
+        regs[XE_GPU_REG_RB_COLOR1_INFO].u32,
         regs[XE_GPU_REG_RB_COLOR2_INFO].u32,
         regs[XE_GPU_REG_RB_COLOR3_INFO].u32,
     };
@@ -1142,11 +1146,11 @@ bool VulkanCommandProcessor::IssueCopy() {
   VkFilter filter = is_color_source ? VK_FILTER_LINEAR : VK_FILTER_NEAREST;
   switch (copy_command) {
     case CopyCommand::kRaw:
-    /*
-      render_cache_->RawCopyToImage(command_buffer, edram_base,
-      texture->image, texture->image_layout, is_color_source, resolve_offset,
-      resolve_extent); break;
-    */
+      /*
+        render_cache_->RawCopyToImage(command_buffer, edram_base,
+        texture->image, texture->image_layout, is_color_source, resolve_offset,
+        resolve_extent); break;
+      */
 
     case CopyCommand::kConvert: {
       /*

src/xenia/gpu/vulkan/vulkan_graphics_system.cc

@@ -27,8 +27,8 @@ namespace xe {
 namespace gpu {
 namespace vulkan {
 
-using xe::ui::vulkan::CheckResult;
 using xe::ui::RawImage;
+using xe::ui::vulkan::CheckResult;
 
 VulkanGraphicsSystem::VulkanGraphicsSystem() {}
 VulkanGraphicsSystem::~VulkanGraphicsSystem() = default;
@@ -50,7 +50,8 @@ X_STATUS VulkanGraphicsSystem::Setup(cpu::Processor* processor,
 
   // Create our own command pool we can use for captures.
   VkCommandPoolCreateInfo create_info = {
-      VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, nullptr,
+      VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO,
+      nullptr,
       VK_COMMAND_POOL_CREATE_TRANSIENT_BIT |
           VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT,
       device_->queue_family_index(),
@@ -93,8 +94,10 @@ std::unique_ptr<RawImage> VulkanGraphicsSystem::Capture() {
   }
 
   VkCommandBufferBeginInfo begin_info = {
-      VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, nullptr,
-      VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT, nullptr,
+      VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO,
+      nullptr,
+      VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT,
+      nullptr,
   };
   vkBeginCommandBuffer(cmd, &begin_info);
 

src/xenia/hid/hid_demo.cc

@@ -2,7 +2,7 @@
  ******************************************************************************
  * Xenia : Xbox 360 Emulator Research Project                                 *
  ******************************************************************************
- * Copyright 2015 Ben Vanik. All rights reserved.                             *
+ * Copyright 2017 Ben Vanik. All rights reserved.                             *
  * Released under the BSD license - see LICENSE in the root for more details. *
  ******************************************************************************
  */
@@ -15,7 +15,6 @@
 #include "xenia/base/clock.h"
 #include "xenia/base/logging.h"
 #include "xenia/base/main.h"
-#include "xenia/base/platform_win.h"
 #include "xenia/base/threading.h"
 #include "xenia/hid/input_system.h"
 #include "xenia/ui/gl/gl_provider.h"
@@ -117,11 +116,11 @@ int hid_demo_main(const std::vector<std::wstring>& args) {
     auto& io = window->imgui_drawer()->GetIO();
 
     ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(-1, 0));
-    ImGui::Begin("main_window", nullptr, ImGuiWindowFlags_NoMove |
-                                             ImGuiWindowFlags_NoResize |
-                                             ImGuiWindowFlags_NoTitleBar |
-                                             ImGuiWindowFlags_NoScrollbar |
-                                             ImGuiWindowFlags_NoSavedSettings);
+    ImGui::Begin("main_window", nullptr,
+                 ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize |
+                     ImGuiWindowFlags_NoTitleBar |
+                     ImGuiWindowFlags_NoScrollbar |
+                     ImGuiWindowFlags_NoSavedSettings);
     ImGui::SetWindowPos(ImVec2(0, 0));
     ImGui::SetWindowSize(io.DisplaySize);
     ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(4, 4));

src/xenia/kernel/util/object_table.cc

@@ -213,9 +213,8 @@ std::vector<object_ref<XObject>> ObjectTable::GetAllObjects() {
 
   for (uint32_t slot = 0; slot < table_capacity_; slot++) {
     auto& entry = table_[slot];
-    if (entry.object &&
-        std::find(results.begin(), results.end(), entry.object) ==
-            results.end()) {
+    if (entry.object && std::find(results.begin(), results.end(),
+                                  entry.object) == results.end()) {
       entry.object->Retain();
       results.push_back(object_ref<XObject>(entry.object));
     }

src/xenia/kernel/util/shim_utils.h

@@ -474,7 +474,9 @@ xe::cpu::Export* RegisterExport(R (*fn)(Ps&...), const char* name,
     static void Trampoline(PPCContext* ppc_context) {
       ++export_entry->function_data.call_count;
       Param::Init init = {
-          ppc_context, sizeof...(Ps), 0,
+          ppc_context,
+          sizeof...(Ps),
+          0,
       };
       auto params = std::make_tuple<Ps...>(Ps(init)...);
       if (export_entry->tags & xe::cpu::ExportTag::kLog &&
@@ -507,7 +509,8 @@ xe::cpu::Export* RegisterExport(void (*fn)(Ps&...), const char* name,
     static void Trampoline(PPCContext* ppc_context) {
       ++export_entry->function_data.call_count;
       Param::Init init = {
-          ppc_context, sizeof...(Ps),
+          ppc_context,
+          sizeof...(Ps),
       };
       auto params = std::make_tuple<Ps...>(Ps(init)...);
       if (export_entry->tags & xe::cpu::ExportTag::kLog &&

src/xenia/kernel/util/xex2.h

@@ -15,7 +15,9 @@
 
 namespace xe {}  // namespace xe
 
-typedef struct { int reserved; } xe_xex2_options_t;
+typedef struct {
+  int reserved;
+} xe_xex2_options_t;
 
 struct xe_xex2;
 typedef struct xe_xex2* xe_xex2_ref;

src/xenia/kernel/xam/xam_avatar.cc

@@ -24,7 +24,7 @@ dword_result_t XamAvatarInitialize(
     lpdword_t function_ptrs,   // 20b, 5 pointers
     lpunknown_t unk5,          // ptr in data segment
     dword_t unk6               // flags - 0x00300000, 0x30, etc
-    ) {
+) {
   // Negative to fail. Game should immediately call XamAvatarShutdown.
   return ~0u;
 }

src/xenia/kernel/xbdm/xbdm_misc.cc

@@ -47,6 +47,6 @@ DECLARE_XBDM_EXPORT(DmFindPdbSignature, ExportTag::kStub | ExportTag::kDebug);
 void RegisterMiscExports(xe::cpu::ExportResolver* export_resolver,
                          KernelState* kernel_state) {}
 
-}  // namespace xboxkrnl
+}  // namespace xbdm
 }  // namespace kernel
 }  // namespace xe

src/xenia/kernel/xboxkrnl/xboxkrnl_audio.cc

@@ -7,13 +7,13 @@
  ******************************************************************************
  */
 
-#include "xenia/xbox.h"
 #include "xenia/apu/audio_system.h"
 #include "xenia/base/logging.h"
 #include "xenia/emulator.h"
 #include "xenia/kernel/kernel_state.h"
 #include "xenia/kernel/util/shim_utils.h"
 #include "xenia/kernel/xboxkrnl/xboxkrnl_private.h"
+#include "xenia/xbox.h"
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xboxkrnl/xboxkrnl_crypt.cc

@@ -7,11 +7,11 @@
 ******************************************************************************
 */
 
-#include "xenia/xbox.h"
 #include "xenia/base/logging.h"
 #include "xenia/kernel/kernel_state.h"
 #include "xenia/kernel/util/shim_utils.h"
 #include "xenia/kernel/xboxkrnl/xboxkrnl_private.h"
+#include "xenia/xbox.h"
 
 #include "third_party/crypto/TinySHA1.hpp"
 #include "third_party/crypto/des/des.cpp"

src/xenia/kernel/xboxkrnl/xboxkrnl_debug.cc

@@ -7,13 +7,13 @@
  ******************************************************************************
  */
 
-#include "xenia/xbox.h"
 #include "xenia/base/debugging.h"
 #include "xenia/base/logging.h"
 #include "xenia/kernel/kernel_state.h"
 #include "xenia/kernel/util/shim_utils.h"
 #include "xenia/kernel/xboxkrnl/xboxkrnl_private.h"
 #include "xenia/kernel/xthread.h"
+#include "xenia/xbox.h"
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xboxkrnl/xboxkrnl_hal.cc

@@ -7,11 +7,11 @@
  ******************************************************************************
  */
 
-#include "xenia/xbox.h"
 #include "xenia/base/logging.h"
 #include "xenia/kernel/kernel_state.h"
 #include "xenia/kernel/util/shim_utils.h"
 #include "xenia/kernel/xboxkrnl/xboxkrnl_private.h"
+#include "xenia/xbox.h"
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xboxkrnl/xboxkrnl_io.cc

@@ -7,7 +7,6 @@
  ******************************************************************************
  */
 
-#include "xenia/xbox.h"
 #include "xenia/base/logging.h"
 #include "xenia/base/memory.h"
 #include "xenia/cpu/processor.h"
@@ -19,6 +18,7 @@
 #include "xenia/kernel/xiocompletion.h"
 #include "xenia/kernel/xthread.h"
 #include "xenia/vfs/device.h"
+#include "xenia/xbox.h"
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xboxkrnl/xboxkrnl_misc.cc

@@ -7,12 +7,12 @@
  ******************************************************************************
  */
 
-#include "xenia/xbox.h"
 #include "xenia/base/logging.h"
 #include "xenia/kernel/kernel_state.h"
 #include "xenia/kernel/util/shim_utils.h"
 #include "xenia/kernel/xboxkrnl/xboxkrnl_private.h"
 #include "xenia/kernel/xthread.h"
+#include "xenia/xbox.h"
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xboxkrnl/xboxkrnl_modules.cc

@@ -7,7 +7,6 @@
  ******************************************************************************
  */
 
-#include "xenia/xbox.h"
 #include "xenia/base/logging.h"
 #include "xenia/cpu/processor.h"
 #include "xenia/kernel/kernel_state.h"
@@ -15,6 +14,7 @@
 #include "xenia/kernel/util/shim_utils.h"
 #include "xenia/kernel/util/xex2.h"
 #include "xenia/kernel/xboxkrnl/xboxkrnl_private.h"
+#include "xenia/xbox.h"
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xboxkrnl/xboxkrnl_ob.cc

@@ -7,7 +7,6 @@
  ******************************************************************************
  */
 
-#include "xenia/xbox.h"
 #include "xenia/base/logging.h"
 #include "xenia/kernel/kernel_state.h"
 #include "xenia/kernel/util/shim_utils.h"
@@ -15,6 +14,7 @@
 #include "xenia/kernel/xobject.h"
 #include "xenia/kernel/xsemaphore.h"
 #include "xenia/kernel/xthread.h"
+#include "xenia/xbox.h"
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xboxkrnl/xboxkrnl_strings.cc

@@ -559,13 +559,12 @@ int32_t format_core(PPCContext* ppc_context, FormatData& data, ArgList& args,
 
               if (!is_wide) {
                 length = 0;
-                for (auto s = (const uint8_t *)str; cap > 0 && *s; ++s, cap--) {
+                for (auto s = (const uint8_t*)str; cap > 0 && *s; ++s, cap--) {
                   length++;
                 }
               } else {
                 length = 0;
-                for (auto s = (const uint16_t *)str; cap > 0 && *s;
-                     ++s, cap--) {
+                for (auto s = (const uint16_t*)str; cap > 0 && *s; ++s, cap--) {
                   length++;
                 }
               }

src/xenia/kernel/xboxkrnl/xboxkrnl_usbcam.cc

@@ -7,11 +7,11 @@
  ******************************************************************************
  */
 
-#include "xenia/xbox.h"
 #include "xenia/base/logging.h"
 #include "xenia/kernel/kernel_state.h"
 #include "xenia/kernel/util/shim_utils.h"
 #include "xenia/kernel/xboxkrnl/xboxkrnl_private.h"
+#include "xenia/xbox.h"
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xboxkrnl/xboxkrnl_video.cc

@@ -257,7 +257,7 @@ dword_result_t VdInitializeScalerCommandBuffer(
     lpvoid_t dest_ptr,  // Points to the first 80000000h where the memcpy
                         // sources from.
     dword_t dest_count  // Count in words.
-    ) {
+) {
   // We could fake the commands here, but I'm not sure the game checks for
   // anything but success (non-zero ret).
   // For now, we just fill it with NOPs.

src/xenia/memory.cc

@@ -209,39 +209,57 @@ static const struct {
 } map_info[] = {
     // (1024mb) - virtual 4k pages
     {
-        0x00000000, 0x3FFFFFFF, 0x0000000000000000ull,
+        0x00000000,
+        0x3FFFFFFF,
+        0x0000000000000000ull,
     },
     // (1024mb) - virtual 64k pages (cont)
     {
-        0x40000000, 0x7EFFFFFF, 0x0000000040000000ull,
+        0x40000000,
+        0x7EFFFFFF,
+        0x0000000040000000ull,
     },
     //   (16mb) - GPU writeback + 15mb of XPS?
     {
-        0x7F000000, 0x7FFFFFFF, 0x0000000100000000ull,
+        0x7F000000,
+        0x7FFFFFFF,
+        0x0000000100000000ull,
     },
     //  (256mb) - xex 64k pages
     {
-        0x80000000, 0x8FFFFFFF, 0x0000000080000000ull,
+        0x80000000,
+        0x8FFFFFFF,
+        0x0000000080000000ull,
     },
     //  (256mb) - xex 4k pages
     {
-        0x90000000, 0x9FFFFFFF, 0x0000000080000000ull,
+        0x90000000,
+        0x9FFFFFFF,
+        0x0000000080000000ull,
     },
     //  (512mb) - physical 64k pages
     {
-        0xA0000000, 0xBFFFFFFF, 0x0000000100000000ull,
+        0xA0000000,
+        0xBFFFFFFF,
+        0x0000000100000000ull,
     },
     //          - physical 16mb pages
     {
-        0xC0000000, 0xDFFFFFFF, 0x0000000100000000ull,
+        0xC0000000,
+        0xDFFFFFFF,
+        0x0000000100000000ull,
     },
     //          - physical 4k pages
     {
-        0xE0000000, 0xFFFFFFFF, 0x0000000100000000ull,
+        0xE0000000,
+        0xFFFFFFFF,
+        0x0000000100000000ull,
     },
     //          - physical raw
     {
-        0x100000000, 0x11FFFFFFF, 0x0000000100000000ull,
+        0x100000000,
+        0x11FFFFFFF,
+        0x0000000100000000ull,
     },
 };
 int Memory::MapViews(uint8_t* mapping_base) {

src/xenia/tools/api-scanner/api_scanner_loader.cc

@@ -179,5 +179,5 @@ bool apiscanner_loader::ExtractImports(const void* addr, const size_t length,
   return true;
 }
 
-}  // tools
-}  // xe
+}  // namespace tools
+}  // namespace xe

src/xenia/tools/api-scanner/api_scanner_loader.h

@@ -56,5 +56,5 @@ class apiscanner_loader {
   bool ExtractImports(const void* addr, const size_t length, title& info);
 };
 
-}  // tools
-}  // xe
+}  // namespace tools
+}  // namespace xe

src/xenia/ui/file_picker_gtk.cc

@@ -0,0 +1,70 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2016 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#include "xenia/ui/file_picker.h"
+
+#include <codecvt>
+#include <locale>
+#include <string>
+#include "xenia/base/assert.h"
+#include "xenia/base/platform_linux.h"
+
+namespace xe {
+namespace ui {
+
+class GtkFilePicker : public FilePicker {
+ public:
+  GtkFilePicker();
+  ~GtkFilePicker() override;
+
+  bool Show(void* parent_window_handle) override;
+
+ private:
+};
+
+std::unique_ptr<FilePicker> FilePicker::Create() {
+  return std::make_unique<GtkFilePicker>();
+}
+
+GtkFilePicker::GtkFilePicker() = default;
+
+GtkFilePicker::~GtkFilePicker() = default;
+
+bool GtkFilePicker::Show(void* parent_window_handle) {
+  // TODO(benvanik): FileSaveDialog.
+  assert_true(mode() == Mode::kOpen);
+  // TODO(benvanik): folder dialogs.
+  assert_true(type() == Type::kFile);
+  GtkWidget* dialog;
+  gint res;
+
+  dialog = gtk_file_chooser_dialog_new(
+      "Open File", (GtkWindow*)parent_window_handle,
+      GTK_FILE_CHOOSER_ACTION_OPEN, "_Cancel", GTK_RESPONSE_CANCEL, "_Open",
+      GTK_RESPONSE_ACCEPT, NULL);
+
+  res = gtk_dialog_run(GTK_DIALOG(dialog));
+  char* filename;
+  if (res == GTK_RESPONSE_ACCEPT) {
+    GtkFileChooser* chooser = GTK_FILE_CHOOSER(dialog);
+    filename = gtk_file_chooser_get_filename(chooser);
+    std::vector<std::wstring> selected_files;
+    std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
+    std::wstring ws_filename = converter.from_bytes(filename);
+    selected_files.push_back(ws_filename);
+    set_selected_files(selected_files);
+    gtk_widget_destroy(dialog);
+    return true;
+  }
+  gtk_widget_destroy(dialog);
+  return false;
+}
+
+}  // namespace ui
+}  // namespace xe

src/xenia/ui/gl/gl.h

@@ -23,6 +23,10 @@ extern "C" GLEWContext* glewGetContext();
 // required.
 typedef struct WGLEWContextStruct WGLEWContext;
 extern "C" WGLEWContext* wglewGetContext();
-#endif  // XE_PLATFORM_WIN32
+#elif XE_PLATFORM_LINUX
+typedef struct GLXEWContextStruct GLXEWContext;
+extern "C" GLXEWContext* glxewGetContext();
+
+#endif
 
 #endif  // XENIA_UI_GL_GL_H_

src/xenia/ui/gl/gl_context.cc

@@ -17,14 +17,10 @@
 #include "xenia/base/assert.h"
 #include "xenia/base/logging.h"
 #include "xenia/base/math.h"
-#include "xenia/base/platform_win.h"
 #include "xenia/base/profiling.h"
 #include "xenia/ui/gl/gl_immediate_drawer.h"
 #include "xenia/ui/window.h"
 
-// TODO(benvanik): move win32 code to _win?
-#include "third_party/GL/wglew.h"
-
 DEFINE_bool(thread_safe_gl, false,
             "Only allow one GL context to be active at a time.");
 
@@ -43,14 +39,9 @@ namespace xe {
 namespace ui {
 namespace gl {
 
-static std::recursive_mutex global_gl_mutex_;
+std::recursive_mutex GLContext::global_gl_mutex_;
 
-thread_local GLEWContext* tls_glew_context_ = nullptr;
-thread_local WGLEWContext* tls_wglew_context_ = nullptr;
-extern "C" GLEWContext* glewGetContext() { return tls_glew_context_; }
-extern "C" WGLEWContext* wglewGetContext() { return tls_wglew_context_; }
-
-void FatalGLError(std::string error) {
+void GLContext::FatalGLError(std::string error) {
   xe::FatalError(
       error +
       "\nEnsure you have the latest drivers for your GPU and that it supports "
@@ -58,223 +49,10 @@ void FatalGLError(std::string error) {
       "of supported GPUs.");
 }
 
-std::unique_ptr<GLContext> GLContext::Create(GraphicsProvider* provider,
-                                             Window* target_window,
-                                             GLContext* share_context) {
-  auto context =
-      std::unique_ptr<GLContext>(new GLContext(provider, target_window));
-  if (!context->Initialize(share_context)) {
-    return nullptr;
-  }
-  context->AssertExtensionsPresent();
-  return context;
-}
-
 GLContext::GLContext(GraphicsProvider* provider, Window* target_window)
-    : GraphicsContext(provider, target_window) {
-  glew_context_.reset(new GLEWContext());
-  wglew_context_.reset(new WGLEWContext());
-}
+    : GraphicsContext(provider, target_window) {}
 
-GLContext::~GLContext() {
-  MakeCurrent();
-  blitter_.Shutdown();
-  immediate_drawer_.reset();
-  ClearCurrent();
-  if (glrc_) {
-    wglDeleteContext(glrc_);
-  }
-  if (dc_) {
-    ReleaseDC(HWND(target_window_->native_handle()), dc_);
-  }
-}
-
-bool GLContext::Initialize(GLContext* share_context) {
-  dc_ = GetDC(HWND(target_window_->native_handle()));
-
-  PIXELFORMATDESCRIPTOR pfd = {0};
-  pfd.nSize = sizeof(pfd);
-  pfd.nVersion = 1;
-  pfd.dwFlags = PFD_DOUBLEBUFFER | PFD_SUPPORT_OPENGL | PFD_DRAW_TO_WINDOW;
-  pfd.iPixelType = PFD_TYPE_RGBA;
-  pfd.cColorBits = 32;
-  pfd.cDepthBits = 32;
-  pfd.iLayerType = PFD_MAIN_PLANE;
-  int pixel_format = ChoosePixelFormat(dc_, &pfd);
-  if (!pixel_format) {
-    FatalGLError("Unable to choose pixel format.");
-    return false;
-  }
-  if (!SetPixelFormat(dc_, pixel_format, &pfd)) {
-    FatalGLError("Unable to set pixel format.");
-    return false;
-  }
-
-  HGLRC temp_context = wglCreateContext(dc_);
-  if (!temp_context) {
-    FatalGLError("Unable to create temporary GL context.");
-    return false;
-  }
-  wglMakeCurrent(dc_, temp_context);
-
-  tls_glew_context_ = glew_context_.get();
-  tls_wglew_context_ = wglew_context_.get();
-  if (glewInit() != GLEW_OK) {
-    FatalGLError("Unable to initialize GLEW.");
-    return false;
-  }
-  if (wglewInit() != GLEW_OK) {
-    FatalGLError("Unable to initialize WGLEW.");
-    return false;
-  }
-
-  if (!WGLEW_ARB_create_context) {
-    FatalGLError("WGL_ARG_create_context not supported by GL ICD.");
-    return false;
-  }
-
-  if (GLEW_ARB_robustness) {
-    robust_access_supported_ = true;
-  }
-
-  int context_flags = 0;
-  if (FLAGS_gl_debug) {
-    context_flags |= WGL_CONTEXT_DEBUG_BIT_ARB;
-  }
-  if (robust_access_supported_) {
-    context_flags |= WGL_CONTEXT_ROBUST_ACCESS_BIT_ARB;
-  }
-
-  int attrib_list[] = {
-      WGL_CONTEXT_MAJOR_VERSION_ARB,
-      4,
-      WGL_CONTEXT_MINOR_VERSION_ARB,
-      5,
-      WGL_CONTEXT_FLAGS_ARB,
-      context_flags,
-      WGL_CONTEXT_PROFILE_MASK_ARB,
-      WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB,
-      WGL_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB,
-      robust_access_supported_ ? WGL_LOSE_CONTEXT_ON_RESET_ARB : 0,
-      0};
-
-  glrc_ = wglCreateContextAttribsARB(
-      dc_, share_context ? share_context->glrc_ : nullptr, attrib_list);
-  wglMakeCurrent(nullptr, nullptr);
-  wglDeleteContext(temp_context);
-  if (!glrc_) {
-    FatalGLError("Unable to create real GL context.");
-    return false;
-  }
-
-  if (!MakeCurrent()) {
-    FatalGLError("Could not make real GL context current.");
-    return false;
-  }
-
-  XELOGI("Successfully created OpenGL context:");
-  XELOGI("  GL_VENDOR: %s", glGetString(GL_VENDOR));
-  XELOGI("  GL_VERSION: %s", glGetString(GL_VERSION));
-  XELOGI("  GL_RENDERER: %s", glGetString(GL_RENDERER));
-  XELOGI("  GL_SHADING_LANGUAGE_VERSION: %s",
-         glGetString(GL_SHADING_LANGUAGE_VERSION));
-
-  while (glGetError()) {
-    // Clearing errors.
-  }
-
-  SetupDebugging();
-
-  if (!blitter_.Initialize()) {
-    FatalGLError("Unable to initialize blitter.");
-    ClearCurrent();
-    return false;
-  }
-
-  immediate_drawer_ = std::make_unique<GLImmediateDrawer>(this);
-
-  ClearCurrent();
-
-  return true;
-}
-
-std::unique_ptr<GLContext> GLContext::CreateOffscreen(
-    GraphicsProvider* provider, GLContext* parent_context) {
-  assert_not_null(parent_context->glrc_);
-
-  HGLRC new_glrc = nullptr;
-  {
-    GraphicsContextLock context_lock(parent_context);
-
-    int context_flags = 0;
-    if (FLAGS_gl_debug) {
-      context_flags |= WGL_CONTEXT_DEBUG_BIT_ARB;
-    }
-
-    bool robust_access_supported = parent_context->robust_access_supported_;
-    if (robust_access_supported) {
-      context_flags |= WGL_CONTEXT_ROBUST_ACCESS_BIT_ARB;
-    }
-
-    int attrib_list[] = {
-        WGL_CONTEXT_MAJOR_VERSION_ARB,
-        4,
-        WGL_CONTEXT_MINOR_VERSION_ARB,
-        5,
-        WGL_CONTEXT_FLAGS_ARB,
-        context_flags,
-        WGL_CONTEXT_PROFILE_MASK_ARB,
-        WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB,
-        WGL_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB,
-        robust_access_supported ? WGL_LOSE_CONTEXT_ON_RESET_ARB : 0,
-        0};
-    new_glrc = wglCreateContextAttribsARB(parent_context->dc_,
-                                          parent_context->glrc_, attrib_list);
-    if (!new_glrc) {
-      FatalGLError("Could not create shared context.");
-      return nullptr;
-    }
-  }
-
-  auto new_context = std::unique_ptr<GLContext>(
-      new GLContext(provider, parent_context->target_window_));
-  new_context->glrc_ = new_glrc;
-  new_context->dc_ =
-      GetDC(HWND(parent_context->target_window_->native_handle()));
-  new_context->robust_access_supported_ =
-      parent_context->robust_access_supported_;
-  if (!new_context->MakeCurrent()) {
-    FatalGLError("Could not make new GL context current.");
-    return nullptr;
-  }
-  if (!glGetString(GL_EXTENSIONS)) {
-    new_context->ClearCurrent();
-    FatalGLError("New GL context did not have extensions.");
-    return nullptr;
-  }
-
-  if (glewInit() != GLEW_OK) {
-    new_context->ClearCurrent();
-    FatalGLError("Unable to initialize GLEW on shared context.");
-    return nullptr;
-  }
-  if (wglewInit() != GLEW_OK) {
-    new_context->ClearCurrent();
-    FatalGLError("Unable to initialize WGLEW on shared context.");
-    return nullptr;
-  }
-
-  new_context->SetupDebugging();
-
-  if (!new_context->blitter_.Initialize()) {
-    FatalGLError("Unable to initialize blitter on shared context.");
-    return nullptr;
-  }
-
-  new_context->ClearCurrent();
-
-  return new_context;
-}
+GLContext::~GLContext() {}
 
 void GLContext::AssertExtensionsPresent() {
   if (!MakeCurrent()) {
@@ -436,40 +214,6 @@ ImmediateDrawer* GLContext::immediate_drawer() {
   return immediate_drawer_.get();
 }
 
-bool GLContext::is_current() {
-  return tls_glew_context_ == glew_context_.get();
-}
-
-bool GLContext::MakeCurrent() {
-  SCOPE_profile_cpu_f("gpu");
-  if (FLAGS_thread_safe_gl) {
-    global_gl_mutex_.lock();
-  }
-
-  if (!wglMakeCurrent(dc_, glrc_)) {
-    if (FLAGS_thread_safe_gl) {
-      global_gl_mutex_.unlock();
-    }
-    FatalGLError("Unable to make GL context current.");
-    return false;
-  }
-  tls_glew_context_ = glew_context_.get();
-  tls_wglew_context_ = wglew_context_.get();
-  return true;
-}
-
-void GLContext::ClearCurrent() {
-  if (!FLAGS_disable_gl_context_reset) {
-    wglMakeCurrent(nullptr, nullptr);
-  }
-  tls_glew_context_ = nullptr;
-  tls_wglew_context_ = nullptr;
-
-  if (FLAGS_thread_safe_gl) {
-    global_gl_mutex_.unlock();
-  }
-}
-
 bool GLContext::WasLost() {
   if (!robust_access_supported_) {
     // Can't determine if we lost the context.
@@ -484,7 +228,7 @@ bool GLContext::WasLost() {
   if (status != GL_NO_ERROR) {
     // Graphics card reset.
     XELOGE("============= TDR detected on context %p! Context %s =============",
-           glrc_, status == GL_GUILTY_CONTEXT_RESET ? "guilty" : "innocent");
+           handle(), status == GL_GUILTY_CONTEXT_RESET ? "guilty" : "innocent");
     context_lost_ = true;
     return true;
   }
@@ -492,24 +236,6 @@ bool GLContext::WasLost() {
   return false;
 }
 
-void GLContext::BeginSwap() {
-  SCOPE_profile_cpu_i("gpu", "xe::ui::gl::GLContext::BeginSwap");
-  float clear_color[] = {238 / 255.0f, 238 / 255.0f, 238 / 255.0f, 1.0f};
-  if (FLAGS_random_clear_color) {
-    clear_color[0] =
-        rand() / static_cast<float>(RAND_MAX);  // NOLINT(runtime/threadsafe_fn)
-    clear_color[1] = 1.0f;
-    clear_color[2] = 0.0f;
-    clear_color[3] = 1.0f;
-  }
-  glClearNamedFramebufferfv(0, GL_COLOR, 0, clear_color);
-}
-
-void GLContext::EndSwap() {
-  SCOPE_profile_cpu_i("gpu", "xe::ui::gl::GLContext::EndSwap");
-  SwapBuffers(dc_);
-}
-
 std::unique_ptr<RawImage> GLContext::Capture() {
   GraphicsContextLock lock(this);
 

src/xenia/ui/gl/gl_context.h

@@ -13,6 +13,7 @@
 #include <gflags/gflags.h>
 
 #include <memory>
+#include <mutex>
 
 #include "xenia/ui/gl/blitter.h"
 #include "xenia/ui/gl/gl.h"
@@ -20,9 +21,13 @@
 
 DECLARE_bool(thread_safe_gl);
 
-// TODO(benvanik): hide Win32 stuff.
-typedef struct HDC__* HDC;
-typedef struct HGLRC__* HGLRC;
+DECLARE_bool(disable_gl_context_reset);
+
+DECLARE_bool(random_clear_color);
+
+DECLARE_bool(gl_debug);
+DECLARE_bool(gl_debug_output);
+DECLARE_bool(gl_debug_output_synchronous);
 
 namespace xe {
 namespace ui {
@@ -37,18 +42,33 @@ class GLContext : public GraphicsContext {
 
   ImmediateDrawer* immediate_drawer() override;
 
-  bool is_current() override;
-  bool MakeCurrent() override;
-  void ClearCurrent() override;
+  virtual bool is_current() override = 0;
+  virtual bool MakeCurrent() override = 0;
+  virtual void ClearCurrent() override = 0;
   bool WasLost() override;
 
-  void BeginSwap() override;
-  void EndSwap() override;
-
+  virtual void BeginSwap() override = 0;
+  virtual void EndSwap() override = 0;
   std::unique_ptr<RawImage> Capture() override;
 
   Blitter* blitter() { return &blitter_; }
 
+ protected:
+  Blitter blitter_;
+  std::unique_ptr<GLImmediateDrawer> immediate_drawer_;
+
+  static std::recursive_mutex global_gl_mutex_;
+  bool context_lost_ = false;
+  bool robust_access_supported_ = false;
+  static void FatalGLError(std::string error);
+  virtual bool Initialize(GLContext* share_context) = 0;
+  virtual void* handle() = 0;
+  GLContext(GraphicsProvider* provider, Window* target_window);
+  void SetupDebugging();
+  void AssertExtensionsPresent();
+  void DebugMessage(GLenum source, GLenum type, GLuint id, GLenum severity,
+                    GLsizei length, const GLchar* message);
+
  private:
   friend class GLProvider;
 
@@ -59,31 +79,11 @@ class GLContext : public GraphicsContext {
                                                     GLContext* parent_context);
 
  private:
-  GLContext(GraphicsProvider* provider, Window* target_window);
-
-  bool Initialize(GLContext* share_context);
-  void AssertExtensionsPresent();
-
-  void SetupDebugging();
-  void DebugMessage(GLenum source, GLenum type, GLuint id, GLenum severity,
-                    GLsizei length, const GLchar* message);
   static void GLAPIENTRY DebugMessageThunk(GLenum source, GLenum type,
                                            GLuint id, GLenum severity,
                                            GLsizei length,
                                            const GLchar* message,
                                            GLvoid* user_param);
-
-  HDC dc_ = nullptr;
-  HGLRC glrc_ = nullptr;
-
-  std::unique_ptr<GLEWContext> glew_context_;
-  std::unique_ptr<WGLEWContext> wglew_context_;
-
-  Blitter blitter_;
-  std::unique_ptr<GLImmediateDrawer> immediate_drawer_;
-
-  bool context_lost_ = false;
-  bool robust_access_supported_ = false;
 };
 
 }  // namespace gl

src/xenia/ui/gl/gl_context_win.cc

@@ -0,0 +1,315 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2014 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#include "xenia/ui/gl/gl_context_win.h"
+
+#include <gflags/gflags.h>
+
+#include <mutex>
+#include <string>
+
+#include "xenia/base/assert.h"
+#include "xenia/base/logging.h"
+#include "xenia/base/math.h"
+#include "xenia/base/platform_win.h"
+#include "xenia/base/profiling.h"
+#include "xenia/ui/gl/gl_immediate_drawer.h"
+#include "xenia/ui/window.h"
+
+#include "third_party/GL/wglew.h"
+
+namespace xe {
+namespace ui {
+namespace gl {
+
+thread_local GLEWContext* tls_glew_context_ = nullptr;
+thread_local WGLEWContext* tls_wglew_context_ = nullptr;
+extern "C" GLEWContext* glewGetContext() { return tls_glew_context_; }
+extern "C" WGLEWContext* wglewGetContext() { return tls_wglew_context_; }
+
+std::unique_ptr<GLContext> GLContext::Create(GraphicsProvider* provider,
+                                             Window* target_window,
+                                             GLContext* share_context) {
+  auto context =
+      std::unique_ptr<GLContext>(new WGLContext(provider, target_window));
+  if (!context->Initialize(share_context)) {
+    return nullptr;
+  }
+  context->AssertExtensionsPresent();
+  return context;
+}
+
+std::unique_ptr<GLContext> GLContext::CreateOffscreen(
+    GraphicsProvider* provider, GLContext* parent_context) {
+  return WGLContext::CreateOffscreen(provider,
+                                     static_cast<WGLContext*>(parent_context));
+}
+
+WGLContext::WGLContext(GraphicsProvider* provider, Window* target_window)
+    : GLContext(provider, target_window) {
+  glew_context_.reset(new GLEWContext());
+  wglew_context_.reset(new WGLEWContext());
+}
+
+WGLContext::~WGLContext() {
+  MakeCurrent();
+  blitter_.Shutdown();
+  immediate_drawer_.reset();
+  ClearCurrent();
+  if (glrc_) {
+    wglDeleteContext(glrc_);
+  }
+  if (dc_) {
+    ReleaseDC(HWND(target_window_->native_handle()), dc_);
+  }
+}
+
+bool WGLContext::Initialize(GLContext* share_context_) {
+  WGLContext* share_context = static_cast<WGLContext*>(share_context_);
+  dc_ = GetDC(HWND(target_window_->native_handle()));
+
+  PIXELFORMATDESCRIPTOR pfd = {0};
+  pfd.nSize = sizeof(pfd);
+  pfd.nVersion = 1;
+  pfd.dwFlags = PFD_DOUBLEBUFFER | PFD_SUPPORT_OPENGL | PFD_DRAW_TO_WINDOW;
+  pfd.iPixelType = PFD_TYPE_RGBA;
+  pfd.cColorBits = 32;
+  pfd.cDepthBits = 32;
+  pfd.iLayerType = PFD_MAIN_PLANE;
+  int pixel_format = ChoosePixelFormat(dc_, &pfd);
+  if (!pixel_format) {
+    FatalGLError("Unable to choose pixel format.");
+    return false;
+  }
+  if (!SetPixelFormat(dc_, pixel_format, &pfd)) {
+    FatalGLError("Unable to set pixel format.");
+    return false;
+  }
+
+  HGLRC temp_context = wglCreateContext(dc_);
+  if (!temp_context) {
+    FatalGLError("Unable to create temporary GL context.");
+    return false;
+  }
+  wglMakeCurrent(dc_, temp_context);
+
+  tls_glew_context_ = glew_context_.get();
+  tls_wglew_context_ = wglew_context_.get();
+  if (glewInit() != GLEW_OK) {
+    FatalGLError("Unable to initialize GLEW.");
+    return false;
+  }
+  if (wglewInit() != GLEW_OK) {
+    FatalGLError("Unable to initialize WGLEW.");
+    return false;
+  }
+
+  if (!WGLEW_ARB_create_context) {
+    FatalGLError("WGL_ARG_create_context not supported by GL ICD.");
+    return false;
+  }
+
+  if (GLEW_ARB_robustness) {
+    robust_access_supported_ = true;
+  }
+
+  int context_flags = 0;
+  if (FLAGS_gl_debug) {
+    context_flags |= WGL_CONTEXT_DEBUG_BIT_ARB;
+  }
+  if (robust_access_supported_) {
+    context_flags |= WGL_CONTEXT_ROBUST_ACCESS_BIT_ARB;
+  }
+
+  int attrib_list[] = {
+      WGL_CONTEXT_MAJOR_VERSION_ARB,
+      4,
+      WGL_CONTEXT_MINOR_VERSION_ARB,
+      5,
+      WGL_CONTEXT_FLAGS_ARB,
+      context_flags,
+      WGL_CONTEXT_PROFILE_MASK_ARB,
+      WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB,
+      WGL_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB,
+      robust_access_supported_ ? WGL_LOSE_CONTEXT_ON_RESET_ARB : 0,
+      0};
+
+  glrc_ = wglCreateContextAttribsARB(
+      dc_, share_context ? share_context->glrc_ : nullptr, attrib_list);
+  wglMakeCurrent(nullptr, nullptr);
+  wglDeleteContext(temp_context);
+  if (!glrc_) {
+    FatalGLError("Unable to create real GL context.");
+    return false;
+  }
+
+  if (!MakeCurrent()) {
+    FatalGLError("Could not make real GL context current.");
+    return false;
+  }
+
+  XELOGI("Successfully created OpenGL context:");
+  XELOGI("  GL_VENDOR: %s", glGetString(GL_VENDOR));
+  XELOGI("  GL_VERSION: %s", glGetString(GL_VERSION));
+  XELOGI("  GL_RENDERER: %s", glGetString(GL_RENDERER));
+  XELOGI("  GL_SHADING_LANGUAGE_VERSION: %s",
+         glGetString(GL_SHADING_LANGUAGE_VERSION));
+
+  while (glGetError()) {
+    // Clearing errors.
+  }
+
+  SetupDebugging();
+
+  if (!blitter_.Initialize()) {
+    FatalGLError("Unable to initialize blitter.");
+    ClearCurrent();
+    return false;
+  }
+
+  immediate_drawer_ = std::make_unique<GLImmediateDrawer>(this);
+
+  ClearCurrent();
+
+  return true;
+}
+
+std::unique_ptr<WGLContext> WGLContext::CreateOffscreen(
+    GraphicsProvider* provider, WGLContext* parent_context) {
+  assert_not_null(parent_context->glrc_);
+
+  HGLRC new_glrc = nullptr;
+  {
+    GraphicsContextLock context_lock(parent_context);
+
+    int context_flags = 0;
+    if (FLAGS_gl_debug) {
+      context_flags |= WGL_CONTEXT_DEBUG_BIT_ARB;
+    }
+
+    bool robust_access_supported = parent_context->robust_access_supported_;
+    if (robust_access_supported) {
+      context_flags |= WGL_CONTEXT_ROBUST_ACCESS_BIT_ARB;
+    }
+
+    int attrib_list[] = {
+        WGL_CONTEXT_MAJOR_VERSION_ARB,
+        4,
+        WGL_CONTEXT_MINOR_VERSION_ARB,
+        5,
+        WGL_CONTEXT_FLAGS_ARB,
+        context_flags,
+        WGL_CONTEXT_PROFILE_MASK_ARB,
+        WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB,
+        WGL_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB,
+        robust_access_supported ? WGL_LOSE_CONTEXT_ON_RESET_ARB : 0,
+        0};
+    new_glrc = wglCreateContextAttribsARB(parent_context->dc_,
+                                          parent_context->glrc_, attrib_list);
+    if (!new_glrc) {
+      FatalGLError("Could not create shared context.");
+      return nullptr;
+    }
+  }
+
+  auto new_context = std::unique_ptr<WGLContext>(
+      new WGLContext(provider, parent_context->target_window_));
+  new_context->glrc_ = new_glrc;
+  new_context->dc_ =
+      GetDC(HWND(parent_context->target_window_->native_handle()));
+  new_context->robust_access_supported_ =
+      parent_context->robust_access_supported_;
+  if (!new_context->MakeCurrent()) {
+    FatalGLError("Could not make new GL context current.");
+    return nullptr;
+  }
+  if (!glGetString(GL_EXTENSIONS)) {
+    new_context->ClearCurrent();
+    FatalGLError("New GL context did not have extensions.");
+    return nullptr;
+  }
+
+  if (glewInit() != GLEW_OK) {
+    new_context->ClearCurrent();
+    FatalGLError("Unable to initialize GLEW on shared context.");
+    return nullptr;
+  }
+  if (wglewInit() != GLEW_OK) {
+    new_context->ClearCurrent();
+    FatalGLError("Unable to initialize WGLEW on shared context.");
+    return nullptr;
+  }
+
+  new_context->SetupDebugging();
+
+  if (!new_context->blitter_.Initialize()) {
+    FatalGLError("Unable to initialize blitter on shared context.");
+    return nullptr;
+  }
+
+  new_context->ClearCurrent();
+
+  return new_context;
+}
+
+bool WGLContext::is_current() {
+  return tls_glew_context_ == glew_context_.get();
+}
+
+bool WGLContext::MakeCurrent() {
+  SCOPE_profile_cpu_f("gpu");
+  if (FLAGS_thread_safe_gl) {
+    global_gl_mutex_.lock();
+  }
+
+  if (!wglMakeCurrent(dc_, glrc_)) {
+    if (FLAGS_thread_safe_gl) {
+      global_gl_mutex_.unlock();
+    }
+    FatalGLError("Unable to make GL context current.");
+    return false;
+  }
+  tls_glew_context_ = glew_context_.get();
+  tls_wglew_context_ = wglew_context_.get();
+  return true;
+}
+
+void WGLContext::ClearCurrent() {
+  if (!FLAGS_disable_gl_context_reset) {
+    wglMakeCurrent(nullptr, nullptr);
+  }
+  tls_glew_context_ = nullptr;
+  tls_wglew_context_ = nullptr;
+
+  if (FLAGS_thread_safe_gl) {
+    global_gl_mutex_.unlock();
+  }
+}
+
+void WGLContext::BeginSwap() {
+  SCOPE_profile_cpu_i("gpu", "xe::ui::gl::WGLContext::BeginSwap");
+  float clear_color[] = {238 / 255.0f, 238 / 255.0f, 238 / 255.0f, 1.0f};
+  if (FLAGS_random_clear_color) {
+    clear_color[0] =
+        rand() / static_cast<float>(RAND_MAX);  // NOLINT(runtime/threadsafe_fn)
+    clear_color[1] = 1.0f;
+    clear_color[2] = 0.0f;
+    clear_color[3] = 1.0f;
+  }
+  glClearNamedFramebufferfv(0, GL_COLOR, 0, clear_color);
+}
+
+void WGLContext::EndSwap() {
+  SCOPE_profile_cpu_i("gpu", "xe::ui::gl::WGLContext::EndSwap");
+  SwapBuffers(dc_);
+}
+
+}  // namespace gl
+}  // namespace ui
+}  // namespace xe

src/xenia/ui/gl/gl_context_win.h

@@ -0,0 +1,64 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2014 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#ifndef XENIA_UI_GL_WGL_CONTEXT_H_
+#define XENIA_UI_GL_WGL_CONTEXT_H_
+
+#include <gflags/gflags.h>
+
+#include <memory>
+
+#include "xenia/ui/gl/blitter.h"
+#include "xenia/ui/gl/gl.h"
+#include "xenia/ui/gl/gl_context.h"
+#include "xenia/ui/graphics_context.h"
+
+typedef struct HDC__* HDC;
+typedef struct HGLRC__* HGLRC;
+
+namespace xe {
+namespace ui {
+namespace gl {
+
+class GLImmediateDrawer;
+class GLProvider;
+
+class WGLContext : public GLContext {
+ public:
+  ~WGLContext() override;
+
+  bool is_current() override;
+  bool MakeCurrent() override;
+  void ClearCurrent() override;
+
+  void BeginSwap() override;
+  void EndSwap() override;
+
+ protected:
+  friend class GLContext;
+  WGLContext(GraphicsProvider* provider, Window* target_window);
+  static std::unique_ptr<WGLContext> CreateOffscreen(
+      GraphicsProvider* provider, WGLContext* parent_context);
+
+  bool Initialize(GLContext* share_context) override;
+  void* handle() override { return glrc_; }
+
+ private:
+  HDC dc_ = nullptr;
+  HGLRC glrc_ = nullptr;
+
+  std::unique_ptr<GLEWContext> glew_context_;
+  std::unique_ptr<WGLEWContext> wglew_context_;
+};
+
+}  // namespace gl
+}  // namespace ui
+}  // namespace xe
+
+#endif  // XENIA_UI_GL_GL_CONTEXT_H_

src/xenia/ui/gl/gl_context_x11.cc

@@ -0,0 +1,323 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2014 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#include "xenia/ui/gl/gl_context_x11.h"
+
+#include <gflags/gflags.h>
+
+#include <gdk/gdkx.h>
+#include <mutex>
+#include <string>
+
+#include "third_party/GL/glxew.h"
+#include "xenia/base/assert.h"
+#include "xenia/base/logging.h"
+#include "xenia/base/math.h"
+#include "xenia/base/platform_linux.h"
+#include "xenia/base/profiling.h"
+#include "xenia/ui/gl/gl_immediate_drawer.h"
+#include "xenia/ui/window.h"
+
+namespace xe {
+namespace ui {
+namespace gl {
+
+thread_local GLEWContext* tls_glew_context_ = nullptr;
+thread_local GLXEWContext* tls_glxew_context_ = nullptr;
+extern "C" GLEWContext* glewGetContext() { return tls_glew_context_; }
+extern "C" GLXEWContext* glxewGetContext() { return tls_glxew_context_; }
+
+std::unique_ptr<GLContext> GLContext::Create(GraphicsProvider* provider,
+                                             Window* target_window,
+                                             GLContext* share_context) {
+  auto context =
+      std::unique_ptr<GLContext>(new GLXContext(provider, target_window));
+  if (!context->Initialize(share_context)) {
+    return nullptr;
+  }
+  context->AssertExtensionsPresent();
+  return context;
+}
+
+std::unique_ptr<GLContext> GLContext::CreateOffscreen(
+    GraphicsProvider* provider, GLContext* parent_context) {
+  return GLXContext::CreateOffscreen(provider,
+                                     static_cast<GLXContext*>(parent_context));
+}
+
+GLXContext::GLXContext(GraphicsProvider* provider, Window* target_window)
+    : GLContext(provider, target_window) {
+  glew_context_.reset(new GLEWContext());
+  glxew_context_.reset(new GLXEWContext());
+}
+
+GLXContext::~GLXContext() {
+  MakeCurrent();
+  blitter_.Shutdown();
+  immediate_drawer_.reset();
+  ClearCurrent();
+  if (glx_context_) {
+    glXDestroyContext(disp_, glx_context_);
+  }
+  if (draw_area_) {
+    gtk_widget_destroy(draw_area_);
+  }
+}
+
+bool GLXContext::Initialize(GLContext* share_context) {
+  GtkWidget* window = GTK_WIDGET(target_window_->native_handle());
+  GtkWidget* draw_area = gtk_drawing_area_new();
+  int32_t width;
+  int32_t height;
+  gtk_window_get_size(GTK_WINDOW(window), &width, &height);
+  gtk_widget_set_size_request(draw_area, width, height);
+  gtk_container_add(GTK_CONTAINER(window), draw_area);
+  GdkVisual* visual = gdk_screen_get_system_visual(gdk_screen_get_default());
+
+  GdkDisplay* gdk_display = gtk_widget_get_display(window);
+  Display* display = gdk_x11_display_get_xdisplay(gdk_display);
+  disp_ = display;
+  ::Window root = gdk_x11_get_default_root_xwindow();
+  static int vis_attrib_list[] = {GLX_RGBA, GLX_DEPTH_SIZE, 24,
+                                  GLX_DOUBLEBUFFER, None};
+  XVisualInfo* vi = glXChooseVisual(display, 0, vis_attrib_list);
+  if (vi == NULL) {
+    FatalGLError("No matching visuals for X display");
+    return false;
+  }
+
+  cmap_ = XCreateColormap(display, root, vi->visual, AllocNone);
+
+  ::GLXContext temp_context = glXCreateContext(display, vi, NULL, GL_TRUE);
+  if (!temp_context) {
+    FatalGLError("Unable to create temporary GLX context");
+    return false;
+  }
+  xid_ = GDK_WINDOW_XID(gtk_widget_get_window(window));
+  glXMakeCurrent(display, xid_, temp_context);
+
+  tls_glew_context_ = glew_context_.get();
+  tls_glxew_context_ = glxew_context_.get();
+  if (glewInit() != GLEW_OK) {
+    FatalGLError("Unable to initialize GLEW.");
+    return false;
+  }
+  if (glxewInit() != GLEW_OK) {
+    FatalGLError("Unable to initialize GLXEW.");
+    return false;
+  }
+
+  if (!GLXEW_ARB_create_context) {
+    FatalGLError("GLX_ARB_create_context not supported by GL ICD.");
+    return false;
+  }
+
+  if (GLEW_ARB_robustness) {
+    robust_access_supported_ = true;
+  }
+
+  int context_flags = 0;
+  if (FLAGS_gl_debug) {
+    context_flags |= GLX_CONTEXT_DEBUG_BIT_ARB;
+  }
+  if (robust_access_supported_) {
+    context_flags |= GLX_CONTEXT_ROBUST_ACCESS_BIT_ARB;
+  }
+
+  int attrib_list[] = {
+      GLX_CONTEXT_MAJOR_VERSION_ARB,
+      4,
+      GLX_CONTEXT_MINOR_VERSION_ARB,
+      5,
+      GLX_CONTEXT_FLAGS_ARB,
+      context_flags,
+      GLX_CONTEXT_PROFILE_MASK_ARB,
+      GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB,
+      GLX_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB,
+      robust_access_supported_ ? GLX_LOSE_CONTEXT_ON_RESET_ARB : 0,
+      0};
+  GLXContext* share_context_glx = static_cast<GLXContext*>(share_context);
+  glx_context_ = glXCreateContextAttribsARB(
+      display, nullptr,
+      share_context ? share_context_glx->glx_context_ : nullptr, True,
+      attrib_list);
+  glXMakeCurrent(display, 0, nullptr);
+  glXDestroyContext(display, temp_context);
+  if (!glx_context_) {
+    FatalGLError("Unable to create real GL context.");
+    return false;
+  }
+
+  if (!MakeCurrent()) {
+    FatalGLError("Could not make real GL context current.");
+    return false;
+  }
+
+  XELOGI("Successfully created OpenGL context:");
+  XELOGI("  GL_VENDOR: %s", glGetString(GL_VENDOR));
+  XELOGI("  GL_VERSION: %s", glGetString(GL_VERSION));
+  XELOGI("  GL_RENDERER: %s", glGetString(GL_RENDERER));
+  XELOGI("  GL_SHADING_LANGUAGE_VERSION: %s",
+         glGetString(GL_SHADING_LANGUAGE_VERSION));
+
+  while (glGetError()) {
+    // Clearing errors.
+  }
+
+  SetupDebugging();
+
+  if (!blitter_.Initialize()) {
+    FatalGLError("Unable to initialize blitter.");
+    ClearCurrent();
+    return false;
+  }
+
+  immediate_drawer_ = std::make_unique<GLImmediateDrawer>(this);
+
+  ClearCurrent();
+
+  return true;
+}
+
+std::unique_ptr<GLXContext> GLXContext::CreateOffscreen(
+    GraphicsProvider* provider, GLXContext* parent_context) {
+  assert_not_null(parent_context->glx_context_);
+
+  ::GLXContext new_glrc;
+  {
+    GraphicsContextLock context_lock(parent_context);
+
+    int context_flags = 0;
+    if (FLAGS_gl_debug) {
+      context_flags |= GLX_CONTEXT_DEBUG_BIT_ARB;
+    }
+
+    bool robust_access_supported = parent_context->robust_access_supported_;
+    if (robust_access_supported) {
+      context_flags |= GLX_CONTEXT_ROBUST_ACCESS_BIT_ARB;
+    }
+
+    int attrib_list[] = {
+        GLX_CONTEXT_MAJOR_VERSION_ARB,
+        4,
+        GLX_CONTEXT_MINOR_VERSION_ARB,
+        5,
+        GLX_CONTEXT_FLAGS_ARB,
+        context_flags,
+        GLX_CONTEXT_PROFILE_MASK_ARB,
+        GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB,
+        GLX_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB,
+        robust_access_supported ? GLX_LOSE_CONTEXT_ON_RESET_ARB : 0,
+        0};
+    new_glrc = glXCreateContextAttribsARB(parent_context->disp_, nullptr,
+                                          parent_context->glx_context_, True,
+                                          attrib_list);
+    if (!new_glrc) {
+      FatalGLError("Could not create shared context.");
+      return nullptr;
+    }
+  }
+
+  auto new_context = std::unique_ptr<GLXContext>(
+      new GLXContext(provider, parent_context->target_window_));
+  new_context->glx_context_ = new_glrc;
+  new_context->window_ = parent_context->window_;
+  new_context->draw_area_ = parent_context->draw_area_;
+  new_context->disp_ = parent_context->disp_;
+  new_context->xid_ = parent_context->xid_;
+  new_context->robust_access_supported_ =
+      parent_context->robust_access_supported_;
+  if (!new_context->MakeCurrent()) {
+    FatalGLError("Could not make new GL context current.");
+    return nullptr;
+  }
+  if (!glGetString(GL_EXTENSIONS)) {
+    new_context->ClearCurrent();
+    FatalGLError("New GL context did not have extensions.");
+    return nullptr;
+  }
+
+  if (glewInit() != GLEW_OK) {
+    new_context->ClearCurrent();
+    FatalGLError("Unable to initialize GLEW on shared context.");
+    return nullptr;
+  }
+  if (glxewInit() != GLEW_OK) {
+    new_context->ClearCurrent();
+    FatalGLError("Unable to initialize GLXEW on shared context.");
+    return nullptr;
+  }
+
+  new_context->SetupDebugging();
+
+  if (!new_context->blitter_.Initialize()) {
+    FatalGLError("Unable to initialize blitter on shared context.");
+    return nullptr;
+  }
+
+  new_context->ClearCurrent();
+
+  return new_context;
+}
+
+bool GLXContext::is_current() {
+  return tls_glew_context_ == glew_context_.get();
+}
+
+bool GLXContext::MakeCurrent() {
+  SCOPE_profile_cpu_f("gpu");
+  if (FLAGS_thread_safe_gl) {
+    global_gl_mutex_.lock();
+  }
+
+  if (!glXMakeCurrent(disp_, xid_, glx_context_)) {
+    if (FLAGS_thread_safe_gl) {
+      global_gl_mutex_.unlock();
+    }
+    FatalGLError("Unable to make GL context current.");
+    return false;
+  }
+  tls_glew_context_ = glew_context_.get();
+  tls_glxew_context_ = glxew_context_.get();
+  return true;
+}
+
+void GLXContext::ClearCurrent() {
+  if (!FLAGS_disable_gl_context_reset) {
+    glXMakeCurrent(disp_, 0, nullptr);
+  }
+  tls_glew_context_ = nullptr;
+  tls_glxew_context_ = nullptr;
+
+  if (FLAGS_thread_safe_gl) {
+    global_gl_mutex_.unlock();
+  }
+}
+
+void GLXContext::BeginSwap() {
+  SCOPE_profile_cpu_i("gpu", "xe::ui::gl::GLXContext::BeginSwap");
+  float clear_color[] = {238 / 255.0f, 238 / 255.0f, 238 / 255.0f, 1.0f};
+  if (FLAGS_random_clear_color) {
+    clear_color[0] =
+        rand() / static_cast<float>(RAND_MAX);  // NOLINT(runtime/threadsafe_fn)
+    clear_color[1] = 1.0f;
+    clear_color[2] = 0.0f;
+    clear_color[3] = 1.0f;
+  }
+  glClearNamedFramebufferfv(0, GL_COLOR, 0, clear_color);
+}
+
+void GLXContext::EndSwap() {
+  SCOPE_profile_cpu_i("gpu", "xe::ui::gl::GLXContext::EndSwap");
+  glXSwapBuffers(disp_, xid_);
+}
+
+}  // namespace gl
+}  // namespace ui
+}  // namespace xe

src/xenia/ui/gl/gl_context_x11.h

@@ -0,0 +1,69 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2014 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#ifndef XENIA_UI_GL_GLX_CONTEXT_H_
+#define XENIA_UI_GL_GLX_CONTEXT_H_
+
+#include <gflags/gflags.h>
+
+#include <memory>
+
+#include "third_party/GL/glxew.h"
+#include "xenia/base/platform_linux.h"
+#include "xenia/ui/gl/blitter.h"
+#include "xenia/ui/gl/gl.h"
+#include "xenia/ui/gl/gl_context.h"
+#include "xenia/ui/graphics_context.h"
+
+DECLARE_bool(thread_safe_gl);
+
+namespace xe {
+namespace ui {
+namespace gl {
+
+class GLImmediateDrawer;
+class GLProvider;
+
+class GLXContext : public GLContext {
+ public:
+  ~GLXContext() override;
+
+  bool is_current() override;
+
+  bool MakeCurrent() override;
+  void ClearCurrent() override;
+
+  void BeginSwap() override;
+  void EndSwap() override;
+
+ protected:
+  static std::unique_ptr<GLXContext> CreateOffscreen(
+      GraphicsProvider* provider, GLXContext* parent_context);
+
+  bool Initialize(GLContext* share_context) override;
+  void* handle() override { return glx_context_; }
+
+ private:
+  friend class GLContext;
+  GLXContext(GraphicsProvider* provider, Window* target_window);
+  std::unique_ptr<GLEWContext> glew_context_;
+  std::unique_ptr<GLXEWContext> glxew_context_;
+  ::GLXContext glx_context_;
+  GtkWidget* window_;
+  GtkWidget* draw_area_;
+  Colormap cmap_;
+  Display* disp_;
+  int xid_;
+};
+
+}  // namespace gl
+}  // namespace ui
+}  // namespace xe
+
+#endif  // XENIA_UI_GL_GL_CONTEXT_H_

src/xenia/ui/imgui_drawer.cc

@@ -143,7 +143,8 @@ void ImGuiDrawer::SetupFont() {
   font_config.OversampleH = font_config.OversampleV = 1;
   font_config.PixelSnapH = true;
   static const ImWchar font_glyph_ranges[] = {
-      0x0020, 0x00FF,  // Basic Latin + Latin Supplement
+      0x0020,
+      0x00FF,  // Basic Latin + Latin Supplement
       0,
   };
   io.Fonts->AddFontFromMemoryCompressedBase85TTF(

src/xenia/ui/loop_gtk.cc

@@ -0,0 +1,78 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2016 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#include "xenia/ui/loop_gtk.h"
+
+#include "xenia/base/assert.h"
+
+namespace xe {
+namespace ui {
+
+class PostedFn {
+ public:
+  explicit PostedFn(std::function<void()> fn) : fn_(std::move(fn)) {}
+  void Call() { fn_(); }
+
+ private:
+  std::function<void()> fn_;
+};
+
+std::unique_ptr<Loop> Loop::Create() { return std::make_unique<GTKLoop>(); }
+
+GTKLoop::GTKLoop() : thread_id_() {
+  gtk_init(nullptr, nullptr);
+  xe::threading::Fence init_fence;
+  thread_ = std::thread([&init_fence, this]() {
+    xe::threading::set_name("GTK Loop");
+
+    thread_id_ = std::this_thread::get_id();
+    init_fence.Signal();
+
+    ThreadMain();
+
+    quit_fence_.Signal();
+  });
+  init_fence.Wait();
+}
+
+GTKLoop::~GTKLoop() {
+  Quit();
+  thread_.join();
+}
+
+void GTKLoop::ThreadMain() { gtk_main(); }
+
+bool GTKLoop::is_on_loop_thread() {
+  return thread_id_ == std::this_thread::get_id();
+}
+
+gboolean _posted_fn_thunk(gpointer posted_fn) {
+  PostedFn* Fn = reinterpret_cast<PostedFn*>(posted_fn);
+  Fn->Call();
+  return G_SOURCE_REMOVE;
+}
+
+void GTKLoop::Post(std::function<void()> fn) {
+  assert_true(thread_id_ != std::thread::id());
+  gdk_threads_add_idle(_posted_fn_thunk,
+                       reinterpret_cast<gpointer>(new PostedFn(std::move(fn))));
+}
+
+void GTKLoop::PostDelayed(std::function<void()> fn, uint64_t delay_millis) {
+  gdk_threads_add_timeout(
+      delay_millis, _posted_fn_thunk,
+      reinterpret_cast<gpointer>(new PostedFn(std::move(fn))));
+}
+
+void GTKLoop::Quit() { assert_true(thread_id_ != std::thread::id()); }
+
+void GTKLoop::AwaitQuit() { quit_fence_.Wait(); }
+
+}  // namespace ui
+}  // namespace xe

src/xenia/ui/loop_gtk.h

@@ -0,0 +1,50 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2016 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#ifndef XENIA_UI_LOOP_GTK_H_
+#define XENIA_UI_LOOP_GTK_H_
+
+#include <list>
+#include <mutex>
+#include <thread>
+
+#include "xenia/base/platform_linux.h"
+#include "xenia/base/threading.h"
+#include "xenia/ui/loop.h"
+
+namespace xe {
+namespace ui {
+
+class GTKWindow;
+
+class GTKLoop : public Loop {
+ public:
+  GTKLoop();
+  ~GTKLoop() override;
+
+  bool is_on_loop_thread() override;
+
+  void Post(std::function<void()> fn) override;
+  void PostDelayed(std::function<void()> fn, uint64_t delay_millis) override;
+
+  void Quit() override;
+  void AwaitQuit() override;
+
+ private:
+  void ThreadMain();
+
+  std::thread::id thread_id_;
+  std::thread thread_;
+  xe::threading::Fence quit_fence_;
+};
+
+}  // namespace ui
+}  // namespace xe
+
+#endif  // XENIA_UI_LOOP_GTK_H_

src/xenia/ui/menu_item.h

@@ -12,6 +12,7 @@
 
 #include <functional>
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "xenia/ui/ui_event.h"

src/xenia/ui/vulkan/blitter.cc

@@ -256,7 +256,10 @@ void Blitter::BlitTexture2D(VkCommandBuffer command_buffer, VkFence fence,
     vkCmdSetViewport(command_buffer, 0, 1, &viewport);
 
     VkRect2D scissor = {
-        dst_offset.x, dst_offset.y, dst_extents.width, dst_extents.height,
+        dst_offset.x,
+        dst_offset.y,
+        dst_extents.width,
+        dst_extents.height,
     };
     vkCmdSetScissor(command_buffer, 0, 1, &scissor);
 
@@ -305,7 +308,10 @@ void Blitter::BlitTexture2D(VkCommandBuffer command_buffer, VkFence fence,
                        &vtx_constants);
 
     PixPushConstants pix_constants = {
-        0, 0, 0, swap_channels ? 1 : 0,
+        0,
+        0,
+        0,
+        swap_channels ? 1 : 0,
     };
     vkCmdPushConstants(command_buffer, pipeline_layout_,
                        VK_SHADER_STAGE_FRAGMENT_BIT, sizeof(VtxPushConstants),
@@ -540,7 +546,8 @@ VkPipeline Blitter::CreatePipeline(VkRenderPass render_pass,
   dynamic_state_info.pNext = nullptr;
   dynamic_state_info.flags = 0;
   VkDynamicState dynamic_states[] = {
-      VK_DYNAMIC_STATE_VIEWPORT, VK_DYNAMIC_STATE_SCISSOR,
+      VK_DYNAMIC_STATE_VIEWPORT,
+      VK_DYNAMIC_STATE_SCISSOR,
   };
   dynamic_state_info.dynamicStateCount =
       static_cast<uint32_t>(xe::countof(dynamic_states));

src/xenia/ui/vulkan/vulkan.h

@@ -16,6 +16,8 @@
 
 #if XE_PLATFORM_WIN32
 #define VK_USE_PLATFORM_WIN32_KHR 1
+#elif XE_PLATFORM_LINUX
+#define VK_USE_PLATFORM_XCB_KHR 1
 #else
 #error Platform not yet supported.
 #endif  // XE_PLATFORM_WIN32

src/xenia/ui/vulkan/vulkan_context.cc

@@ -2,7 +2,7 @@
  ******************************************************************************
  * Xenia : Xbox 360 Emulator Research Project                                 *
  ******************************************************************************
- * Copyright 2016 Ben Vanik. All rights reserved.                             *
+ * Copyright 2017 Ben Vanik. All rights reserved.                             *
  * Released under the BSD license - see LICENSE in the root for more details. *
  ******************************************************************************
  */
@@ -25,6 +25,10 @@
 #include "xenia/ui/vulkan/vulkan_util.h"
 #include "xenia/ui/window.h"
 
+#if XE_PLATFORM_LINUX
+#include "xenia/ui/window_gtk.h"
+#endif
+
 namespace xe {
 namespace ui {
 namespace vulkan {
@@ -61,6 +65,29 @@ bool VulkanContext::Initialize() {
     auto err = vkCreateWin32SurfaceKHR(*provider->instance(), &create_info,
                                        nullptr, &surface);
     CheckResult(err, "vkCreateWin32SurfaceKHR");
+#elif XE_PLATFORM_LINUX
+#ifdef GDK_WINDOWING_X11
+    GtkWidget* window_handle =
+        static_cast<GtkWidget*>(target_window_->native_handle());
+    GdkDisplay* gdk_display = gtk_widget_get_display(window_handle);
+    assert(GDK_IS_X11_DISPLAY(gdk_display));
+    xcb_connection_t* connection =
+        XGetXCBConnection(gdk_x11_display_get_xdisplay(gdk_display));
+    xcb_window_t window =
+        gdk_x11_window_get_xid(gtk_widget_get_window(window_handle));
+    VkXcbSurfaceCreateInfoKHR create_info;
+    create_info.sType = VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR;
+    create_info.pNext = nullptr;
+    create_info.flags = 0;
+    create_info.connection = static_cast<xcb_connection_t*>(
+        target_window_->native_platform_handle());
+    create_info.window = static_cast<xcb_window_t>(window);
+    auto err = vkCreateXcbSurfaceKHR(*provider->instance(), &create_info,
+                                     nullptr, &surface);
+    CheckResult(err, "vkCreateXcbSurfaceKHR");
+#else
+#error Unsupported GDK Backend on Linux.
+#endif  // GDK_WINDOWING_X11
 #else
 #error Platform not yet implemented.
 #endif  // XE_PLATFORM_WIN32

src/xenia/ui/vulkan/vulkan_device.cc

@@ -2,7 +2,7 @@
  ******************************************************************************
  * Xenia : Xbox 360 Emulator Research Project                                 *
  ******************************************************************************
- * Copyright 2016 Ben Vanik. All rights reserved.                             *
+ * Copyright 2017 Ben Vanik. All rights reserved.                             *
  * Released under the BSD license - see LICENSE in the root for more details. *
  ******************************************************************************
  */
@@ -12,6 +12,7 @@
 #include <gflags/gflags.h>
 
 #include <cinttypes>
+#include <climits>
 #include <mutex>
 #include <string>
 

src/xenia/ui/vulkan/vulkan_immediate_drawer.cc

@@ -224,7 +224,9 @@ class VulkanImmediateTexture : public ImmediateTexture {
     view_info.viewType = VK_IMAGE_VIEW_TYPE_2D;
     view_info.format = VK_FORMAT_R8G8B8A8_UNORM;
     view_info.components = {
-        VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_G, VK_COMPONENT_SWIZZLE_B,
+        VK_COMPONENT_SWIZZLE_R,
+        VK_COMPONENT_SWIZZLE_G,
+        VK_COMPONENT_SWIZZLE_B,
         VK_COMPONENT_SWIZZLE_A,
     };
     view_info.subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1};
@@ -597,7 +599,8 @@ VulkanImmediateDrawer::VulkanImmediateDrawer(VulkanContext* graphics_context)
   dynamic_state_info.pNext = nullptr;
   dynamic_state_info.flags = 0;
   VkDynamicState dynamic_states[] = {
-      VK_DYNAMIC_STATE_VIEWPORT, VK_DYNAMIC_STATE_SCISSOR,
+      VK_DYNAMIC_STATE_VIEWPORT,
+      VK_DYNAMIC_STATE_SCISSOR,
   };
   dynamic_state_info.dynamicStateCount =
       static_cast<uint32_t>(xe::countof(dynamic_states));

src/xenia/ui/vulkan/vulkan_instance.cc

@@ -2,7 +2,7 @@
  ******************************************************************************
  * Xenia : Xbox 360 Emulator Research Project                                 *
  ******************************************************************************
- * Copyright 2016 Ben Vanik. All rights reserved.                             *
+ * Copyright 2017 Ben Vanik. All rights reserved.                             *
  * Released under the BSD license - see LICENSE in the root for more details. *
  ******************************************************************************
  */
@@ -26,6 +26,10 @@
 #include "xenia/ui/vulkan/vulkan_util.h"
 #include "xenia/ui/window.h"
 
+#if XE_PLATFORM_LINUX
+#include "xenia/ui/window_gtk.h"
+#endif
+
 #define VK_API_VERSION VK_API_VERSION_1_0
 
 namespace xe {
@@ -385,6 +389,29 @@ bool VulkanInstance::QueryDevices(Window* any_target_window) {
     create_info.hwnd = static_cast<HWND>(any_target_window->native_handle());
     err = vkCreateWin32SurfaceKHR(handle, &create_info, nullptr, &any_surface);
     CheckResult(err, "vkCreateWin32SurfaceKHR");
+#elif XE_PLATFORM_LINUX
+#ifdef GDK_WINDOWING_X11
+    GtkWidget* window_handle =
+        static_cast<GtkWidget*>(any_target_window->native_handle());
+    GdkDisplay* gdk_display = gtk_widget_get_display(window_handle);
+    assert(GDK_IS_X11_DISPLAY(gdk_display));
+    xcb_connection_t* connection =
+        XGetXCBConnection(gdk_x11_display_get_xdisplay(gdk_display));
+    xcb_window_t window =
+        gdk_x11_window_get_xid(gtk_widget_get_window(window_handle));
+    VkXcbSurfaceCreateInfoKHR create_info;
+    create_info.sType = VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR;
+    create_info.pNext = nullptr;
+    create_info.flags = 0;
+    create_info.connection = static_cast<xcb_connection_t*>(
+        any_target_window->native_platform_handle());
+    create_info.window = static_cast<xcb_window_t>(window);
+    auto err =
+        vkCreateXcbSurfaceKHR(handle, &create_info, nullptr, &any_surface);
+    CheckResult(err, "vkCreateXcbSurfaceKHR");
+#else
+#error Unsupported GDK Backend on Linux.
+#endif  // GDK_WINDOWING_X11
 #else
 #error Platform not yet implemented.
 #endif  // XE_PLATFORM_WIN32

src/xenia/ui/window_demo.cc

@@ -15,7 +15,6 @@
 #include "xenia/base/clock.h"
 #include "xenia/base/logging.h"
 #include "xenia/base/main.h"
-#include "xenia/base/platform_win.h"
 #include "xenia/base/profiling.h"
 #include "xenia/base/threading.h"
 #include "xenia/ui/graphics_provider.h"