Move GLInterface around to remove VideoBackends dependency on DolphinWX

Source/Core/DolphinWX/CMakeLists.txt

@@ -123,6 +123,7 @@ else()
 
 	endif()
 endif()
+set(SRCS ${SRCS} GLInterface/GLInterface.cpp)
 
 if(WIN32)
 	set(SRCS ${SRCS} stdafx.cpp)

Source/Core/DolphinWX/DolphinWX.vcxproj

@@ -74,6 +74,7 @@
     <ClCompile Include="FrameTools.cpp" />
     <ClCompile Include="GameListCtrl.cpp" />
     <ClCompile Include="GeckoCodeDiag.cpp" />
+    <ClCompile Include="GLInterface\GLInterface.cpp" />
     <ClCompile Include="GLInterface\WGL.cpp" />
     <ClCompile Include="HotkeyDlg.cpp" />
     <ClCompile Include="InputConfigDiag.cpp" />
@@ -125,7 +126,6 @@
     <ClInclude Include="Frame.h" />
     <ClInclude Include="GameListCtrl.h" />
     <ClInclude Include="GeckoCodeDiag.h" />
-    <ClInclude Include="GLInterface\InterfaceBase.h" />
     <ClInclude Include="GLInterface\WGL.h" />
     <ClInclude Include="Globals.h" />
     <ClInclude Include="HotkeyDlg.h" />

Source/Core/DolphinWX/DolphinWX.vcxproj.filters

@@ -27,6 +27,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="GLInterface\GLInterface.cpp" />
     <ClCompile Include="GLInterface\WGL.cpp" />
     <ClCompile Include="Main.cpp" />
     <ClCompile Include="MainNoGUI.cpp" />
@@ -155,7 +156,6 @@
     <ClCompile Include="stdafx.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="GLInterface\InterfaceBase.h" />
     <ClInclude Include="GLInterface\WGL.h" />
     <ClInclude Include="Main.h" />
     <ClInclude Include="WXInputBase.h" />

Source/Core/DolphinWX/GLInterface/AGL.h

@@ -8,7 +8,7 @@
 #import <AppKit/AppKit.h>
 #endif
 
