ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Migrate the opencl setting completely to the gfx config dialog. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6472 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2010-11-24 17:30:04 +00:00
parent ebe5472e1d
commit 84a72e90b0
4 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Src/ConfigManager.cpp
View File

@ -140,7 +140,6 @@ void SConfig::SaveSettings()
// Core // Core
ini.Set("Core", "HLE_BS2", m_LocalCoreStartupParameter.bHLE_BS2); ini.Set("Core", "HLE_BS2", m_LocalCoreStartupParameter.bHLE_BS2);
ini.Set("Core", "EnableOpenCL", m_LocalCoreStartupParameter.bEnableOpenCL);
ini.Set("Core", "CPUCore", m_LocalCoreStartupParameter.iCPUCore); ini.Set("Core", "CPUCore", m_LocalCoreStartupParameter.iCPUCore);
ini.Set("Core", "CPUThread", m_LocalCoreStartupParameter.bCPUThread); ini.Set("Core", "CPUThread", m_LocalCoreStartupParameter.bCPUThread);
ini.Set("Core", "DSPThread", m_LocalCoreStartupParameter.bDSPThread); ini.Set("Core", "DSPThread", m_LocalCoreStartupParameter.bDSPThread);
@ -265,7 +264,6 @@ void SConfig::LoadSettings()
// Core // Core
ini.Get("Core", "HLE_BS2", &m_LocalCoreStartupParameter.bHLE_BS2, false); ini.Get("Core", "HLE_BS2", &m_LocalCoreStartupParameter.bHLE_BS2, false);
ini.Get("Core", "EnableOpenCL", &m_LocalCoreStartupParameter.bEnableOpenCL, false);
ini.Get("Core", "CPUCore", &m_LocalCoreStartupParameter.iCPUCore, 1); ini.Get("Core", "CPUCore", &m_LocalCoreStartupParameter.iCPUCore, 1);
ini.Get("Core", "DSPThread", &m_LocalCoreStartupParameter.bDSPThread, false); ini.Get("Core", "DSPThread", &m_LocalCoreStartupParameter.bDSPThread, false);
ini.Get("Core", "CPUThread", &m_LocalCoreStartupParameter.bCPUThread, true); ini.Get("Core", "CPUThread", &m_LocalCoreStartupParameter.bCPUThread, true);

1
Source/Core/Core/Src/CoreParameter.h
View File

@ -73,7 +73,6 @@ struct SCoreStartupParameter
bool bNTSC; bool bNTSC;
bool bNTSCJ; bool bNTSCJ;
bool bHLE_BS2; bool bHLE_BS2;
bool bEnableOpenCL;
bool bUseFastMem; bool bUseFastMem;
bool bLockThreads; bool bLockThreads;
bool bEnableCheats; bool bEnableCheats;

25
Source/Core/DolphinWX/Src/ConfigMain.cpp
View File

