diff options
Diffstat (limited to 'src/yuzu_cmd')
| -rw-r--r-- | src/yuzu_cmd/config.cpp | 4 | ||||
| -rw-r--r-- | src/yuzu_cmd/default_ini.h | 6 | ||||
| -rw-r--r-- | src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | 7 | ||||
| -rw-r--r-- | src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp | 3 | ||||
| -rw-r--r-- | src/yuzu_cmd/emu_window/emu_window_sdl2_vk.h | 2 | 
5 files changed, 13 insertions, 9 deletions
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index 80341747f..d1ac354bf 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp @@ -388,8 +388,8 @@ void Config::ReadValues() {          static_cast<u16>(sdl2_config->GetInteger("Renderer", "frame_limit", 100));      Settings::values.use_disk_shader_cache =          sdl2_config->GetBoolean("Renderer", "use_disk_shader_cache", false); -    Settings::values.use_accurate_gpu_emulation = -        sdl2_config->GetBoolean("Renderer", "use_accurate_gpu_emulation", false); +    const int gpu_accuracy_level = sdl2_config->GetInteger("Renderer", "gpu_accuracy", 0); +    Settings::values.gpu_accuracy = static_cast<Settings::GPUAccuracy>(gpu_accuracy_level);      Settings::values.use_asynchronous_gpu_emulation =          sdl2_config->GetBoolean("Renderer", "use_asynchronous_gpu_emulation", false);      Settings::values.use_vsync = diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h index 171d16fa0..60b1a62fa 100644 --- a/src/yuzu_cmd/default_ini.h +++ b/src/yuzu_cmd/default_ini.h @@ -146,9 +146,9 @@ frame_limit =  # 0 (default): Off, 1 : On  use_disk_shader_cache = -# Whether to use accurate GPU emulation -# 0 (default): Off (fast), 1 : On (slow) -use_accurate_gpu_emulation = +# Which gpu accuracy level to use +# 0 (Normal), 1 (High), 2 (Extreme) +gpu_accuracy =  # Whether to use asynchronous GPU emulation  # 0 : Off (slow), 1 (default): On (fast) diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp index 19584360c..e5e684206 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp @@ -181,9 +181,10 @@ void EmuWindow_SDL2::PollEvents() {      const u32 current_time = SDL_GetTicks();      if (current_time > last_time + 2000) {          const auto results = Core::System::GetInstance().GetAndResetPerfStats(); -        const auto title = fmt::format( -            "yuzu {} | {}-{} | FPS: {:.0f} ({:.0%})", Common::g_build_fullname, -            Common::g_scm_branch, Common::g_scm_desc, results.game_fps, results.emulation_speed); +        const auto title = +            fmt::format("yuzu {} | {}-{} | FPS: {:.0f} ({:.0f}%)", Common::g_build_fullname, +                        Common::g_scm_branch, Common::g_scm_desc, results.game_fps, +                        results.emulation_speed * 100.0);          SDL_SetWindowTitle(render_window, title.c_str());          last_time = current_time;      } diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp index f2990910e..cb8e68a39 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp @@ -29,6 +29,7 @@ EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(Core::System& system, bool fullscreen)                           SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI);      SDL_SysWMinfo wm; +    SDL_VERSION(&wm.version);      if (SDL_GetWindowWMInfo(render_window, &wm) == SDL_FALSE) {          LOG_CRITICAL(Frontend, "Failed to get information from the window manager");          std::exit(EXIT_FAILURE); @@ -70,7 +71,7 @@ EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(Core::System& system, bool fullscreen)  EmuWindow_SDL2_VK::~EmuWindow_SDL2_VK() = default;  std::unique_ptr<Core::Frontend::GraphicsContext> EmuWindow_SDL2_VK::CreateSharedContext() const { -    return nullptr; +    return std::make_unique<DummyContext>();  }  void EmuWindow_SDL2_VK::Present() { diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.h b/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.h index b8021ebea..77a6ca72b 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.h +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.h @@ -22,3 +22,5 @@ public:      std::unique_ptr<Core::Frontend::GraphicsContext> CreateSharedContext() const override;  }; + +class DummyContext : public Core::Frontend::GraphicsContext {};  | 
