From 49f223a211acdf5d46af78a48d94bee5e3fd6cd9 Mon Sep 17 00:00:00 2001 From: magumagu Date: Wed, 11 Feb 2015 19:50:48 -0800 Subject: [PATCH] Remove setting "BlockMerging". It isn't hooked up to anything anymore, and it isn't the sort of thing we want users messing with anyway. --- Source/Core/Core/BootManager.cpp | 5 +---- Source/Core/Core/CoreParameter.cpp | 3 +-- Source/Core/Core/CoreParameter.h | 1 - Source/Core/DolphinWX/ISOProperties.cpp | 4 ---- Source/Core/DolphinWX/ISOProperties.h | 3 +-- 5 files changed, 3 insertions(+), 13 deletions(-) diff --git a/Source/Core/Core/BootManager.cpp b/Source/Core/Core/BootManager.cpp index e6cec100cc..19d101c455 100644 --- a/Source/Core/Core/BootManager.cpp +++ b/Source/Core/Core/BootManager.cpp @@ -48,7 +48,7 @@ namespace BootManager struct ConfigCache { bool valid, bCPUThread, bSkipIdle, bFPRF, bBAT, bMMU, bDCBZOFF, m_EnableJIT, bDSPThread, - bSyncGPU, bFastDiscSpeed, bMergeBlocks, bDSPHLE, bHLE_BS2, bProgressive; + bSyncGPU, bFastDiscSpeed, bDSPHLE, bHLE_BS2, bProgressive; int iCPUCore, Volume; int iWiimoteSource[MAX_BBMOTES]; SIDevices Pads[MAX_SI_CHANNELS]; @@ -119,7 +119,6 @@ bool BootCore(const std::string& _rFilename) config_cache.bDCBZOFF = StartUp.bDCBZOFF; config_cache.bSyncGPU = StartUp.bSyncGPU; config_cache.bFastDiscSpeed = StartUp.bFastDiscSpeed; - config_cache.bMergeBlocks = StartUp.bMergeBlocks; config_cache.bDSPHLE = StartUp.bDSPHLE; config_cache.strBackend = StartUp.m_strVideoBackend; config_cache.m_strGPUDeterminismMode = StartUp.m_strGPUDeterminismMode; @@ -160,7 +159,6 @@ bool BootCore(const std::string& _rFilename) core_section->Get("DCBZ", &StartUp.bDCBZOFF, StartUp.bDCBZOFF); core_section->Get("SyncGPU", &StartUp.bSyncGPU, StartUp.bSyncGPU); core_section->Get("FastDiscSpeed", &StartUp.bFastDiscSpeed, StartUp.bFastDiscSpeed); - core_section->Get("BlockMerging", &StartUp.bMergeBlocks, StartUp.bMergeBlocks); core_section->Get("DSPHLE", &StartUp.bDSPHLE, StartUp.bDSPHLE); core_section->Get("GFXBackend", &StartUp.m_strVideoBackend, StartUp.m_strVideoBackend); core_section->Get("CPUCore", &StartUp.iCPUCore, StartUp.iCPUCore); @@ -288,7 +286,6 @@ void Stop() StartUp.bDCBZOFF = config_cache.bDCBZOFF; StartUp.bSyncGPU = config_cache.bSyncGPU; StartUp.bFastDiscSpeed = config_cache.bFastDiscSpeed; - StartUp.bMergeBlocks = config_cache.bMergeBlocks; StartUp.bDSPHLE = config_cache.bDSPHLE; StartUp.m_strVideoBackend = config_cache.strBackend; StartUp.m_strGPUDeterminismMode = config_cache.m_strGPUDeterminismMode; diff --git a/Source/Core/Core/CoreParameter.cpp b/Source/Core/Core/CoreParameter.cpp index 7506e676c7..8ec5e933c7 100644 --- a/Source/Core/Core/CoreParameter.cpp +++ b/Source/Core/Core/CoreParameter.cpp @@ -36,7 +36,7 @@ SCoreStartupParameter::SCoreStartupParameter() bCPUThread(true), bDSPThread(false), bDSPHLE(true), bSkipIdle(true), bSyncGPUOnSkipIdleHack(true), bNTSC(false), bForceNTSCJ(false), bHLE_BS2(true), bEnableCheats(false), - bMergeBlocks(false), bEnableMemcardSaving(true), + bEnableMemcardSaving(true), bDPL2Decoder(false), iLatency(14), bRunCompareServer(false), bRunCompareClient(false), bBAT(false), bMMU(false), bDCBZOFF(false), @@ -80,7 +80,6 @@ void SCoreStartupParameter::LoadDefaults() iBBDumpPort = -1; bSyncGPU = false; bFastDiscSpeed = false; - bMergeBlocks = false; bEnableMemcardSaving = true; SelectedLanguage = 0; bWii = false; diff --git a/Source/Core/Core/CoreParameter.h b/Source/Core/Core/CoreParameter.h index 047f6c6f8c..8bf591331a 100644 --- a/Source/Core/Core/CoreParameter.h +++ b/Source/Core/Core/CoreParameter.h @@ -172,7 +172,6 @@ struct SCoreStartupParameter bool bForceNTSCJ; bool bHLE_BS2; bool bEnableCheats; - bool bMergeBlocks; bool bEnableMemcardSaving; bool bDPL2Decoder; diff --git a/Source/Core/DolphinWX/ISOProperties.cpp b/Source/Core/DolphinWX/ISOProperties.cpp index 53257973ef..1a775ea357 100644 --- a/Source/Core/DolphinWX/ISOProperties.cpp +++ b/Source/Core/DolphinWX/ISOProperties.cpp @@ -414,7 +414,6 @@ void CISOProperties::CreateGUIControls(bool IsWad) SyncGPU->SetToolTip(_("Synchronizes the GPU and CPU threads to help prevent random freezes in Dual Core mode. (ON = Compatible, OFF = Fast)")); FastDiscSpeed = new wxCheckBox(m_GameConfig, ID_DISCSPEED, _("Speed up Disc Transfer Rate"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "FastDiscSpeed")); FastDiscSpeed->SetToolTip(_("Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)")); - BlockMerging = new wxCheckBox(m_GameConfig, ID_MERGEBLOCKS, _("Enable Block Merging"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "BlockMerging")); DSPHLE = new wxCheckBox(m_GameConfig, ID_AUDIO_DSP_HLE, _("DSP HLE emulation (fast)"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "DSPHLE")); wxBoxSizer* const sGPUDeterminism = new wxBoxSizer(wxHORIZONTAL); @@ -471,7 +470,6 @@ void CISOProperties::CreateGUIControls(bool IsWad) sbCoreOverrides->Add(FPRF, 0, wxLEFT, 5); sbCoreOverrides->Add(SyncGPU, 0, wxLEFT, 5); sbCoreOverrides->Add(FastDiscSpeed, 0, wxLEFT, 5); - sbCoreOverrides->Add(BlockMerging, 0, wxLEFT, 5); sbCoreOverrides->Add(DSPHLE, 0, wxLEFT, 5); sbCoreOverrides->Add(sGPUDeterminism, 0, wxEXPAND|wxALL, 5); @@ -1062,7 +1060,6 @@ void CISOProperties::LoadGameConfig() SetCheckboxValueFromGameini("Core", "FPRF", FPRF); SetCheckboxValueFromGameini("Core", "SyncGPU", SyncGPU); SetCheckboxValueFromGameini("Core", "FastDiscSpeed", FastDiscSpeed); - SetCheckboxValueFromGameini("Core", "BlockMerging", BlockMerging); SetCheckboxValueFromGameini("Core", "DSPHLE", DSPHLE); SetCheckboxValueFromGameini("Wii", "Widescreen", EnableWideScreen); SetCheckboxValueFromGameini("Video_Stereoscopy", "StereoEFBMonoDepth", MonoDepth); @@ -1158,7 +1155,6 @@ bool CISOProperties::SaveGameConfig() SaveGameIniValueFrom3StateCheckbox("Core", "FPRF", FPRF); SaveGameIniValueFrom3StateCheckbox("Core", "SyncGPU", SyncGPU); SaveGameIniValueFrom3StateCheckbox("Core", "FastDiscSpeed", FastDiscSpeed); - SaveGameIniValueFrom3StateCheckbox("Core", "BlockMerging", BlockMerging); SaveGameIniValueFrom3StateCheckbox("Core", "DSPHLE", DSPHLE); SaveGameIniValueFrom3StateCheckbox("Wii", "Widescreen", EnableWideScreen); SaveGameIniValueFrom3StateCheckbox("Video_Stereoscopy", "StereoEFBMonoDepth", MonoDepth); diff --git a/Source/Core/DolphinWX/ISOProperties.h b/Source/Core/DolphinWX/ISOProperties.h index dfd202611b..84e3d86543 100644 --- a/Source/Core/DolphinWX/ISOProperties.h +++ b/Source/Core/DolphinWX/ISOProperties.h @@ -70,7 +70,7 @@ private: // Core wxCheckBox *CPUThread, *SkipIdle, *MMU, *BAT, *DCBZOFF, *FPRF; - wxCheckBox *SyncGPU, *FastDiscSpeed, *BlockMerging, *DSPHLE; + wxCheckBox *SyncGPU, *FastDiscSpeed, *DSPHLE; wxArrayString arrayStringFor_GPUDeterminism; wxChoice* GPUDeterminism; @@ -138,7 +138,6 @@ private: ID_DCBZOFF, ID_SYNCGPU, ID_DISCSPEED, - ID_MERGEBLOCKS, ID_AUDIO_DSP_HLE, ID_USE_BBOX, ID_ENABLEPROGRESSIVESCAN,