Merge branch 'master' of https://github.com/xenia-project/xenia into canary_experimental

2022-07-10 10:50:39 +02:00
parent d33be73f3d b41bb35a20
commit 1d00372e6b
49 changed files with 2378 additions and 1159 deletions
--- a/src/xenia/emulator.h
+++ b/src/xenia/emulator.h
@@ -165,6 +165,7 @@ class Emulator {
  // functions.
  X_STATUS Setup(
      ui::Window* display_window, ui::ImGuiDrawer* imgui_drawer,
+      bool require_cpu_backend,
      std::function<std::unique_ptr<apu::AudioSystem>(cpu::Processor*)>
          audio_system_factory,
      std::function<std::unique_ptr<gpu::GraphicsSystem>()>