diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index 180e6c981d..3417b0eb55 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -221,7 +221,6 @@ void SConfig::SaveSettings() ini.Set("Core", "DSPThread", m_LocalCoreStartupParameter.bDSPThread); ini.Set("Core", "DSPHLE", m_LocalCoreStartupParameter.bDSPHLE); ini.Set("Core", "SkipIdle", m_LocalCoreStartupParameter.bSkipIdle); - ini.Set("Core", "LockThreads", m_LocalCoreStartupParameter.bLockThreads); ini.Set("Core", "DefaultGCM", m_LocalCoreStartupParameter.m_strDefaultGCM); ini.Set("Core", "DVDRoot", m_LocalCoreStartupParameter.m_strDVDRoot); ini.Set("Core", "Apploader", m_LocalCoreStartupParameter.m_strApploader); @@ -361,7 +360,6 @@ void SConfig::LoadSettings() ini.Get("Core", "DSPHLE", &m_LocalCoreStartupParameter.bDSPHLE, true); ini.Get("Core", "CPUThread", &m_LocalCoreStartupParameter.bCPUThread, true); ini.Get("Core", "SkipIdle", &m_LocalCoreStartupParameter.bSkipIdle, true); - ini.Get("Core", "LockThreads", &m_LocalCoreStartupParameter.bLockThreads, false); ini.Get("Core", "DefaultGCM", &m_LocalCoreStartupParameter.m_strDefaultGCM); ini.Get("Core", "DVDRoot", &m_LocalCoreStartupParameter.m_strDVDRoot); ini.Get("Core", "Apploader", &m_LocalCoreStartupParameter.m_strApploader); diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index e92b9088bc..141071d70a 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -310,8 +310,7 @@ void CpuThread() g_video_backend->Video_Prepare(); } - if (_CoreParameter.bLockThreads) - Common::SetCurrentThreadAffinity(1); // Force to first core + Common::SetCurrentThreadAffinity(1); // Force to first core #if defined(_WIN32) && defined(_M_X64) EMM::InstallExceptionHandler(); // Let's run under memory watch @@ -344,8 +343,7 @@ void FifoPlayerThread() Common::SetCurrentThreadName("FIFO-GPU thread"); } - if (_CoreParameter.bLockThreads) - Common::SetCurrentThreadAffinity(1); // Force to first core + Common::SetCurrentThreadAffinity(1); // Force to first core g_bStarted = true; @@ -371,7 +369,6 @@ void EmuThread() Common::SetCurrentThreadName("Emuthread - Starting"); - if (_CoreParameter.bLockThreads) { if (cpu_info.num_cores > 3) // Force to third, non-HT core Common::SetCurrentThreadAffinity(4); diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp index dee2452cb3..b38c49ef7a 100644 --- a/Source/Core/Core/Src/CoreParameter.cpp +++ b/Source/Core/Core/Src/CoreParameter.cpp @@ -45,8 +45,7 @@ SCoreStartupParameter::SCoreStartupParameter() bEnableFPRF(false), bCPUThread(true), bDSPThread(false), bDSPHLE(true), bSkipIdle(true), bNTSC(false), bForceNTSCJ(false), - bHLE_BS2(true), bLockThreads(false), - bEnableCheats(false), + bHLE_BS2(true), bEnableCheats(false), bMergeBlocks(false), bRunCompareServer(false), bRunCompareClient(false), bMMU(false), bMMUBAT(false), iTLBHack(0), bVBeam(false), @@ -74,7 +73,6 @@ void SCoreStartupParameter::LoadDefaults() bRunCompareServer = false; bDSPHLE = true; bDSPThread = true; - bLockThreads = true; bEnableFPRF = false; bMMU = false; bMMUBAT = false; diff --git a/Source/Core/Core/Src/CoreParameter.h b/Source/Core/Core/Src/CoreParameter.h index 8aa6be83e5..8da55e7d8a 100644 --- a/Source/Core/Core/Src/CoreParameter.h +++ b/Source/Core/Core/Src/CoreParameter.h @@ -103,7 +103,6 @@ struct SCoreStartupParameter bool bNTSC; bool bForceNTSCJ; bool bHLE_BS2; - bool bLockThreads; bool bEnableCheats; bool bMergeBlocks; diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp index a44ff65f21..54709a9cce 100644 --- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp +++ b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp @@ -104,7 +104,6 @@ void DSPLLE::dsp_thread(DSPLLE *dsp_lle) { Common::SetCurrentThreadName("DSP thread"); - if (SConfig::GetInstance().m_LocalCoreStartupParameter.bLockThreads) { if (cpu_info.num_cores > 3) { diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index 42dc5df20b..33a639db1c 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -112,7 +112,6 @@ EVT_CHOICE(ID_FRAMELIMIT, CConfigMain::CoreSettingsChanged) EVT_CHECKBOX(ID_FRAMELIMIT_USEFPSFORLIMITING, CConfigMain::CoreSettingsChanged) EVT_RADIOBOX(ID_CPUENGINE, CConfigMain::CoreSettingsChanged) -EVT_CHECKBOX(ID_LOCKTHREADS, CConfigMain::CoreSettingsChanged) EVT_CHECKBOX(ID_NTSCJ, CConfigMain::CoreSettingsChanged) @@ -211,7 +210,6 @@ void CConfigMain::UpdateGUI() EnableCheats->Disable(); CPUEngine->Disable(); - LockThreads->Disable(); _NTSCJ->Disable(); // Disable stuff on AudioPage @@ -332,7 +330,6 @@ void CConfigMain::InitializeGUIValues() // General - Advanced CPUEngine->SetSelection(startup_params.iCPUCore); - LockThreads->SetValue(startup_params.bLockThreads); _NTSCJ->SetValue(startup_params.bForceNTSCJ); @@ -546,7 +543,6 @@ void CConfigMain::CreateGUIControls() UseFPSForLimiting = new wxCheckBox(GeneralPage, ID_FRAMELIMIT_USEFPSFORLIMITING, _("Limit by FPS"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); // Core Settings - Advanced CPUEngine = new wxRadioBox(GeneralPage, ID_CPUENGINE, _("CPU Emulator Engine"), wxDefaultPosition, wxDefaultSize, arrayStringFor_CPUEngine, 0, wxRA_SPECIFY_ROWS); - LockThreads = new wxCheckBox(GeneralPage, ID_LOCKTHREADS, _("Lock Threads to Cores"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); _NTSCJ = new wxCheckBox(GeneralPage, ID_NTSCJ, _("Force Console as NTSC-J"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); // Populate the General settings @@ -562,7 +558,6 @@ void CConfigMain::CreateGUIControls() wxStaticBoxSizer* const sbAdvanced = new wxStaticBoxSizer(wxVERTICAL, GeneralPage, _("Advanced Settings")); sbAdvanced->Add(CPUEngine, 0, wxALL, 5); - sbAdvanced->Add(LockThreads, 0, wxALL, 5); sbAdvanced->Add(_NTSCJ, 0, wxALL, 5); wxBoxSizer* const sGeneralPage = new wxBoxSizer(wxVERTICAL); @@ -860,9 +855,6 @@ void CConfigMain::CoreSettingsChanged(wxCommandEvent& event) main_frame->g_pCodeWindow->GetMenuBar()->Check(IDM_INTERPRETER, SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore?false:true); break; - case ID_LOCKTHREADS: - SConfig::GetInstance().m_LocalCoreStartupParameter.bLockThreads = LockThreads->IsChecked(); - break; case ID_NTSCJ: SConfig::GetInstance().m_LocalCoreStartupParameter.bForceNTSCJ = _NTSCJ->IsChecked(); break; diff --git a/Source/Core/DolphinWX/Src/ConfigMain.h b/Source/Core/DolphinWX/Src/ConfigMain.h index 0e594101df..d8a362d205 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.h +++ b/Source/Core/DolphinWX/Src/ConfigMain.h @@ -69,7 +69,6 @@ private: ID_FRAMELIMIT_USEFPSFORLIMITING, ID_CPUENGINE, - ID_LOCKTHREADS, ID_DSPTHREAD, ID_NTSCJ, @@ -143,7 +142,6 @@ private: wxCheckBox* EnableOpenCL; wxRadioBox* CPUEngine; wxCheckBox* DSPThread; - wxCheckBox* LockThreads; wxCheckBox* _NTSCJ;