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

implement "Enable TSX" combobox

Browse source
This commit is contained in:
Megamouse 2018-06-13 13:54:16 +02:00 • committed by Ivan
parent 2bc4cb4e58
commit af71cf0922
8 changed files with 98 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

27
rpcs3/Emu/System.cpp
View file

@ -38,13 +38,15 @@
#include "Utilities/GDBDebugServer.h"
#include "Utilities/sysinfo.h"
#if defined(_WIN32) || defined(HAVE_VULKAN)
#include "Emu/RSX/VK/VulkanAPI.h"
#endif
cfg_root g_cfg;
bool g_use_rtm = utils::has_rtm();
bool g_use_rtm;
std::string g_cfg_defaults;
@ -222,6 +224,22 @@ inline void fmt_class_string<detail_level>::format(std::string& out, u64 arg)
});
}
template <>
void fmt_class_string<tsx_usage>::format(std::string& out, u64 arg)
{
format_enum(out, arg, [](tsx_usage value)
{
switch (value)
{
case tsx_usage::disabled: return "Disabled";
case tsx_usage::enabled: return "Enabled";
case tsx_usage::forced: return "Forced";
}
return unknown;
});
}
void Emulator::Init()
{
if (!g_tty)
@ -626,6 +644,13 @@ void Emulator::Load(bool add_only)
#endif
LOG_NOTICE(LOADER, "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())
{
LOG_WARNING(GENERAL, "TSX forced by User");
}
// Load patches from different locations
fxm::check_unlocked<patch_engine>()->append(fs::get_config_dir() + "data/" + m_title_id + "/patch.yml");