Core: Remove UpdateFPSDisplay

This is effectively unused, as the window handles that we pass to the
GLInterface are window handles for the frame which isn't ever a real
toplevel window. Host_UpdateTitle is what actually sets the proper title
on the render window.

16 files changed, 0 insertions, 49 deletions

diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp
index 16ae870ae8..a72115de56 100644
--- a/Source/Core/Core/Core.cpp
+++ b/Source/Core/Core/Core.cpp
@@ -694,9 +694,6 @@ void UpdateTitle()
 	std::string SMessage = StringFromFormat("%s | %s", SSettings.c_str(), SFPS.c_str());
 	std::string TMessage = StringFromFormat("%s | %s", scm_rev_str, SMessage.c_str());
 
-	// Show message
-	g_video_backend->UpdateFPSDisplay(SMessage);
-
 	// Update the audio timestretcher with the current speed
 	if (soundStream)
 	{
diff --git a/Source/Core/DolphinWX/GLInterface/EGL.cpp b/Source/Core/DolphinWX/GLInterface/EGL.cpp
index 8c58e9432e..b6b52ead0a 100644
--- a/Source/Core/DolphinWX/GLInterface/EGL.cpp
+++ b/Source/Core/DolphinWX/GLInterface/EGL.cpp
@@ -7,9 +7,6 @@
 #include "VideoCommon/RenderBase.h"
 
 // Show the current FPS
-void cInterfaceEGL::UpdateFPSDisplay(const std::string& text)
-{
-}
 void cInterfaceEGL::Swap()
 {
 	eglSwapBuffers(GLWin.egl_dpy, GLWin.egl_surf);
diff --git a/Source/Core/DolphinWX/GLInterface/EGL.h b/Source/Core/DolphinWX/GLInterface/EGL.h
index 63772f192b..480029419a 100644
--- a/Source/Core/DolphinWX/GLInterface/EGL.h
+++ b/Source/Core/DolphinWX/GLInterface/EGL.h
@@ -18,7 +18,6 @@ public:
 	void SwapInterval(int Interval);
 	void Swap();
 	void SetMode(u32 mode) { s_opengl_mode = mode; }
-	void UpdateFPSDisplay(const std::string& text);
 	void* GetFuncAddress(const std::string& name);
 	bool Create(void *window_handle);
 	bool MakeCurrent();
diff --git a/Source/Core/DolphinWX/GLInterface/GLX.cpp b/Source/Core/DolphinWX/GLInterface/GLX.cpp
index 69c376f4f2..0365e5d8b9 100644
--- a/Source/Core/DolphinWX/GLInterface/GLX.cpp
+++ b/Source/Core/DolphinWX/GLInterface/GLX.cpp
@@ -12,12 +12,6 @@
 typedef int ( * PFNGLXSWAPINTERVALSGIPROC) (int interval);
 static PFNGLXSWAPINTERVALSGIPROC glXSwapIntervalSGI = nullptr;
 
-// Show the current FPS
-void cInterfaceGLX::UpdateFPSDisplay(const std::string& text)
-{
-	XStoreName(GLWin.dpy, GLWin.win, text.c_str());
-}
-
 void cInterfaceGLX::SwapInterval(int Interval)
 {
 	if (glXSwapIntervalSGI)
diff --git a/Source/Core/DolphinWX/GLInterface/GLX.h b/Source/Core/DolphinWX/GLInterface/GLX.h
index f48e27de79..2e811fd323 100644
--- a/Source/Core/DolphinWX/GLInterface/GLX.h
+++ b/Source/Core/DolphinWX/GLInterface/GLX.h
@@ -17,7 +17,6 @@ public:
 	friend class cX11Window;
 	void SwapInterval(int Interval) override;
 	void Swap() override;
-	void UpdateFPSDisplay(const std::string& text) override;
 	void* GetFuncAddress(const std::string& name) override;
 	bool Create(void *window_handle);
 	bool MakeCurrent() override;
diff --git a/Source/Core/DolphinWX/GLInterface/WGL.cpp b/Source/Core/DolphinWX/GLInterface/WGL.cpp
index 295d21a2bc..5783999274 100644
--- a/Source/Core/DolphinWX/GLInterface/WGL.cpp
+++ b/Source/Core/DolphinWX/GLInterface/WGL.cpp
@@ -55,12 +55,6 @@ bool cInterfaceWGL::PeekMessages()
 	return TRUE;
 }
 
-// Show the current FPS
-void cInterfaceWGL::UpdateFPSDisplay(const std::string& text)
-{
-	SetWindowTextA(m_window_handle, text.c_str());
-}
-
 // Create rendering window.
 // Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize()
 bool cInterfaceWGL::Create(void *window_handle)
diff --git a/Source/Core/DolphinWX/GLInterface/WGL.h b/Source/Core/DolphinWX/GLInterface/WGL.h
index 3c9c7373fa..ea0c22c9d1 100644
--- a/Source/Core/DolphinWX/GLInterface/WGL.h
+++ b/Source/Core/DolphinWX/GLInterface/WGL.h
@@ -12,7 +12,6 @@ class cInterfaceWGL : public cInterfaceBase
 public:
 	void SwapInterval(int Interval);
 	void Swap();
-	void UpdateFPSDisplay(const std::string& text);
 	void* GetFuncAddress(const std::string& name);
 	bool Create(void *window_handle);
 	bool MakeCurrent();
diff --git a/Source/Core/VideoBackends/D3D/VideoBackend.h b/Source/Core/VideoBackends/D3D/VideoBackend.h
index 4f529ff9f0..d28f1b545f 100644
--- a/Source/Core/VideoBackends/D3D/VideoBackend.h
+++ b/Source/Core/VideoBackends/D3D/VideoBackend.h
@@ -19,7 +19,6 @@ class VideoBackend : public VideoBackendHardware
 
 	void ShowConfig(void* parent) override;
 
-	void UpdateFPSDisplay(const std::string&) override;
 	unsigned int PeekMessages() override;
 
 	void* m_window_handle;
diff --git a/Source/Core/VideoBackends/D3D/main.cpp b/Source/Core/VideoBackends/D3D/main.cpp
index 4bbaa894d7..38edd04668 100644
--- a/Source/Core/VideoBackends/D3D/main.cpp
+++ b/Source/Core/VideoBackends/D3D/main.cpp
@@ -51,12 +51,6 @@ unsigned int VideoBackend::PeekMessages()
 	return TRUE;
 }
 
-void VideoBackend::UpdateFPSDisplay(const std::string& text)
-{
-	std::string str = StringFromFormat("%s | D3D | %s", scm_rev_str, text.c_str());
-	SetWindowTextA((HWND)m_window_handle, str.c_str());
-}
-
 std::string VideoBackend::GetName() const
 {
 	return "D3D";
diff --git a/Source/Core/VideoBackends/OGL/GLInterfaceBase.h b/Source/Core/VideoBackends/OGL/GLInterfaceBase.h
index 70a4cf56e7..b274182042 100644
--- a/Source/Core/VideoBackends/OGL/GLInterfaceBase.h
+++ b/Source/Core/VideoBackends/OGL/GLInterfaceBase.h
@@ -25,7 +25,6 @@ protected:
 	u32 s_opengl_mode;
 public:
 	virtual void Swap() {}
-	virtual void UpdateFPSDisplay(const std::string& text) {}
 	virtual void SetMode(u32 mode) { s_opengl_mode = GLInterfaceMode::MODE_OPENGL; }
 	virtual u32 GetMode() { return s_opengl_mode; }
 	virtual void* GetFuncAddress(const std::string& name) { return nullptr; }
diff --git a/Source/Core/VideoBackends/OGL/GLUtil.cpp b/Source/Core/VideoBackends/OGL/GLUtil.cpp
index e0eb748019..d2ffdaf803 100644
--- a/Source/Core/VideoBackends/OGL/GLUtil.cpp
+++ b/Source/Core/VideoBackends/OGL/GLUtil.cpp
@@ -26,12 +26,6 @@ unsigned int VideoBackend::PeekMessages()
 	return GLInterface->PeekMessages();
 }
 
-// Show the current FPS
-void VideoBackend::UpdateFPSDisplay(const std::string& text)
-{
-	return GLInterface->UpdateFPSDisplay(StringFromFormat("%s | %s | %s", scm_rev_str, GetDisplayName().c_str(), text.c_str()));
-}
-
 }
 void InitInterface()
 {
diff --git a/Source/Core/VideoBackends/OGL/VideoBackend.h b/Source/Core/VideoBackends/OGL/VideoBackend.h
index ab043395f6..28ac91c848 100644
--- a/Source/Core/VideoBackends/OGL/VideoBackend.h
+++ b/Source/Core/VideoBackends/OGL/VideoBackend.h
@@ -19,7 +19,6 @@ class VideoBackend : public VideoBackendHardware
 
 	void ShowConfig(void* parent) override;
 
-	void UpdateFPSDisplay(const std::string&) override;
 	unsigned int PeekMessages() override;
 };
 
diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp
index 4d4784b61d..7cbc278029 100644
--- a/Source/Core/VideoBackends/Software/SWmain.cpp
+++ b/Source/Core/VideoBackends/Software/SWmain.cpp
@@ -372,10 +372,4 @@ unsigned int VideoSoftware::PeekMessages()
 	return GLInterface->PeekMessages();
 }
 
-// Show the current FPS
-void VideoSoftware::UpdateFPSDisplay(const std::string& text)
-{
-	GLInterface->UpdateFPSDisplay(StringFromFormat("%s | Software | %s", scm_rev_str, text.c_str()));
-}
-
 }
diff --git a/Source/Core/VideoBackends/Software/VideoBackend.h b/Source/Core/VideoBackends/Software/VideoBackend.h
index 19c555632e..4ade7bed9a 100644
--- a/Source/Core/VideoBackends/Software/VideoBackend.h
+++ b/Source/Core/VideoBackends/Software/VideoBackend.h
@@ -48,7 +48,6 @@ class VideoSoftware : public VideoBackend
 
 	void RegisterCPMMIO(MMIO::Mapping* mmio, u32 base) override;
 
-	void UpdateFPSDisplay(const std::string&) override;
 	unsigned int PeekMessages() override;
 
 	void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) override;
diff --git a/Source/Core/VideoCommon/Debugger.cpp b/Source/Core/VideoCommon/Debugger.cpp
index b5dcca740f..41e263c1e1 100644
--- a/Source/Core/VideoCommon/Debugger.cpp
+++ b/Source/Core/VideoCommon/Debugger.cpp
@@ -14,8 +14,6 @@
 #include "VideoCommon/VertexShaderGen.h"
 #include "VideoCommon/VideoConfig.h"
 
