Merge branch 'master' into vulkan

src/xenia/ui/vulkan/premake5.lua

@@ -30,7 +30,7 @@ project("xenia-ui-window-vulkan-demo")
   files({
     "../window_demo.cc",
     "vulkan_window_demo.cc",
-    project_root.."/src/xenia/base/main_"..platform_suffix..".cc",
+    project_root.."/src/xenia/ui/windowed_app_main_"..platform_suffix..".cc",
   })
   resincludedirs({
     project_root,

src/xenia/ui/vulkan/vulkan_provider.cc

@@ -40,8 +40,8 @@ namespace xe {
 namespace ui {
 namespace vulkan {
 
-std::unique_ptr<VulkanProvider> VulkanProvider::Create(Window* main_window) {
-  std::unique_ptr<VulkanProvider> provider(new VulkanProvider(main_window));
+std::unique_ptr<VulkanProvider> VulkanProvider::Create() {
+  std::unique_ptr<VulkanProvider> provider(new VulkanProvider);
   if (!provider->Initialize()) {
     xe::FatalError(
         "Unable to initialize Vulkan graphics subsystem.\n"
@@ -57,9 +57,6 @@ std::unique_ptr<VulkanProvider> VulkanProvider::Create(Window* main_window) {
   return provider;
 }
 
-VulkanProvider::VulkanProvider(Window* main_window)
-    : GraphicsProvider(main_window) {}
-
 VulkanProvider::~VulkanProvider() {
   for (size_t i = 0; i < size_t(HostSampler::kCount); ++i) {
     if (host_samplers_[i] != VK_NULL_HANDLE) {

src/xenia/ui/vulkan/vulkan_provider.h

@@ -49,7 +49,7 @@ class VulkanProvider : public GraphicsProvider {
  public:
   ~VulkanProvider() override;
 
-  static std::unique_ptr<VulkanProvider> Create(Window* main_window);
+  static std::unique_ptr<VulkanProvider> Create();
 
   std::unique_ptr<GraphicsContext> CreateHostContext(
       Window* target_window) override;
@@ -269,7 +269,7 @@ class VulkanProvider : public GraphicsProvider {
   }
 
  private:
-  explicit VulkanProvider(Window* main_window);
+  VulkanProvider() = default;
 
   bool Initialize();
 

src/xenia/ui/vulkan/vulkan_window_demo.cc

@@ -2,28 +2,44 @@
  ******************************************************************************
  * Xenia : Xbox 360 Emulator Research Project                                 *
  ******************************************************************************
- * Copyright 2020 Ben Vanik. All rights reserved.                             *
+ * Copyright 2021 Ben Vanik. All rights reserved.                             *
  * Released under the BSD license - see LICENSE in the root for more details. *
  ******************************************************************************
  */
 
+#include <memory>
 #include <string>
-#include <vector>
 
-#include "xenia/base/main.h"
 #include "xenia/ui/vulkan/vulkan_provider.h"
-#include "xenia/ui/window.h"
+#include "xenia/ui/window_demo.h"
+#include "xenia/ui/windowed_app.h"
 
 namespace xe {
 namespace ui {
+namespace vulkan {
 
-int window_demo_main(const std::vector<std::string>& args);
+class VulkanWindowDemoApp final : public WindowDemoApp {
+ public:
+  static std::unique_ptr<WindowedApp> Create(WindowedAppContext& app_context) {
+    return std::unique_ptr<WindowedApp>(new VulkanWindowDemoApp(app_context));
+  }
 
-std::unique_ptr<GraphicsProvider> CreateDemoGraphicsProvider(Window* window) {
-  return xe::ui::vulkan::VulkanProvider::Create(window);
+ protected:
+  std::unique_ptr<GraphicsProvider> CreateGraphicsProvider() const override;
+
+ private:
+  explicit VulkanWindowDemoApp(WindowedAppContext& app_context)
+      : WindowDemoApp(app_context, "xenia-ui-window-vulkan-demo") {}
+};
+
+std::unique_ptr<GraphicsProvider> VulkanWindowDemoApp::CreateGraphicsProvider()
+    const {
+  return VulkanProvider::Create();
 }
 
+}  // namespace vulkan
 }  // namespace ui
 }  // namespace xe
 
-DEFINE_ENTRY_POINT("xenia-ui-window-vulkan-demo", xe::ui::window_demo_main, "");
+XE_DEFINE_WINDOWED_APP(xenia_ui_window_vulkan_demo,
+                       xe::ui::vulkan::VulkanWindowDemoApp::Create);