-#include "DolphinWX/GLInterface/InterfaceBase.h"
+#include "VideoBackends/OGL/GLInterfaceBase.h"
 
 class cInterfaceAGL : public cInterfaceBase
 {

Source/Core/DolphinWX/GLInterface/EGL.h

@@ -8,7 +8,7 @@
 #include <EGL/egl.h>
 
 #include "Core/ConfigManager.h"
-#include "DolphinWX/GLInterface/InterfaceBase.h"
+#include "VideoBackends/OGL/GLInterfaceBase.h"
 
 
 class cPlatform

Source/Core/DolphinWX/GLInterface/GLInterface.cpp

@@ -0,0 +1,23 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
+#include "DolphinWX/GLInterface/GLInterface.h"
+#include "VideoBackends/OGL/GLInterfaceBase.h"
+
+GLWindow GLWin;
+
+cInterfaceBase* HostGL_CreateGLInterface()
+{
+	#if defined(USE_EGL) && USE_EGL
+		return new cInterfaceEGL;
+	#elif defined(__APPLE__)
+		return new cInterfaceAGL;
+	#elif defined(_WIN32)
+		return new cInterfaceWGL;
+	#elif defined(HAVE_X11) && HAVE_X11
+		return new cInterfaceGLX;
+	#else
+		return nullptr;
+	#endif
+}

Source/Core/DolphinWX/GLInterface/GLInterface.h

@@ -108,5 +108,4 @@ typedef struct {
 	unsigned int width, height;
 } GLWindow;
 
-extern cInterfaceBase *GLInterface;
 extern GLWindow GLWin;

Source/Core/DolphinWX/GLInterface/GLX.h

@@ -6,8 +6,8 @@
 
 #include <string>
 
-#include "DolphinWX/GLInterface/InterfaceBase.h"
 #include "DolphinWX/GLInterface/X11_Util.h"
+#include "VideoBackends/OGL/GLInterfaceBase.h"
 
 class cInterfaceGLX : public cInterfaceBase
 {

Source/Core/DolphinWX/GLInterface/InterfaceBase.h

@@ -1,43 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include <string>
-
-#include "Common/Common.h"
-
-enum GLInterfaceMode {
-	MODE_DETECT = 0,
-	MODE_OPENGL,
-	MODE_OPENGLES2,
-	MODE_OPENGLES3,
-};
-
-class cInterfaceBase
-{
-protected:
-	// Window dimensions.
-	u32 s_backbuffer_width;
-	u32 s_backbuffer_height;
-
-	u32 s_opengl_mode;
-public:
-	virtual void Swap() {}
-	virtual void UpdateFPSDisplay(const std::string& text) {}
-	virtual void SetMode(u32 mode) { s_opengl_mode = GLInterfaceMode::MODE_OPENGL; }
-	virtual u32 GetMode() { return s_opengl_mode; }
-	virtual void* GetFuncAddress(const std::string& name) { return nullptr; }
-	virtual bool Create(void *&window_handle) { return true; }
-	virtual bool MakeCurrent() { return true; }
-	virtual bool ClearCurrent() { return true; }
-	virtual void Shutdown() {}
-
-	virtual void SwapInterval(int Interval) { }
-	virtual u32 GetBackBufferWidth() { return s_backbuffer_width; }
-	virtual u32 GetBackBufferHeight() { return s_backbuffer_height; }
-	virtual void SetBackBufferDimensions(u32 W, u32 H) {s_backbuffer_width = W; s_backbuffer_height = H; }
-	virtual void Update() { }
-	virtual bool PeekMessages() { return false; }
-};

Source/Core/DolphinWX/GLInterface/WGL.h

@@ -5,7 +5,7 @@
 #pragma once
 
 #include <string>
-#include "DolphinWX/GLInterface/InterfaceBase.h"
+#include "VideoBackends/OGL/GLInterfaceBase.h"
 
 class cInterfaceWGL : public cInterfaceBase
 {

Source/Core/DolphinWX/Main.cpp

@@ -46,6 +46,7 @@
 #include "DolphinWX/Frame.h"
 #include "DolphinWX/Globals.h"
 #include "DolphinWX/Main.h"
+#include "DolphinWX/VideoConfigDiag.h"
 #include "DolphinWX/WxUtils.h"
 #include "DolphinWX/Debugger/CodeWindow.h"
 #include "DolphinWX/Debugger/JitWindow.h"
@@ -699,3 +700,11 @@ void Host_ConnectWiimote(int wm_idx, bool connect)
 {
 	CFrame::ConnectWiimote(wm_idx, connect);
 }
+
+void Host_ShowVideoConfig(void* parent, const std::string& backend_name,
+                          const std::string& config_name)
+{
+	VideoConfigDiag diag((wxWindow*)parent, WxStrToStr(backend_name),
+	                     WxStrToStr(config_name));
+	diag.ShowModal();
+}

Source/Core/DolphinWX/MainAndroid.cpp

@@ -127,6 +127,8 @@ void Host_SysMessage(const char *fmt, ...)
 
 void Host_SetWiiMoteConnectionState(int _State) {}
 
+void Host_ShowVideoConfig(void*, const std::string&, const std::string&) {}
+
 #define DVD_BANNER_WIDTH 96
 #define DVD_BANNER_HEIGHT 32
 std::vector<std::string> m_volume_names;

Source/Core/DolphinWX/MainNoGUI.cpp

@@ -17,6 +17,7 @@
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/CoreParameter.h"
+#include "Core/Host.h"
 #include "Core/HW/Wiimote.h"
 #include "Core/PowerPC/PowerPC.h"
 
@@ -135,6 +136,8 @@ void Host_SysMessage(const char *fmt, ...)
 
 void Host_SetWiiMoteConnectionState(int _State) {}
 
+void Host_ShowVideoConfig(void*, const std::string&, const std::string&) {}
+
 #if HAVE_X11
 void X11_MainLoop()
 {

Source/Core/DolphinWX/VideoConfigDiag.cpp

@@ -31,6 +31,7 @@
 #include "DolphinWX/Main.h"
 #include "DolphinWX/VideoConfigDiag.h"
 #include "DolphinWX/WxUtils.h"
+#include "VideoBackends/OGL/main.h"
 #include "VideoCommon/VideoBackendBase.h"
 #include "VideoCommon/VideoConfig.h"