piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-26 07:39:45 -06:00
Code Issues Packages Projects Releases Wiki Activity

Support overclocking and underclocking the Gamecube CPU

Browse Source 
Won't work with all games, but provides a nice way to spend extra CPU to make
a variable framerate game faster (e.g. Spyro or The Last Story), or to make
a game use less CPU at the cost of a lower framerate (e.g. Rogue Leader).
This commit is contained in:
Fiora
2014-12-31 10:24:14 -08:00
parent e32d63c43d
commit c2c950108d
12 changed files with 111 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
Source/Core/DolphinWX/ConfigMain.cpp
View File

@ -134,7 +134,8 @@ EVT_CHOICE(ID_FRAMELIMIT, CConfigMain::CoreSettingsChanged)
EVT_RADIOBOX(ID_CPUENGINE, CConfigMain::CoreSettingsChanged)
EVT_CHECKBOX(ID_NTSCJ, CConfigMain::CoreSettingsChanged)
EVT_SLIDER(ID_OVERCLOCK, CConfigMain::CoreSettingsChanged)
EVT_CHECKBOX(ID_ENABLEOVERCLOCK, CConfigMain::CoreSettingsChanged)
EVT_RADIOBOX(ID_DSPENGINE, CConfigMain::AudioSettingsChanged)
EVT_CHECKBOX(ID_ENABLE_THROTTLE, CConfigMain::AudioSettingsChanged)
@ -327,6 +328,10 @@ void CConfigMain::InitializeGUIValues()
SkipIdle->SetValue(startup_params.bSkipIdle);
EnableCheats->SetValue(startup_params.bEnableCheats);
Framelimit->SetSelection(SConfig::GetInstance().m_Framelimit);
int ocFactor = (int)(log2f(SConfig::GetInstance().m_OCFactor) * 25.f + 100.f + 0.5f);
EnableOC->SetValue(SConfig::GetInstance().m_OCEnable);
OCSlider->SetValue(ocFactor);
UpdateCPUClock();
// General - Advanced
for (unsigned int a = 0; a < (sizeof(CPUCores) / sizeof(CPUCore)); ++a)
@ -497,6 +502,7 @@ void CConfigMain::CreateGUIControls()
wxPanel* const AudioPage = new wxPanel(Notebook, ID_AUDIOPAGE);
wxPanel* const GamecubePage = new wxPanel(Notebook, ID_GAMECUBEPAGE);
wxPanel* const WiiPage = new wxPanel(Notebook, ID_WIIPAGE);
wxPanel* const AdvancedPage = new wxPanel(Notebook, ID_ADVANCEDPAGE);
PathsPage = new wxPanel(Notebook, ID_PATHSPAGE);
Notebook->AddPage(GeneralPage, _("General"));
@ -505,6 +511,7 @@ void CConfigMain::CreateGUIControls()
Notebook->AddPage(GamecubePage, _("GameCube"));
Notebook->AddPage(WiiPage, _("Wii"));
Notebook->AddPage(PathsPage, _("Paths"));
Notebook->AddPage(AdvancedPage, _("Advanced"));
// General page
// Core Settings - Basic
@ -521,6 +528,7 @@ void CConfigMain::CreateGUIControls()
wxBoxSizer* sFramelimit = new wxBoxSizer(wxHORIZONTAL);
sFramelimit->Add(TEXT_BOX(GeneralPage, _("Framelimit:")), 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT | wxBOTTOM, 5);
sFramelimit->Add(Framelimit, 0, wxLEFT | wxRIGHT | wxBOTTOM | wxEXPAND, 5);
wxStaticBoxSizer* const sbBasic = new wxStaticBoxSizer(wxVERTICAL, GeneralPage, _("Basic Settings"));
sbBasic->Add(CPUThread, 0, wxALL, 5);
sbBasic->Add(SkipIdle, 0, wxALL, 5);
@ -782,6 +790,33 @@ void CConfigMain::CreateGUIControls()
sMain->Add(Notebook, 1, wxEXPAND|wxALL, 5);
sMain->Add(CreateButtonSizer(wxOK), 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
wxStaticBoxSizer* sbCPUOptions = new wxStaticBoxSizer(wxVERTICAL, AdvancedPage, _("CPU Options"));
wxBoxSizer* bOverclockEnable = new wxBoxSizer(wxHORIZONTAL);
wxBoxSizer* bOverclock = new wxBoxSizer(wxHORIZONTAL);
wxBoxSizer* bOverclockDesc = new wxBoxSizer(wxHORIZONTAL);
EnableOC = new wxCheckBox(AdvancedPage, ID_ENABLEOVERCLOCK, _("Enable CPU Clock Override"));
OCSlider = new wxSlider(AdvancedPage, ID_OVERCLOCK, 100, 0, 150, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL);
wxStaticText* OCDescription = new wxStaticText(AdvancedPage, wxID_ANY,
_("Higher values can make variable-framerate games\n"
"run at a higher framerate, at the expense of CPU.\n"
"Lower values can make variable-framerate games\n"
"run at a lower framerate, saving CPU.\n\n"
"WARNING: Changing this from the default (100%)\n"
"can and will break games and cause glitches.\n"
"Do so at your own risk. Please do not report\n"
"bugs that occur with a non-default clock.\n"));
OCText = new wxStaticText(AdvancedPage, wxID_ANY, "");
bOverclockEnable->Add(EnableOC);
bOverclock->Add(OCSlider, 1, wxALL, 5);
bOverclock->Add(OCText, 1, wxALL, 5);
bOverclockDesc->Add(OCDescription, 1, wxALL, 5);
sbCPUOptions->Add(bOverclockEnable);
sbCPUOptions->Add(bOverclock);
sbCPUOptions->Add(bOverclockDesc);
wxBoxSizer* const sAdvancedPage = new wxBoxSizer(wxVERTICAL);
sAdvancedPage->Add(sbCPUOptions, 0, wxEXPAND | wxALL, 5);
AdvancedPage->SetSizer(sAdvancedPage);
InitializeGUIValues();
InitializeGUITooltips();
@ -805,6 +840,14 @@ void CConfigMain::OnOk(wxCommandEvent& WXUNUSED (event))
SConfig::GetInstance().SaveSettings();
}
void CConfigMain::UpdateCPUClock()
{
bool wii = SConfig::GetInstance().m_LocalCoreStartupParameter.bWii;
int percent = (int)(roundf(SConfig::GetInstance().m_OCFactor * 100.f));
int clock = (int)(roundf(SConfig::GetInstance().m_OCFactor * (wii ? 729.f : 486.f)));
OCText->SetLabel(SConfig::GetInstance().m_OCEnable ? wxString::Format("%d %% (%d mhz)", percent, clock) : "");
}
// Core settings
void CConfigMain::CoreSettingsChanged(wxCommandEvent& event)
{
@ -839,6 +882,16 @@ void CConfigMain::CoreSettingsChanged(wxCommandEvent& event)
case ID_NTSCJ:
startup_params.bForceNTSCJ = _NTSCJ->IsChecked();
break;
case ID_ENABLEOVERCLOCK:
SConfig::GetInstance().m_OCEnable = EnableOC->IsChecked();
OCSlider->Enable(SConfig::GetInstance().m_OCEnable);
UpdateCPUClock();
break;
case ID_OVERCLOCK:
// Vaguely exponential scaling?
SConfig::GetInstance().m_OCFactor = exp2f((OCSlider->GetValue() - 100.f) / 25.f);
UpdateCPUClock();
break;
}
}

