From 3d0ec2f2f1d53b2762e661a1095301f7e56f0eef Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sun, 12 Dec 2010 10:59:06 +0000 Subject: [PATCH] Remove the watermark tightness option since it's obsolete now. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6567 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DolphinWX/Src/ISOProperties.cpp | 29 ++----------------- Source/Core/DolphinWX/Src/ISOProperties.h | 4 --- .../Core/VideoCommon/Src/CommandProcessor.cpp | 2 +- Source/Core/VideoCommon/Src/VideoConfig.cpp | 3 -- Source/Core/VideoCommon/Src/VideoConfig.h | 1 - 5 files changed, 3 insertions(+), 36 deletions(-) diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index aa45995190..c1d3b1437b 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -343,10 +343,6 @@ void CISOProperties::CreateGUIControls(bool IsWad) arrayStringFor_Hack.Add(_("Metroid Other M")); Hack = new wxChoice(m_GameConfig, ID_HACK, wxDefaultPosition, wxDefaultSize, arrayStringFor_Hack, 0, wxDefaultValidator); - WMTightnessText = new wxStaticText(m_GameConfig, ID_WMTIGHTNESS_TEXT, wxT("Watermark tightness: "), wxDefaultPosition, wxDefaultSize); - WMTightness = new wxTextCtrl(m_GameConfig, ID_WMTIGHTNESS, wxT(""), wxDefaultPosition, wxDefaultSize, 0, wxTextValidator(wxFILTER_NUMERIC)); - WMTightness->SetToolTip(wxT("Change this if you get lots of FIFO overflow errors. Reasonable values range from 0 to 1000.")); - // Emulation State sEmuState = new wxBoxSizer(wxHORIZONTAL); EmuStateText = new wxStaticText(m_GameConfig, ID_EMUSTATE_TEXT, _("Emulation State: "), wxDefaultPosition, wxDefaultSize); @@ -380,13 +376,8 @@ void CISOProperties::CreateGUIControls(bool IsWad) sbVideoOverrides->Add(UseXFB, 0, wxEXPAND|wxLEFT, 5); sbVideoOverrides->Add(UseZTPSpeedupHack, 0, wxEXPAND|wxLEFT, 5); sbVideoOverrides->Add(DListCache, 0, wxEXPAND|wxLEFT, 5); - - wxFlexGridSizer* fifosizer = new wxFlexGridSizer(2, 2, 0, 0); - fifosizer->Add(Hacktext, 0, wxLEFT, 5); - fifosizer->Add(Hack, 0, wxEXPAND|wxLEFT, 5); - fifosizer->Add(WMTightnessText, 0, wxLEFT, 5); - fifosizer->Add(WMTightness, 0, wxEXPAND|wxLEFT, 5); - sbVideoOverrides->Add(fifosizer); + sbVideoOverrides->Add(Hacktext, 0, wxEXPAND|wxLEFT, 5); + sbVideoOverrides->Add(Hack, 0, wxEXPAND|wxLEFT, 5); sbGameConfig->Add(sbCoreOverrides, 0, wxEXPAND); sbGameConfig->Add(sbWiiOverrides, 0, wxEXPAND); @@ -909,11 +900,6 @@ void CISOProperties::LoadGameConfig() else DListCache->Set3StateValue(wxCHK_UNDETERMINED); - if (GameIni.Get("Video", "FIFOWatermarkTightness", &sTemp)) - WMTightness->SetValue(wxString(sTemp.c_str(), *wxConvCurrent)); - else - WMTightness->SetValue(wxT("50")); - GameIni.Get("Video", "ProjectionHack", &iTemp, 0/*None*/); Hack->SetSelection(iTemp); @@ -1026,18 +1012,7 @@ bool CISOProperties::SaveGameConfig() GameIni.Set("Video", "DlistCachingEnable", DListCache->Get3StateValue()); GameIni.Set("Video", "ProjectionHack", Hack->GetSelection()); - - if (WMTightness->GetValue().size() == 0) - GameIni.DeleteKey("Video", "FIFOWatermarkTightness"); - else - { - long val; - WMTightness->GetValue().ToLong(&val); - GameIni.Set("Video", "FIFOWatermarkTightness", (int)val); - } - GameIni.Set("EmuState", "EmulationStateId", EmuState->GetSelection()); - GameIni.Set("EmuState", "EmulationIssues", (const char*)EmuIssues->GetValue().mb_str(*wxConvCurrent)); PatchList_Save(); diff --git a/Source/Core/DolphinWX/Src/ISOProperties.h b/Source/Core/DolphinWX/Src/ISOProperties.h index 5960b3085a..662eb315ee 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.h +++ b/Source/Core/DolphinWX/Src/ISOProperties.h @@ -96,8 +96,6 @@ class CISOProperties : public wxDialog wxStaticText *Hacktext; wxArrayString arrayStringFor_Hack; wxChoice *Hack; - wxStaticText *WMTightnessText; - wxTextCtrl *WMTightness; wxButton *EditConfig; wxStaticText *EmuStateText; @@ -182,8 +180,6 @@ class CISOProperties : public wxDialog ID_DLISTCACHE, ID_HACK_TEXT, ID_HACK, - ID_WMTIGHTNESS_TEXT, - ID_WMTIGHTNESS, ID_ENABLEPROGRESSIVESCAN, ID_ENABLEWIDESCREEN, ID_EDITCONFIG, diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.cpp b/Source/Core/VideoCommon/Src/CommandProcessor.cpp index df0fc6fc02..1d78511a75 100644 --- a/Source/Core/VideoCommon/Src/CommandProcessor.cpp +++ b/Source/Core/VideoCommon/Src/CommandProcessor.cpp @@ -662,7 +662,7 @@ void STACKALIGN GatherPipeBursted() _assert_msg_(COMMANDPROCESSOR, fifo.CPReadWriteDistance <= fifo.CPEnd - fifo.CPBase, - "FIFO is overflown by GatherPipe !\nCPU thread is too fast, try changing the watermark tightness in the game properties."); + "FIFO is overflown by GatherPipe !\nCPU thread is too fast!"); // check if we are in sync _assert_msg_(COMMANDPROCESSOR, fifo.CPWritePointer == *(g_VideoInitialize.Fifo_CPUWritePointer), "FIFOs linked but out of sync"); diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp index 3c47ec2ad0..139db029d3 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.cpp +++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp @@ -108,7 +108,6 @@ 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", "FIFOWatermarkTightness", &iFIFOWatermarkTightness, 50); iniFile.Get("Hacks", "ProjectionHack", &iPhackvalue, 0); iniFile.Get("Hardware", "Adapter", &iAdapter, 0); @@ -155,8 +154,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", "FIFOWatermarkTightness")) - iniFile.Get("Video", "FIFOWatermarkTightness", &iFIFOWatermarkTightness); if (iniFile.Exists("Video", "ProjectionHack")) iniFile.Get("Video", "ProjectionHack", &iPhackvalue); if (iniFile.Exists("Video", "UseNativeMips")) diff --git a/Source/Core/VideoCommon/Src/VideoConfig.h b/Source/Core/VideoCommon/Src/VideoConfig.h index 32475b6e3e..b146cdc0fa 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.h +++ b/Source/Core/VideoCommon/Src/VideoConfig.h @@ -124,7 +124,6 @@ struct VideoConfig bool bCopyEFBScaled; bool bSafeTextureCache; int iSafeTextureCache_ColorSamples; - int iFIFOWatermarkTightness; int iPhackvalue; bool bPhackvalue1, bPhackvalue2; float fhackvalue1, fhackvalue2;