-//void UpdateFPSDisplay(const char *text);
-
 GFXDebuggerBase *g_pdebugger = nullptr;
 volatile bool GFXDebuggerPauseFlag = false; // if true, the GFX thread will be spin locked until it's false again
 volatile PauseEvent GFXDebuggerToPauseAtNext = NOT_PAUSE; // Event which will trigger spin locking the GFX thread
@@ -57,8 +55,6 @@ void GFXDebuggerCheckAndPause(bool update)
 		g_pdebugger->OnPause();
 		while ( GFXDebuggerPauseFlag )
 		{
-			g_video_backend->UpdateFPSDisplay("Paused by Video Debugger");
-
 			if (update) GFXDebuggerUpdateScreen();
 			SLEEP(5);
 		}
diff --git a/Source/Core/VideoCommon/VideoBackendBase.h b/Source/Core/VideoCommon/VideoBackendBase.h
index 5c361e8115..b1fe931888 100644
--- a/Source/Core/VideoCommon/VideoBackendBase.h
+++ b/Source/Core/VideoCommon/VideoBackendBase.h
@@ -68,8 +68,6 @@ public:
 
 	virtual void EmuStateChange(EMUSTATE_CHANGE) = 0;
 
-	virtual void UpdateFPSDisplay(const std::string&) = 0;
-
 	virtual unsigned int PeekMessages() = 0;
 
 	virtual bool Initialize(void *window_handle) = 0;