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/OGL/main.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'Source/Core/VideoBackends/OGL/main.cpp') diff --git a/Source/Core/VideoBackends/OGL/main.cpp b/Source/Core/VideoBackends/OGL/main.cpp index 8ee6471019..aa042c3405 100644 --- a/Source/Core/VideoBackends/OGL/main.cpp +++ b/Source/Core/VideoBackends/OGL/main.cpp @@ -49,6 +49,7 @@ Make AA apply instantly during gameplay if possible #include "Core/Host.h" #include "VideoBackends/OGL/FramebufferManager.h" +#include "VideoBackends/OGL/GLInterfaceBase.h" #include "VideoBackends/OGL/GLUtil.h" #include "VideoBackends/OGL/PerfQuery.h" #include "VideoBackends/OGL/PostProcessing.h" @@ -82,11 +83,6 @@ Make AA apply instantly during gameplay if possible #include "Common/IniFile.h" #endif -#if defined(HAVE_WX) && HAVE_WX -#include "DolphinWX/VideoConfigDiag.h" -#include "DolphinWX/Debugger/DebuggerPanel.h" -#endif // HAVE_WX - namespace OGL { @@ -160,11 +156,8 @@ static void InitBackendInfo() void VideoBackend::ShowConfig(void *_hParent) { -#if defined(HAVE_WX) && HAVE_WX InitBackendInfo(); - VideoConfigDiag diag((wxWindow*)_hParent, "OpenGL", "gfx_opengl"); - diag.ShowModal(); -#endif + Host_ShowVideoConfig(_hParent, "OpenGL", "gfx_opengl"); } bool VideoBackend::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/OGL/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/VideoBackends/OGL/main.cpp') diff --git a/Source/Core/VideoBackends/OGL/main.cpp b/Source/Core/VideoBackends/OGL/main.cpp index aa042c3405..44febec4a9 100644 --- a/Source/Core/VideoBackends/OGL/main.cpp +++ b/Source/Core/VideoBackends/OGL/main.cpp @@ -157,7 +157,7 @@ static void InitBackendInfo() void VideoBackend::ShowConfig(void *_hParent) { InitBackendInfo(); - Host_ShowVideoConfig(_hParent, "OpenGL", "gfx_opengl"); + Host_ShowVideoConfig(_hParent, GetDisplayName(), "gfx_opengl"); } bool VideoBackend::Initialize(void *&window_handle) -- cgit v1.2.3