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/GLUtil.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/GLUtil.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/GLUtil.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
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) |