From 71828e02f7209a39d3f45b568c5c9f8449dd452c Mon Sep 17 00:00:00 2001 From: skidau Date: Tue, 16 Apr 2013 21:18:53 +1000 Subject: [PATCH] Renamed the VBeam variable for clarity. --- Source/Core/Core/Src/BootManager.cpp | 8 ++++---- Source/Core/Core/Src/ConfigManager.cpp | 2 +- Source/Core/Core/Src/CoreParameter.cpp | 4 ++-- Source/Core/Core/Src/CoreParameter.h | 2 +- Source/Core/Core/Src/HW/SystemTimers.cpp | 4 +--- Source/Core/Core/Src/HW/VideoInterface.cpp | 4 ++-- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp index 88e0cebcb6..f4322c30c2 100644 --- a/Source/Core/Core/Src/BootManager.cpp +++ b/Source/Core/Core/Src/BootManager.cpp @@ -55,7 +55,7 @@ namespace BootManager struct ConfigCache { bool valid, bCPUThread, bSkipIdle, bEnableFPRF, bMMU, bDCBZOFF, - bVBeam, bSyncGPU, bFastDiscSpeed, bMergeBlocks, bDSPHLE, bHLE_BS2; + bVBeamSpeedHack, bSyncGPU, bFastDiscSpeed, bMergeBlocks, bDSPHLE, bHLE_BS2; int iTLBHack, iCPUCore; std::string strBackend; }; @@ -94,7 +94,7 @@ bool BootCore(const std::string& _rFilename) config_cache.bMMU = StartUp.bMMU; config_cache.bDCBZOFF = StartUp.bDCBZOFF; config_cache.iTLBHack = StartUp.iTLBHack; - config_cache.bVBeam = StartUp.bVBeam; + config_cache.bVBeamSpeedHack = StartUp.bVBeamSpeedHack; config_cache.bSyncGPU = StartUp.bSyncGPU; config_cache.bFastDiscSpeed = StartUp.bFastDiscSpeed; config_cache.bMergeBlocks = StartUp.bMergeBlocks; @@ -109,7 +109,7 @@ bool BootCore(const std::string& _rFilename) game_ini.Get("Core", "MMU", &StartUp.bMMU, StartUp.bMMU); game_ini.Get("Core", "TLBHack", &StartUp.iTLBHack, StartUp.iTLBHack); game_ini.Get("Core", "DCBZ", &StartUp.bDCBZOFF, StartUp.bDCBZOFF); - game_ini.Get("Core", "VBeam", &StartUp.bVBeam, StartUp.bVBeam); + game_ini.Get("Core", "VBeam", &StartUp.bVBeamSpeedHack, StartUp.bVBeamSpeedHack); game_ini.Get("Core", "SyncGPU", &StartUp.bSyncGPU, StartUp.bSyncGPU); game_ini.Get("Core", "FastDiscSpeed", &StartUp.bFastDiscSpeed, StartUp.bFastDiscSpeed); game_ini.Get("Core", "BlockMerging", &StartUp.bMergeBlocks, StartUp.bMergeBlocks); @@ -169,7 +169,7 @@ void Stop() StartUp.bMMU = config_cache.bMMU; StartUp.bDCBZOFF = config_cache.bDCBZOFF; StartUp.iTLBHack = config_cache.iTLBHack; - StartUp.bVBeam = config_cache.bVBeam; + StartUp.bVBeamSpeedHack = config_cache.bVBeamSpeedHack; StartUp.bSyncGPU = config_cache.bSyncGPU; StartUp.bFastDiscSpeed = config_cache.bFastDiscSpeed; StartUp.bMergeBlocks = config_cache.bMergeBlocks; diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index ab0fef3498..d60242a772 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -403,7 +403,7 @@ void SConfig::LoadSettings() ini.Get("Core", "RunCompareClient", &m_LocalCoreStartupParameter.bRunCompareClient, false); ini.Get("Core", "MMU", &m_LocalCoreStartupParameter.bMMU, false); ini.Get("Core", "TLBHack", &m_LocalCoreStartupParameter.iTLBHack, 0); - ini.Get("Core", "VBeam", &m_LocalCoreStartupParameter.bVBeam, false); + ini.Get("Core", "VBeam", &m_LocalCoreStartupParameter.bVBeamSpeedHack, false); ini.Get("Core", "SyncGPU", &m_LocalCoreStartupParameter.bSyncGPU, false); ini.Get("Core", "FastDiscSpeed", &m_LocalCoreStartupParameter.bFastDiscSpeed, false); ini.Get("Core", "DCBZ", &m_LocalCoreStartupParameter.bDCBZOFF, false); diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp index fcb35eccc3..6a06f13661 100644 --- a/Source/Core/Core/Src/CoreParameter.cpp +++ b/Source/Core/Core/Src/CoreParameter.cpp @@ -49,7 +49,7 @@ SCoreStartupParameter::SCoreStartupParameter() bMergeBlocks(false), bEnableMemcardSaving(true), bDPL2Decoder(false), iLatency(14), bRunCompareServer(false), bRunCompareClient(false), - bMMU(false), bDCBZOFF(false), iTLBHack(0), bVBeam(false), + bMMU(false), bDCBZOFF(false), iTLBHack(0), bVBeamSpeedHack(false), bSyncGPU(false), bFastDiscSpeed(false), SelectedLanguage(0), bWii(false), bConfirmStop(false), bHideCursor(false), @@ -77,7 +77,7 @@ void SCoreStartupParameter::LoadDefaults() bMMU = false; bDCBZOFF = false; iTLBHack = 0; - bVBeam = false; + bVBeamSpeedHack = false; bSyncGPU = false; bFastDiscSpeed = false; bMergeBlocks = false; diff --git a/Source/Core/Core/Src/CoreParameter.h b/Source/Core/Core/Src/CoreParameter.h index 3a1dc2ba3a..6cd9b4a8be 100644 --- a/Source/Core/Core/Src/CoreParameter.h +++ b/Source/Core/Core/Src/CoreParameter.h @@ -116,7 +116,7 @@ struct SCoreStartupParameter bool bMMU; bool bDCBZOFF; int iTLBHack; - bool bVBeam; + bool bVBeamSpeedHack; bool bSyncGPU; bool bFastDiscSpeed; diff --git a/Source/Core/Core/Src/HW/SystemTimers.cpp b/Source/Core/Core/Src/HW/SystemTimers.cpp index dda8ca4882..cebf4267d8 100644 --- a/Source/Core/Core/Src/HW/SystemTimers.cpp +++ b/Source/Core/Core/Src/HW/SystemTimers.cpp @@ -240,8 +240,6 @@ void PreInit() void Init() { - const int fields = SConfig::GetInstance().m_LocalCoreStartupParameter.bVBeam ? 2 : 1; - if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii) { // AyuanX: TO BE TWEAKED @@ -250,7 +248,7 @@ void Init() // FYI, WII_IPC_HLE_Interface::Update is also called in WII_IPCInterface::Write32 const int freq = 1500; - IPC_HLE_PERIOD = GetTicksPerSecond() / (freq * fields); + IPC_HLE_PERIOD = GetTicksPerSecond() / (freq * VideoInterface::GetNumFields()); } // System internal sample rate is fixed at 32KHz * 4 (16bit Stereo) / 32 bytes DMA diff --git a/Source/Core/Core/Src/HW/VideoInterface.cpp b/Source/Core/Core/Src/HW/VideoInterface.cpp index 3e18f6eab6..9d025edb06 100644 --- a/Source/Core/Core/Src/HW/VideoInterface.cpp +++ b/Source/Core/Core/Src/HW/VideoInterface.cpp @@ -786,7 +786,7 @@ void UpdateParameters() int GetNumFields() { - if (Core::g_CoreStartupParameter.bVBeam) + if (Core::g_CoreStartupParameter.bVBeamSpeedHack) return (2 / fields); else return 1; @@ -800,7 +800,7 @@ unsigned int GetTicksPerLine() } else { - if (Core::g_CoreStartupParameter.bVBeam) + if (Core::g_CoreStartupParameter.bVBeamSpeedHack) return TicksPerFrame / s_lineCount; else return TicksPerFrame / (s_lineCount / (2 / fields)) ;