mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-11-14 21:37:52 -07:00
Merge pull request #7282 from booto/no-more-global-dcbz-disable
Config: Remove Core::DCBZ [bDCBZOFF] - obsolete
This commit is contained in:
commit
a21d536f99
@ -77,7 +77,6 @@ private:
|
||||
bool bFPRF;
|
||||
bool bAccurateNaNs;
|
||||
bool bMMU;
|
||||
bool bDCBZOFF;
|
||||
bool bLowDCBZHack;
|
||||
bool m_EnableJIT;
|
||||
bool bSyncGPU;
|
||||
@ -108,7 +107,6 @@ void ConfigCache::SaveConfig(const SConfig& config)
|
||||
bFPRF = config.bFPRF;
|
||||
bAccurateNaNs = config.bAccurateNaNs;
|
||||
bMMU = config.bMMU;
|
||||
bDCBZOFF = config.bDCBZOFF;
|
||||
m_EnableJIT = config.m_DSPEnableJIT;
|
||||
bSyncGPU = config.bSyncGPU;
|
||||
bFastDiscSpeed = config.bFastDiscSpeed;
|
||||
@ -148,7 +146,6 @@ void ConfigCache::RestoreConfig(SConfig* config)
|
||||
config->bFPRF = bFPRF;
|
||||
config->bAccurateNaNs = bAccurateNaNs;
|
||||
config->bMMU = bMMU;
|
||||
config->bDCBZOFF = bDCBZOFF;
|
||||
config->bLowDCBZHack = bLowDCBZHack;
|
||||
config->m_DSPEnableJIT = m_EnableJIT;
|
||||
config->bSyncGPU = bSyncGPU;
|
||||
@ -248,7 +245,6 @@ bool BootCore(std::unique_ptr<BootParameters> boot)
|
||||
core_section->Get("FPRF", &StartUp.bFPRF, StartUp.bFPRF);
|
||||
core_section->Get("AccurateNaNs", &StartUp.bAccurateNaNs, StartUp.bAccurateNaNs);
|
||||
core_section->Get("MMU", &StartUp.bMMU, StartUp.bMMU);
|
||||
core_section->Get("DCBZ", &StartUp.bDCBZOFF, StartUp.bDCBZOFF);
|
||||
core_section->Get("LowDCBZHack", &StartUp.bLowDCBZHack, StartUp.bLowDCBZHack);
|
||||
core_section->Get("SyncGPU", &StartUp.bSyncGPU, StartUp.bSyncGPU);
|
||||
core_section->Get("FastDiscSpeed", &StartUp.bFastDiscSpeed, StartUp.bFastDiscSpeed);
|
||||
|
@ -85,7 +85,6 @@ const ConfigInfo<int> MAIN_SYNC_GPU_MIN_DISTANCE{{System::Main, "Core", "SyncGpu
|
||||
-200000};
|
||||
const ConfigInfo<float> MAIN_SYNC_GPU_OVERCLOCK{{System::Main, "Core", "SyncGpuOverclock"}, 1.0f};
|
||||
const ConfigInfo<bool> MAIN_FAST_DISC_SPEED{{System::Main, "Core", "FastDiscSpeed"}, false};
|
||||
const ConfigInfo<bool> MAIN_DCBZ{{System::Main, "Core", "DCBZ"}, false};
|
||||
const ConfigInfo<bool> MAIN_LOW_DCBZ_HACK{{System::Main, "Core", "LowDCBZHack"}, false};
|
||||
const ConfigInfo<bool> MAIN_FPRF{{System::Main, "Core", "FPRF"}, false};
|
||||
const ConfigInfo<bool> MAIN_ACCURATE_NANS{{System::Main, "Core", "AccurateNaNs"}, false};
|
||||
|
@ -61,7 +61,6 @@ extern const ConfigInfo<int> MAIN_SYNC_GPU_MAX_DISTANCE;
|
||||
extern const ConfigInfo<int> MAIN_SYNC_GPU_MIN_DISTANCE;
|
||||
extern const ConfigInfo<float> MAIN_SYNC_GPU_OVERCLOCK;
|
||||
extern const ConfigInfo<bool> MAIN_FAST_DISC_SPEED;
|
||||
extern const ConfigInfo<bool> MAIN_DCBZ;
|
||||
extern const ConfigInfo<bool> MAIN_LOW_DCBZ_HACK;
|
||||
extern const ConfigInfo<bool> MAIN_FPRF;
|
||||
extern const ConfigInfo<bool> MAIN_ACCURATE_NANS;
|
||||
|
@ -529,7 +529,6 @@ void SConfig::LoadCoreSettings(IniFile& ini)
|
||||
core->Get("SyncGpuMinDistance", &iSyncGpuMinDistance, -200000);
|
||||
core->Get("SyncGpuOverclock", &fSyncGpuOverclock, 1.0f);
|
||||
core->Get("FastDiscSpeed", &bFastDiscSpeed, false);
|
||||
core->Get("DCBZ", &bDCBZOFF, false);
|
||||
core->Get("LowDCBZHack", &bLowDCBZHack, false);
|
||||
core->Get("FPRF", &bFPRF, false);
|
||||
core->Get("AccurateNaNs", &bAccurateNaNs, false);
|
||||
@ -754,7 +753,6 @@ void SConfig::LoadDefaults()
|
||||
#else
|
||||
bMMU = false;
|
||||
#endif
|
||||
bDCBZOFF = false;
|
||||
bLowDCBZHack = false;
|
||||
iBBDumpPort = -1;
|
||||
bSyncGPU = false;
|
||||
|
@ -122,7 +122,6 @@ struct SConfig
|
||||
bool bRunCompareClient = false;
|
||||
|
||||
bool bMMU = false;
|
||||
bool bDCBZOFF = false;
|
||||
bool bLowDCBZHack = false;
|
||||
int iBBDumpPort = 0;
|
||||
bool bFastDiscSpeed = false;
|
||||
|
@ -502,11 +502,6 @@ void Interpreter::dcbtst(UGeckoInstruction inst)
|
||||
|
||||
void Interpreter::dcbz(UGeckoInstruction inst)
|
||||
{
|
||||
// DCBZOFF is a hack to fix certain games which would otherwise require
|
||||
// accurate L2 emulation.
|
||||
if (SConfig::GetInstance().bDCBZOFF)
|
||||
return;
|
||||
|
||||
const u32 dcbz_addr = Helper_Get_EA_X(inst);
|
||||
|
||||
if (!HID0.DCE)
|
||||
|
@ -330,8 +330,6 @@ void Jit64::dcbz(UGeckoInstruction inst)
|
||||
{
|
||||
INSTRUCTION_START
|
||||
JITDISABLE(bJITLoadStoreOff);
|
||||
if (SConfig::GetInstance().bDCBZOFF)
|
||||
return;
|
||||
FALLBACK_IF(SConfig::GetInstance().bLowDCBZHack);
|
||||
|
||||
int a = inst.RA;
|
||||
|
@ -630,8 +630,6 @@ void JitArm64::dcbz(UGeckoInstruction inst)
|
||||
{
|
||||
INSTRUCTION_START
|
||||
JITDISABLE(bJITLoadStoreOff);
|
||||
if (SConfig::GetInstance().bDCBZOFF)
|
||||
return;
|
||||
FALLBACK_IF(jo.memcheck);
|
||||
FALLBACK_IF(SConfig::GetInstance().bLowDCBZHack);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user