From 67e6ae5faccbcfe62bc0d16384f9ca29b6a741b9 Mon Sep 17 00:00:00 2001 From: Marko Pusljar Date: Tue, 27 Jul 2010 10:29:34 +0000 Subject: [PATCH] BPHack option removed (it was not used anymore) git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5984 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DolphinWX/Src/ISOProperties.cpp | 12 ------------ Source/Core/DolphinWX/Src/ISOProperties.h | 3 +-- Source/Core/VideoCommon/Src/VideoConfig.cpp | 6 ------ Source/Core/VideoCommon/Src/VideoConfig.h | 5 ----- 4 files changed, 1 insertion(+), 25 deletions(-) diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index 6211c9e6b4..48f375bc0f 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -317,7 +317,6 @@ void CISOProperties::CreateGUIControls(bool IsWad) DstAlphaPass = new wxCheckBox(m_GameConfig, ID_DSTALPHAPASS, _("Distance Alpha Pass"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); UseXFB = new wxCheckBox(m_GameConfig, ID_USEXFB, _("Use XFB"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); // Hack - BPHack = new wxCheckBox(m_GameConfig, ID_BPHACK, _("FIFO BP Hack"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); Hacktext = new wxStaticText(m_GameConfig, ID_HACK_TEXT, _("Projection Hack for: "), wxDefaultPosition, wxDefaultSize); arrayStringFor_Hack.Add(_("None")); arrayStringFor_Hack.Add(_("Zelda Twilight Princess Bloom hack")); @@ -356,7 +355,6 @@ void CISOProperties::CreateGUIControls(bool IsWad) sbVideoOverrides->Add(SafeTextureCache, 0, wxEXPAND|wxLEFT, 5); sbVideoOverrides->Add(DstAlphaPass, 0, wxEXPAND|wxLEFT, 5); sbVideoOverrides->Add(UseXFB, 0, wxEXPAND|wxLEFT, 5); - sbVideoOverrides->Add(BPHack, 0, wxEXPAND|wxLEFT, 5); wxFlexGridSizer* fifosizer = new wxFlexGridSizer(2, 2, 0, 0); fifosizer->Add(Hacktext, 0, wxLEFT, 5); @@ -856,11 +854,6 @@ void CISOProperties::LoadGameConfig() else UseXFB->Set3StateValue(wxCHK_UNDETERMINED); - if (GameIni.Get("Video", "FIFOBPHack", &bTemp)) - BPHack->Set3StateValue((wxCheckBoxState)bTemp); - else - BPHack->Set3StateValue(wxCHK_UNDETERMINED); - if (GameIni.Get("Video", "FIFOWatermarkTightness", &sTemp)) WMTightness->SetValue(wxString(sTemp.c_str(), *wxConvCurrent)); else @@ -942,11 +935,6 @@ bool CISOProperties::SaveGameConfig() else GameIni.Set("Video", "UseXFB", UseXFB->Get3StateValue()); - if (BPHack->Get3StateValue() == wxCHK_UNDETERMINED) - GameIni.DeleteKey("Video", "FIFOBPHack"); - else - GameIni.Set("Video", "FIFOBPHack", BPHack->Get3StateValue()); - if (Hack->GetSelection() == -1) GameIni.DeleteKey("Video", "ProjectionHack"); else diff --git a/Source/Core/DolphinWX/Src/ISOProperties.h b/Source/Core/DolphinWX/Src/ISOProperties.h index 18759ee443..36b4cd2aea 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.h +++ b/Source/Core/DolphinWX/Src/ISOProperties.h @@ -84,7 +84,7 @@ class CISOProperties : public wxDialog wxStaticText *OverrideText; // Core - wxCheckBox *CPUThread, *SkipIdle, *TLBHack, *BPHack; + wxCheckBox *CPUThread, *SkipIdle, *TLBHack; // Wii wxCheckBox *EnableProgressiveScan, *EnableWideScreen; // Video @@ -165,7 +165,6 @@ class CISOProperties : public wxDialog ID_USEDUALCORE, ID_IDLESKIP, ID_TLBHACK, - ID_BPHACK, ID_FORCEFILTERING, ID_EFBCOPYDISABLE, ID_EFBTOTEXTUREENABLE, diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp index 93b0548304..c45d1ea1f9 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.cpp +++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp @@ -94,14 +94,12 @@ void VideoConfig::Load(const char *ini_file) iniFile.Get("Hacks", "EFBCopyDisableHotKey", &bOSDHotKey, 0); iniFile.Get("Hacks", "EFBToTextureEnable", &bCopyEFBToTexture, false); iniFile.Get("Hacks", "EFBScaledCopy", &bCopyEFBScaled, true); - iniFile.Get("Hacks", "FIFOBPHack", &bFIFOBPhack, false); iniFile.Get("Hacks", "FIFOWatermarkTightness", &iFIFOWatermarkTightness, 50); iniFile.Get("Hacks", "ProjectionHack", &iPhackvalue, 0); iniFile.Get("Hardware", "Adapter", &iAdapter, 0); if (iAdapter == -1) iAdapter = 0; - iniFile.Get("Hardware", "SimpleFB", &bSimpleFB, false); // Load common settings iniFile.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX)); @@ -144,8 +142,6 @@ void VideoConfig::GameIniLoad(const char *ini_file) iniFile.Get("Video", "UseXFB", &bUseXFB); if (iniFile.Exists("Video", "UseRealXFB")) iniFile.Get("Video", "UseRealXFB", &bUseRealXFB); - if (iniFile.Exists("Video", "FIFOBPHack")) - iniFile.Get("Video", "FIFOBPHack", &bFIFOBPhack); if (iniFile.Exists("Video", "FIFOWatermarkTightness")) iniFile.Get("Video", "FIFOWatermarkTightness", &iFIFOWatermarkTightness); if (iniFile.Exists("Video", "ProjectionHack")) @@ -204,11 +200,9 @@ void VideoConfig::Save(const char *ini_file) iniFile.Set("Hacks", "EFBCopyDisableHotKey", bOSDHotKey); iniFile.Set("Hacks", "EFBToTextureEnable", bCopyEFBToTexture); iniFile.Set("Hacks", "EFBScaledCopy", bCopyEFBScaled); - iniFile.Set("Hacks", "FIFOBPHack", bFIFOBPhack); iniFile.Set("Hacks", "ProjectionHack", iPhackvalue); iniFile.Set("Hardware", "Adapter", iAdapter); - iniFile.Set("Hardware", "SimpleFB", bSimpleFB); iniFile.Save(ini_file); } diff --git a/Source/Core/VideoCommon/Src/VideoConfig.h b/Source/Core/VideoCommon/Src/VideoConfig.h index 2ace261fe6..6b6a5f2b8f 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.h +++ b/Source/Core/VideoCommon/Src/VideoConfig.h @@ -119,7 +119,6 @@ struct VideoConfig bool bCopyEFBScaled; bool bSafeTextureCache; int iSafeTextureCache_ColorSamples; - bool bFIFOBPhack; int iFIFOWatermarkTightness; int iPhackvalue; bool bPhackvalue1, bPhackvalue2; @@ -137,10 +136,6 @@ struct VideoConfig // D3D only config, mostly to be merged into the above int iAdapter; - // With this enabled, the plugin renders directly to the backbuffer. Many features are - // disabled but it might be faster on really old GPUs. - bool bSimpleFB; - // Static config per API bool bAllowSignedBytes; };