Merge branch 'master' into vulkan

src/xenia/ui/d3d12/d3d12_provider.cc

@@ -47,8 +47,8 @@ bool D3D12Provider::IsD3D12APIAvailable() {
   return true;
 }
 
-std::unique_ptr<D3D12Provider> D3D12Provider::Create(Window* main_window) {
-  std::unique_ptr<D3D12Provider> provider(new D3D12Provider(main_window));
+std::unique_ptr<D3D12Provider> D3D12Provider::Create() {
+  std::unique_ptr<D3D12Provider> provider(new D3D12Provider);
   if (!provider->Initialize()) {
     xe::FatalError(
         "Unable to initialize Direct3D 12 graphics subsystem.\n"
@@ -63,9 +63,6 @@ std::unique_ptr<D3D12Provider> D3D12Provider::Create(Window* main_window) {
   return provider;
 }
 
-D3D12Provider::D3D12Provider(Window* main_window)
-    : GraphicsProvider(main_window) {}
-
 D3D12Provider::~D3D12Provider() {
   if (graphics_analysis_ != nullptr) {
     graphics_analysis_->Release();

src/xenia/ui/d3d12/d3d12_provider.h

@@ -27,7 +27,7 @@ class D3D12Provider : public GraphicsProvider {
 
   static bool IsD3D12APIAvailable();
 
-  static std::unique_ptr<D3D12Provider> Create(Window* main_window);
+  static std::unique_ptr<D3D12Provider> Create();
 
   std::unique_ptr<GraphicsContext> CreateHostContext(
       Window* target_window) override;
@@ -147,7 +147,7 @@ class D3D12Provider : public GraphicsProvider {
   }
 
  private:
-  explicit D3D12Provider(Window* main_window);
+  D3D12Provider() = default;
 
   static bool EnableIncreaseBasePriorityPrivilege();
   bool Initialize();

src/xenia/ui/d3d12/d3d12_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/d3d12/d3d12_provider.h"
-#include "xenia/ui/window.h"
+#include "xenia/ui/window_demo.h"
+#include "xenia/ui/windowed_app.h"
 
 namespace xe {
 namespace ui {
+namespace d3d12 {
 
-int window_demo_main(const std::vector<std::string>& args);
+class D3D12WindowDemoApp final : public WindowDemoApp {
+ public:
+  static std::unique_ptr<WindowedApp> Create(WindowedAppContext& app_context) {
+    return std::unique_ptr<WindowedApp>(new D3D12WindowDemoApp(app_context));
+  }
 
-std::unique_ptr<GraphicsProvider> CreateDemoGraphicsProvider(Window* window) {
-  return xe::ui::d3d12::D3D12Provider::Create(window);
+ protected:
+  std::unique_ptr<GraphicsProvider> CreateGraphicsProvider() const override;
+
+ private:
+  explicit D3D12WindowDemoApp(WindowedAppContext& app_context)
+      : WindowDemoApp(app_context, "xenia-ui-window-d3d12-demo") {}
+};
+
+std::unique_ptr<GraphicsProvider> D3D12WindowDemoApp::CreateGraphicsProvider()
+    const {
+  return D3D12Provider::Create();
 }
 
+}  // namespace d3d12
 }  // namespace ui
 }  // namespace xe
 
-DEFINE_ENTRY_POINT("xenia-ui-window-d3d12-demo", xe::ui::window_demo_main, "");
+XE_DEFINE_WINDOWED_APP(xenia_ui_window_d3d12_demo,
+                       xe::ui::d3d12::D3D12WindowDemoApp::Create);

src/xenia/ui/d3d12/premake5.lua

@@ -30,7 +30,7 @@ project("xenia-ui-window-d3d12-demo")
   files({
     "../window_demo.cc",
     "d3d12_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,