diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-08-03 21:14:59 -0700 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-08-03 21:14:59 -0700 |
| commit | e15ec56bf0237dba3db5cf969d68566af3a79194 (patch) | |
| tree | 110dba64d967a44be6c1699f9331320cd21e877d /Source/Core/VideoBackends/OGL/main.cpp | |
| parent | 89adfba67bdf145ad0eae174cbe755f9aa7aa802 (diff) | |
| parent | 1fcf07f9cccf838894bf7a869ec0749cf2abbb2d (diff) | |
Merge pull request #716 from delroth/vertex-loader
Make vertex loader testable
Diffstat (limited to 'Source/Core/VideoBackends/OGL/main.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/main.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Source/Core/VideoBackends/OGL/main.cpp b/Source/Core/VideoBackends/OGL/main.cpp index 8ee6471019..44febec4a9 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, GetDisplayName(), "gfx_opengl"); } bool VideoBackend::Initialize(void *&window_handle) |