diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-05-05 22:47:15 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-05-05 23:37:01 -0500 |
| commit | 09def3ed3f4dc746ffa9c0b6ebd749ff751ec6f5 (patch) | |
| tree | 3ce4e04a346794838db0d6317e0c585539b3f3f0 /Source/Core | |
| parent | b2d3dc8a681767d7da69dfd5932f0a9daecfdb3d (diff) | |
[Android] Add in a compiling option for GLES3
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Common/Src/VideoBackendBase.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/Core/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/GLInterface/EGL.cpp | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/Source/Core/Common/Src/VideoBackendBase.cpp b/Source/Core/Common/Src/VideoBackendBase.cpp index 8db4e2ff79..99bce01156 100644 --- a/Source/Core/Common/Src/VideoBackendBase.cpp +++ b/Source/Core/Common/Src/VideoBackendBase.cpp @@ -9,7 +9,7 @@ #include "../../../Plugins/Plugin_VideoDX9/Src/VideoBackend.h" #include "../../../Plugins/Plugin_VideoDX11/Src/VideoBackend.h" #endif -#ifndef USE_GLES +#if !defined(USE_GLES) || USE_GLES3 #include "../../../Plugins/Plugin_VideoOGL/Src/VideoBackend.h" #endif #include "../../../Plugins/Plugin_VideoSoftware/Src/VideoBackend.h" @@ -45,7 +45,7 @@ void VideoBackend::PopulateList() if (IsGteVista()) g_available_video_backends.push_back(backends[0] = new DX11::VideoBackend); #endif -#ifndef USE_GLES +#if !defined(USE_GLES) || USE_GLES3 g_available_video_backends.push_back(backends[1] = new OGL::VideoBackend); #endif g_available_video_backends.push_back(backends[3] = new SW::VideoSoftware); diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt index d0ad3c615d..5474083132 100644 --- a/Source/Core/Core/CMakeLists.txt +++ b/Source/Core/Core/CMakeLists.txt @@ -217,7 +217,7 @@ endif() set(LIBS bdisasm inputcommon videosoftware sfml-network) -if(NOT USE_GLES) +if(NOT USE_GLES OR USE_GLES3) set(LIBS ${LIBS} videoogl) endif() diff --git a/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp index aa26c40b6f..6c12c1156c 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp +++ b/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp @@ -52,7 +52,11 @@ bool cInterfaceEGL::Create(void *&window_handle) EGL_BLUE_SIZE, 8, EGL_DEPTH_SIZE, 24, #ifdef USE_GLES +#ifdef USE_GLES3 + EGL_RENDERABLE_TYPE, (1 << 6) /* EGL_OPENGL_ES3_BIT */, +#else EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, +#endif #else EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT, #endif |