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/GLUtil.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'Source/Core/VideoBackends/OGL/GLUtil.cpp') diff --git a/Source/Core/VideoBackends/OGL/GLUtil.cpp b/Source/Core/VideoBackends/OGL/GLUtil.cpp index 97d4378239..ac3894e42d 100644 --- a/Source/Core/VideoBackends/OGL/GLUtil.cpp +++ b/Source/Core/VideoBackends/OGL/GLUtil.cpp @@ -8,13 +8,13 @@ #include "Core/ConfigManager.h" #include "Core/Core.h" +#include "VideoBackends/OGL/GLInterfaceBase.h" #include "VideoBackends/OGL/GLUtil.h" #include "VideoBackends/OGL/Render.h" #include "VideoBackends/OGL/VideoBackend.h" #include "VideoCommon/VideoConfig.h" -GLWindow GLWin; cInterfaceBase *GLInterface; namespace OGL @@ -35,15 +35,7 @@ void VideoBackend::UpdateFPSDisplay(const std::string& text) } void InitInterface() { - #if defined(USE_EGL) && USE_EGL - GLInterface = new cInterfaceEGL; - #elif defined(__APPLE__) - GLInterface = new cInterfaceAGL; - #elif defined(_WIN32) - GLInterface = new cInterfaceWGL; - #elif defined(HAVE_X11) && HAVE_X11 - GLInterface = new cInterfaceGLX; - #endif + GLInterface = HostGL_CreateGLInterface(); } GLuint OpenGL_CompileProgram(const char* vertexShader, const char* fragmentShader) -- cgit v1.2.3