From e0f35e0e59983bad2c3ccad061ef9c80d8152c64 Mon Sep 17 00:00:00 2001 From: comex Date: Sat, 23 Aug 2014 15:26:59 -0400 Subject: [PATCH] Remove unused declarations. --- Source/Core/Core/Core.cpp | 3 --- Source/Core/DolphinWX/VideoConfigDiag.cpp | 2 ++ .../Software/SWCommandProcessor.cpp | 19 ------------------- 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp index 8a0cc0a274..4e3d874133 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -115,9 +115,6 @@ std::string StopMessage(bool bMainThread, std::string Message) void DisplayMessage(const std::string& message, int time_in_ms) { - SCoreStartupParameter& _CoreParameter = - SConfig::GetInstance().m_LocalCoreStartupParameter; - // Actually displaying non-ASCII could cause things to go pear-shaped for (const char& c : message) { diff --git a/Source/Core/DolphinWX/VideoConfigDiag.cpp b/Source/Core/DolphinWX/VideoConfigDiag.cpp index 0bd5a8ccff..3bf38b2cef 100644 --- a/Source/Core/DolphinWX/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/VideoConfigDiag.cpp @@ -154,6 +154,7 @@ static wxString cache_efb_copies_desc = wxTRANSLATE("Slightly speeds up EFB to R static wxString shader_errors_desc = wxTRANSLATE("Usually if shader compilation fails, an error message is displayed.\nHowever, one may skip the popups to allow interruption free gameplay by checking this option.\n\nIf unsure, leave this unchecked."); +#if !defined(__APPLE__) // Search for available resolutions - TODO: Move to Common? static wxArrayString GetListOfResolutions() { @@ -214,6 +215,7 @@ static wxArrayString GetListOfResolutions() #endif return retlist; } +#endif VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, const std::string& _ininame) : wxDialog(parent, -1, diff --git a/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp b/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp index 63b85794ce..b205c112ea 100644 --- a/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp +++ b/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp @@ -60,25 +60,6 @@ void DoState(PointerWrap &p) p.DoArray(g_pVideoData,writePos); } -// does it matter that there is no synchronization between threads during writes? -static inline void WriteLow (u32& _reg, u16 lowbits) -{ - _reg = (_reg & 0xFFFF0000) | lowbits; -} -static inline void WriteHigh(u32& _reg, u16 highbits) -{ - _reg = (_reg & 0x0000FFFF) | ((u32)highbits << 16); -} - -static inline u16 ReadLow(u32 _reg) -{ - return (u16)(_reg & 0xFFFF); -} -static inline u16 ReadHigh(u32 _reg) -{ - return (u16)(_reg >> 16); -} - static void UpdateInterrupts_Wrapper(u64 userdata, int cyclesLate) { UpdateInterrupts(userdata);