archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-11 01:08:39 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Skip some logging in add_only Load

Browse source
This commit is contained in:
Megamouse 2020-02-20 21:52:23 +01:00
parent c4a1c6f845
commit b47a8b9995
1 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rpcs3/Emu/System.cpp
View file

@ -810,6 +810,12 @@ void Emulator::Load(const std::string& title_id, bool add_only, bool force_globa
} }
} }
// Set RTM usage
g_use_rtm = utils::has_rtm() && ((utils::has_mpx() && g_cfg.core.enable_TSX == tsx_usage::enabled) || g_cfg.core.enable_TSX == tsx_usage::forced);
// Log some extra info in case of boot
if (!add_only)
{
#if defined(_WIN32) || defined(HAVE_VULKAN) #if defined(_WIN32) || defined(HAVE_VULKAN)
if (g_cfg.video.renderer == video_renderer::vulkan) if (g_cfg.video.renderer == video_renderer::vulkan)
{ {
@ -819,13 +825,11 @@ void Emulator::Load(const std::string& title_id, bool add_only, bool force_globa
sys_log.notice("Used configuration:\n%s\n", g_cfg.to_string()); sys_log.notice("Used configuration:\n%s\n", g_cfg.to_string());
// Set RTM usage
g_use_rtm = utils::has_rtm() && ((utils::has_mpx() && g_cfg.core.enable_TSX == tsx_usage::enabled) || g_cfg.core.enable_TSX == tsx_usage::forced);
if (g_use_rtm && !utils::has_mpx()) if (g_use_rtm && !utils::has_mpx())
{ {
sys_log.warning("TSX forced by User"); sys_log.warning("TSX forced by User");
} }
}
// Load patches from different locations // Load patches from different locations
g_fxo->get<patch_engine>()->append(fs::get_config_dir() + "data/" + m_title_id + "/patch.yml"); g_fxo->get<patch_engine>()->append(fs::get_config_dir() + "data/" + m_title_id + "/patch.yml");
@ -849,7 +853,7 @@ void Emulator::Load(const std::string& title_id, bool add_only, bool force_globa
} }
// Special boot mode (directory scan) // Special boot mode (directory scan)
if (fs::is_dir(m_path)) if (!add_only && fs::is_dir(m_path))
{ {
m_state = system_state::ready; m_state = system_state::ready;
GetCallbacks().on_ready(); GetCallbacks().on_ready();