7
Source/Core/DolphinWX/ConfigMain.h
View File

@ -69,6 +69,7 @@ public:
ID_GAMECUBEPAGE,
ID_WIIPAGE,
ID_PATHSPAGE,
ID_ADVANCEDPAGE,
};
private:
@ -77,7 +78,9 @@ private:
ID_CPUTHREAD = 1010,
ID_IDLESKIP,
ID_ENABLECHEATS,
ID_ENABLEOVERCLOCK,
ID_FRAMELIMIT,
ID_OVERCLOCK,
ID_CPUENGINE,
@ -144,6 +147,9 @@ private:
// Advanced
wxRadioBox* CPUEngine;
wxCheckBox* _NTSCJ;
wxSlider* OCSlider;
wxStaticText* OCText;
wxCheckBox* EnableOC;
wxBoxSizer* sDisplayPage; // Display settings
@ -238,6 +244,7 @@ private:
void UpdateGUI();
void OnClose(wxCloseEvent& event);
void UpdateCPUClock();
void CoreSettingsChanged(wxCommandEvent& event);
void DisplaySettingsChanged(wxCommandEvent& event);

2
Source/Core/DolphinWX/NetWindow.cpp
View File

@ -438,6 +438,8 @@ void NetPlayDiag::GetNetSettings(NetSettings &settings)
settings.m_DSPHLE = instance.m_LocalCoreStartupParameter.bDSPHLE;
settings.m_DSPEnableJIT = instance.m_DSPEnableJIT;
settings.m_WriteToMemcard = m_memcard_write->GetValue();
settings.m_OCEnable = instance.m_OCEnable;
settings.m_OCFactor = instance.m_OCFactor;
settings.m_EXIDevice[0] = instance.m_EXIDevice[0];
settings.m_EXIDevice[1] = instance.m_EXIDevice[1];
}