diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2023-07-02 17:38:28 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-02 17:38:28 -0400 |
commit | 95ceae40e6f4806a1bf00913315ed22bd2842854 (patch) | |
tree | e1054aaadcfd0db9904835a3bf6ab80bf37d673c /src/yuzu_cmd/yuzu.cpp | |
parent | 5e3695ecaa4a3b62249b67df13b7ceccc20ce92e (diff) | |
parent | c3fbc8d2fe2ff423d774ed3886fc8391c730f637 (diff) |
Merge pull request #10998 from Morph1984/qt-stop-messing-with-me
core_timing: Remove GetCurrentTimerResolution in CoreTiming loop
Diffstat (limited to 'src/yuzu_cmd/yuzu.cpp')
-rw-r--r-- | src/yuzu_cmd/yuzu.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp index 7b6d49c63..d0433ffc6 100644 --- a/src/yuzu_cmd/yuzu.cpp +++ b/src/yuzu_cmd/yuzu.cpp @@ -21,6 +21,7 @@ #include "common/string_util.h" #include "common/telemetry.h" #include "core/core.h" +#include "core/core_timing.h" #include "core/cpu_manager.h" #include "core/crypto/key_manager.h" #include "core/file_sys/registered_cache.h" @@ -316,8 +317,6 @@ int main(int argc, char** argv) { #ifdef _WIN32 LocalFree(argv_w); - - Common::Windows::SetCurrentTimerResolutionToMaximum(); #endif MicroProfileOnThreadCreate("EmuThread"); @@ -351,6 +350,11 @@ int main(int argc, char** argv) { break; } +#ifdef _WIN32 + Common::Windows::SetCurrentTimerResolutionToMaximum(); + system.CoreTiming().SetTimerResolutionNs(Common::Windows::GetCurrentTimerResolution()); +#endif + system.SetContentProvider(std::make_unique<FileSys::ContentProviderUnion>()); system.SetFilesystem(std::make_shared<FileSys::RealVfsFilesystem>()); system.GetFileSystemController().CreateFactories(*system.GetFilesystem()); |