Merge pull request #3200 from degasus/master

Throttler + Mixer: Configureable variance
This commit is contained in:
Ryan Houdek 2015-12-11 07:04:56 -05:00
commit cb5be45f72
5 changed files with 13 additions and 7 deletions

View file

@ -35,7 +35,7 @@ SConfig::SConfig()
bJITPairedOff(false), bJITSystemRegistersOff(false),
bJITBranchOff(false),
bJITILTimeProfiling(false), bJITILOutputIR(false),
bFPRF(false), bAccurateNaNs(false),
bFPRF(false), bAccurateNaNs(false), iTimingVariance(40),
bCPUThread(true), bDSPThread(false), bDSPHLE(true),
bSkipIdle(true), bSyncGPUOnSkipIdleHack(true), bNTSC(false), bForceNTSCJ(false),
bHLE_BS2(true), bEnableCheats(false),
@ -222,6 +222,7 @@ void SConfig::SaveCoreSettings(IniFile& ini)
IniFile::Section* core = ini.GetOrCreateSection("Core");
core->Set("HLE_BS2", bHLE_BS2);
core->Set("TimingVariance", iTimingVariance);
core->Set("CPUCore", iCPUCore);
core->Set("Fastmem", bFastmem);
core->Set("CPUThread", bCPUThread);
@ -481,6 +482,7 @@ void SConfig::LoadCoreSettings(IniFile& ini)
#endif
core->Get("Fastmem", &bFastmem, true);
core->Get("DSPHLE", &bDSPHLE, true);
core->Get("TimingVariance", &iTimingVariance, 40);
core->Get("CPUThread", &bCPUThread, true);
core->Get("SkipIdle", &bSkipIdle, true);
core->Get("SyncOnSkipIdle", &bSyncGPUOnSkipIdleHack, true);
@ -594,6 +596,7 @@ void SConfig::LoadDefaults()
#endif
iCPUCore = PowerPC::CORE_JIT64;
iTimingVariance = 40;
bCPUThread = false;
bSkipIdle = false;
bSyncGPUOnSkipIdleHack = true;