Merge pull request #764 from magcius/new-nogui-2

Rewrite GLInterface

2 files changed, 2 insertions, 9 deletions

diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp
index 4892daeeee..7cbc278029 100644
--- a/Source/Core/VideoBackends/Software/SWmain.cpp
+++ b/Source/Core/VideoBackends/Software/SWmain.cpp
@@ -71,7 +71,7 @@ void VideoSoftware::ShowConfig(void *hParent)
 	Host_ShowVideoConfig(hParent, GetDisplayName(), "gfx_software");
 }
 
-bool VideoSoftware::Initialize(void *&window_handle)
+bool VideoSoftware::Initialize(void *window_handle)
 {
 	g_SWVideoConfig.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_software.ini").c_str());
 
@@ -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 dbfe1c7cab..4ade7bed9a 100644
--- a/Source/Core/VideoBackends/Software/VideoBackend.h
+++ b/Source/Core/VideoBackends/Software/VideoBackend.h
@@ -10,7 +10,7 @@ namespace SW
 
 class VideoSoftware : public VideoBackend
 {
-	bool Initialize(void *&) override;
+	bool Initialize(void *window_handle) override;
 	void Shutdown() override;
 
 	std::string GetName() const override;
@@ -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;