From 7ca8d8dfc7e9bf3b09f9cab929c98f9e607c298b Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 6 Aug 2014 00:44:21 -0400 Subject: Core: Don't pass through a reference to the window handle Now that MainNoGUI is properly architected and GLX doesn't need to sometimes craft its own windows sometimes which we have to thread back into MainNoGUI, we don't need to thread the window handle that GLX creates at all. This removes the reference to pass back here, and the g_pWindowHandle always be the same as the window returned by Host_GetRenderHandle(). A future cleanup could remove g_pWindowHandle entirely. --- Source/Core/VideoBackends/Software/SWmain.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/VideoBackends/Software/SWmain.cpp') diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp index 4892daeeee..4d4784b61d 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()); -- cgit v1.2.3 From 63f1a169696a9b9b519f3be4ee47ee7253f645a7 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 6 Aug 2014 22:38:39 -0400 Subject: 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. --- Source/Core/VideoBackends/Software/SWmain.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'Source/Core/VideoBackends/Software/SWmain.cpp') 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())); -} - } -- cgit v1.2.3