diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2016-02-06 20:08:58 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2016-02-06 20:08:58 -0500 |
| commit | 36af9981c7326237259e78fd29b96c351c409739 (patch) | |
| tree | c5c6a69b7cbdfe2a7b375e0d7dc4e75ccec067e3 /Source/Core/Common/GL/GLInterface/GLInterface.cpp | |
| parent | d5836dfd5be96852da9eaf25ffaddf24f52fc026 (diff) | |
| parent | 2f7e3ae58e22b8cb307b4bcc5c3640efab5f922c (diff) | |
Merge pull request #3595 from Sonicadvance1/Android_headless
[Android] Headless support
Diffstat (limited to 'Source/Core/Common/GL/GLInterface/GLInterface.cpp')
| -rw-r--r-- | Source/Core/Common/GL/GLInterface/GLInterface.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/Core/Common/GL/GLInterface/GLInterface.cpp b/Source/Core/Common/GL/GLInterface/GLInterface.cpp index 6d4345e5c1..c7f2169c5a 100644 --- a/Source/Core/Common/GL/GLInterface/GLInterface.cpp +++ b/Source/Core/Common/GL/GLInterface/GLInterface.cpp @@ -6,9 +6,7 @@ #include "Common/GL/GLInterfaceBase.h" -#ifdef ANDROID -#include "Common/GL/GLInterface/EGLAndroid.h" -#elif defined(__APPLE__) +#if defined(__APPLE__) #include "Common/GL/GLInterface/AGL.h" #elif defined(_WIN32) #include "Common/GL/GLInterface/WGL.h" @@ -20,15 +18,15 @@ #endif #elif defined(USE_EGL) && USE_EGL && defined(USE_HEADLESS) #include "Common/GL/GLInterface/EGL.h" +#elif ANDROID +#include "Common/GL/GLInterface/EGLAndroid.h" #else #error Platform doesnt have a GLInterface #endif std::unique_ptr<cInterfaceBase> HostGL_CreateGLInterface() { - #ifdef ANDROID - return std::make_unique<cInterfaceEGLAndroid>(); - #elif defined(__APPLE__) + #if defined(__APPLE__) return std::make_unique<cInterfaceAGL>(); #elif defined(_WIN32) return std::make_unique<cInterfaceWGL>(); @@ -40,6 +38,8 @@ std::unique_ptr<cInterfaceBase> HostGL_CreateGLInterface() #else return std::make_unique<cInterfaceGLX>(); #endif + #elif ANDROID + return std::make_unique<cInterfaceEGLAndroid>(); #else return nullptr; #endif |