From 226a9c239220c5ba99508a6b96ce28903a35be80 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Fri, 1 Aug 2014 23:21:03 -0700 Subject: Move GLInterface around to remove VideoBackends dependency on DolphinWX --- Source/Core/VideoBackends/Software/SWmain.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 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 c4a6d2f0c8..7a0e88011f 100644 --- a/Source/Core/VideoBackends/Software/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/SWmain.cpp @@ -12,9 +12,11 @@ #include "Core/ConfigManager.h" #include "Core/Core.h" +#include "Core/Host.h" #include "Core/HW/Memmap.h" #include "Core/HW/VideoInterface.h" +#include "VideoBackends/OGL/GLInterfaceBase.h" #include "VideoBackends/OGL/GLExtensions/GLExtensions.h" #include "VideoBackends/Software/BPMemLoader.h" #include "VideoBackends/Software/Clipper.h" @@ -65,10 +67,7 @@ std::string VideoSoftware::GetName() const void VideoSoftware::ShowConfig(void *_hParent) { -#if defined(HAVE_WX) && HAVE_WX - VideoConfigDialog diag((wxWindow*)_hParent, "Software", "gfx_software"); - diag.ShowModal(); -#endif + Host_ShowVideoConfig(_hParent, "Software", "gfx_software"); } bool VideoSoftware::Initialize(void *&window_handle) -- cgit v1.2.3 From a66a7e1344bac0522dab868104be39923c1608bc Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 3 Aug 2014 20:07:27 -0400 Subject: Isolate D3D and Software Renderer from wxWidgets code --- Source/Core/VideoBackends/Software/SWmain.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 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 7a0e88011f..415fa0547b 100644 --- a/Source/Core/VideoBackends/Software/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/SWmain.cpp @@ -33,10 +33,6 @@ #include "VideoBackends/Software/VideoBackend.h" #include "VideoBackends/Software/XFMemLoader.h" -#if defined(HAVE_WX) && HAVE_WX -#include "VideoBackends/Software/VideoConfigDialog.h" -#endif // HAVE_WX - #include "VideoCommon/Fifo.h" #include "VideoCommon/OnScreenDisplay.h" #include "VideoCommon/PixelEngine.h" @@ -62,12 +58,17 @@ static std::mutex m_csSWVidOccupied; std::string VideoSoftware::GetName() const { - return _trans("Software Renderer"); + return "Software Renderer"; +} + +std::string VideoSoftware::GetDisplayName() const +{ + return "Software Renderer"; } -void VideoSoftware::ShowConfig(void *_hParent) +void VideoSoftware::ShowConfig(void *hParent) { - Host_ShowVideoConfig(_hParent, "Software", "gfx_software"); + Host_ShowVideoConfig(hParent, GetDisplayName(), "gfx_software"); } bool VideoSoftware::Initialize(void *&window_handle) -- cgit v1.2.3