@ -33,8 +33,6 @@
#include "Frame.h" #include "Frame.h"
#include "HotkeyDlg.h" #include "HotkeyDlg.h"
#include "OpenCL.h"
#ifdef __APPLE__ #ifdef __APPLE__
#include <ApplicationServices/ApplicationServices.h> #include <ApplicationServices/ApplicationServices.h>
#endif #endif
@ -67,9 +65,6 @@ EVT_CHOICE(ID_FRAMELIMIT, CConfigMain::CoreSettingsChanged)
EVT_CHECKBOX(ID_FRAMELIMIT_USEFPSFORLIMITING, CConfigMain::CoreSettingsChanged) EVT_CHECKBOX(ID_FRAMELIMIT_USEFPSFORLIMITING, CConfigMain::CoreSettingsChanged)
EVT_CHECKBOX(ID_ALWAYS_HLE_BS2, CConfigMain::CoreSettingsChanged) EVT_CHECKBOX(ID_ALWAYS_HLE_BS2, CConfigMain::CoreSettingsChanged)
#if defined(HAVE_OPENCL) && HAVE_OPENCL
EVT_CHECKBOX(ID_ENABLE_OPENCL, CConfigMain::CoreSettingsChanged)
#endif
EVT_RADIOBOX(ID_CPUENGINE, CConfigMain::CoreSettingsChanged) EVT_RADIOBOX(ID_CPUENGINE, CConfigMain::CoreSettingsChanged)
EVT_CHECKBOX(ID_LOCKTHREADS, CConfigMain::CoreSettingsChanged) EVT_CHECKBOX(ID_LOCKTHREADS, CConfigMain::CoreSettingsChanged)
EVT_CHECKBOX(ID_DSPTHREAD, CConfigMain::CoreSettingsChanged) EVT_CHECKBOX(ID_DSPTHREAD, CConfigMain::CoreSettingsChanged)
@ -164,9 +159,6 @@ void CConfigMain::UpdateGUI()
EnableCheats->Disable(); EnableCheats->Disable();
AlwaysHLE_BS2->Disable(); AlwaysHLE_BS2->Disable();
#if defined(HAVE_OPENCL) && HAVE_OPENCL
EnableOpenCL->Disable();
#endif
CPUEngine->Disable(); CPUEngine->Disable();
LockThreads->Disable(); LockThreads->Disable();
DSPThread->Disable(); DSPThread->Disable();
@ -272,9 +264,6 @@ void CConfigMain::InitializeGUIValues()
// General - Advanced // General - Advanced
AlwaysHLE_BS2->SetValue(startup_params.bHLE_BS2); AlwaysHLE_BS2->SetValue(startup_params.bHLE_BS2);
#if defined(HAVE_OPENCL) && HAVE_OPENCL
EnableOpenCL->SetValue(startup_params.bEnableOpenCL);
#endif
CPUEngine->SetSelection(startup_params.iCPUCore); CPUEngine->SetSelection(startup_params.iCPUCore);
LockThreads->SetValue(startup_params.bLockThreads); LockThreads->SetValue(startup_params.bLockThreads);
DSPThread->SetValue(startup_params.bDSPThread); DSPThread->SetValue(startup_params.bDSPThread);
@ -345,9 +334,6 @@ void CConfigMain::InitializeGUITooltips()
// General - Advanced // General - Advanced
DSPThread->SetToolTip(wxT("Run DSPLLE on a dedicated thread (not recommended).")); DSPThread->SetToolTip(wxT("Run DSPLLE on a dedicated thread (not recommended)."));
#if defined(HAVE_OPENCL) && HAVE_OPENCL
EnableOpenCL->SetToolTip(wxT("Allow videocard to accelerate texture decoding."));
#endif
// Display - Display // Display - Display
FullscreenResolution->SetToolTip(wxT("Select resolution for fullscreen mode")); FullscreenResolution->SetToolTip(wxT("Select resolution for fullscreen mode"));
@ -418,9 +404,6 @@ void CConfigMain::CreateGUIControls()
// Core Settings - Advanced // Core Settings - Advanced
sbAdvanced = new wxStaticBoxSizer(wxVERTICAL, GeneralPage, wxT("Advanced Settings")); sbAdvanced = new wxStaticBoxSizer(wxVERTICAL, GeneralPage, wxT("Advanced Settings"));
AlwaysHLE_BS2 = new wxCheckBox(GeneralPage, ID_ALWAYS_HLE_BS2, wxT("Skip GC BIOS"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); AlwaysHLE_BS2 = new wxCheckBox(GeneralPage, ID_ALWAYS_HLE_BS2, wxT("Skip GC BIOS"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
#if defined(HAVE_OPENCL) && HAVE_OPENCL
EnableOpenCL = new wxCheckBox(GeneralPage, ID_ENABLE_OPENCL, wxT("Enable OpenCL"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
#endif
CPUEngine = new wxRadioBox(GeneralPage, ID_CPUENGINE, wxT("CPU Emulator Engine"), wxDefaultPosition, wxDefaultSize, arrayStringFor_CPUEngine, 0, wxRA_SPECIFY_ROWS); CPUEngine = new wxRadioBox(GeneralPage, ID_CPUENGINE, wxT("CPU Emulator Engine"), wxDefaultPosition, wxDefaultSize, arrayStringFor_CPUEngine, 0, wxRA_SPECIFY_ROWS);
LockThreads = new wxCheckBox(GeneralPage, ID_LOCKTHREADS, wxT("Lock threads to cores"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); LockThreads = new wxCheckBox(GeneralPage, ID_LOCKTHREADS, wxT("Lock threads to cores"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
DSPThread = new wxCheckBox(GeneralPage, ID_DSPTHREAD, wxT("DSPLLE on thread"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); DSPThread = new wxCheckBox(GeneralPage, ID_DSPTHREAD, wxT("DSPLLE on thread"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
@ -436,9 +419,6 @@ void CConfigMain::CreateGUIControls()
sbBasic->Add(sFramelimit, 0, wxALL | wxEXPAND, 5); sbBasic->Add(sFramelimit, 0, wxALL | wxEXPAND, 5);
sbAdvanced->Add(AlwaysHLE_BS2, 0, wxALL, 5); sbAdvanced->Add(AlwaysHLE_BS2, 0, wxALL, 5);
#if defined(HAVE_OPENCL) && HAVE_OPENCL
sbAdvanced->Add(EnableOpenCL, 0, wxALL, 5);
#endif
sbAdvanced->Add(CPUEngine, 0, wxALL, 5); sbAdvanced->Add(CPUEngine, 0, wxALL, 5);
sbAdvanced->Add(LockThreads, 0, wxALL, 5); sbAdvanced->Add(LockThreads, 0, wxALL, 5);
sbAdvanced->Add(DSPThread, 0, wxALL, 5); sbAdvanced->Add(DSPThread, 0, wxALL, 5);
@ -815,11 +795,6 @@ void CConfigMain::CoreSettingsChanged(wxCommandEvent& event)
case ID_ALWAYS_HLE_BS2: case ID_ALWAYS_HLE_BS2:
SConfig::GetInstance().m_LocalCoreStartupParameter.bHLE_BS2 = AlwaysHLE_BS2->IsChecked(); SConfig::GetInstance().m_LocalCoreStartupParameter.bHLE_BS2 = AlwaysHLE_BS2->IsChecked();
break; break;
#if defined(HAVE_OPENCL) && HAVE_OPENCL
case ID_ENABLE_OPENCL:
SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableOpenCL = EnableOpenCL->IsChecked();
break;
#endif
case ID_CPUENGINE: case ID_CPUENGINE:
SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore = CPUEngine->GetSelection(); SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore = CPUEngine->GetSelection();
if (main_frame->g_pCodeWindow) if (main_frame->g_pCodeWindow)

5
Source/Core/VideoCommon/Src/VideoConfig.cpp
View File

@ -94,6 +94,8 @@ void VideoConfig::Load(const char *ini_file)
iniFile.Get("Settings", "DisableTexturing", &bDisableTexturing, 0); iniFile.Get("Settings", "DisableTexturing", &bDisableTexturing, 0);
iniFile.Get("Settings", "DisableFog", &bDisableFog, 0); iniFile.Get("Settings", "DisableFog", &bDisableFog, 0);
iniFile.Get("Settings", "EnableOpenCL", &bEnableOpenCL, false);
iniFile.Get("Enhancements", "ForceFiltering", &bForceFiltering, 0); iniFile.Get("Enhancements", "ForceFiltering", &bForceFiltering, 0);
iniFile.Get("Enhancements", "MaxAnisotropy", &iMaxAnisotropy, 1); // NOTE - this is x in (1 << x) iniFile.Get("Enhancements", "MaxAnisotropy", &iMaxAnisotropy, 1); // NOTE - this is x in (1 << x)
iniFile.Get("Enhancements", "PostProcessingShader", &sPostProcessingShader, ""); iniFile.Get("Enhancements", "PostProcessingShader", &sPostProcessingShader, "");
@ -117,7 +119,6 @@ void VideoConfig::Load(const char *ini_file)
bool bTmp; bool bTmp;
iniFile.Get("Interface", "UsePanicHandlers", &bTmp, true); iniFile.Get("Interface", "UsePanicHandlers", &bTmp, true);
SetEnableAlert(bTmp); SetEnableAlert(bTmp);
iniFile.Get("Core", "EnableOpenCL", &bEnableOpenCL, false);
} }
void VideoConfig::GameIniLoad(const char *ini_file) void VideoConfig::GameIniLoad(const char *ini_file)
@ -208,6 +209,8 @@ void VideoConfig::Save(const char *ini_file)
iniFile.Set("Settings", "DstAlphaPass", bDstAlphaPass); iniFile.Set("Settings", "DstAlphaPass", bDstAlphaPass);
iniFile.Set("Settings", "DisableFog", bDisableFog); iniFile.Set("Settings", "DisableFog", bDisableFog);
iniFile.Set("Settings", "EnableOpenCL", bEnableOpenCL);
iniFile.Set("Enhancements", "ForceFiltering", bForceFiltering); iniFile.Set("Enhancements", "ForceFiltering", bForceFiltering);
iniFile.Set("Enhancements", "MaxAnisotropy", iMaxAnisotropy); iniFile.Set("Enhancements", "MaxAnisotropy", iMaxAnisotropy);
iniFile.Set("Enhancements", "PostProcessingShader", sPostProcessingShader); iniFile.Set("Enhancements", "PostProcessingShader", sPostProcessingShader);