diff options
| author | Markus Wick <markus+github@selfnet.de> | 2014-12-07 12:53:14 +0100 |
|---|---|---|
| committer | Markus Wick <markus+github@selfnet.de> | 2014-12-07 12:53:14 +0100 |
| commit | d83f0308af01bbfa0a1da451c55f2db48ac1617f (patch) | |
| tree | 475f366ae0346f245695a279ad2eb68632da67f7 /Source/Core/VideoBackends/OGL/Render.cpp | |
| parent | 81cc177c44b3aab4342774708329093a0ef2e5a0 (diff) | |
| parent | ce7c52eca0bb54fc6b1085c329a6fd42faac3aee (diff) | |
Merge pull request #1664 from Sonicadvance1/GLES3_stereo
Enables stereo rendering with OpenGL ES 3.1 + AEP.
Diffstat (limited to 'Source/Core/VideoBackends/OGL/Render.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/Render.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index f33c59899c..dc8cfa8075 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Render.cpp @@ -497,15 +497,17 @@ Renderer::Renderer() if (strstr(g_ogl_config.glsl_version, "3.0")) { g_ogl_config.eSupportedGLSLVersion = GLSLES_300; + g_ogl_config.bSupportsAEP = false; + g_Config.backend_info.bSupportsStereoscopy = false; } else { g_ogl_config.eSupportedGLSLVersion = GLSLES_310; + g_ogl_config.bSupportsAEP = GLExtensions::Supports("GL_ANDROID_extension_pack_es31a"); g_Config.backend_info.bSupportsBindingLayout = true; g_Config.backend_info.bSupportsEarlyZ = true; + g_Config.backend_info.bSupportsStereoscopy = g_ogl_config.bSupportsAEP; } - // TODO: OpenGL ES 3.1 provides the necessary features as extensions. - g_Config.backend_info.bSupportsStereoscopy = false; } else { @@ -532,6 +534,9 @@ Renderer::Renderer() { g_ogl_config.eSupportedGLSLVersion = GLSL_150; } + + // Desktop OpenGL can't have the Android Extension Pack + g_ogl_config.bSupportsAEP = false; } if (GLExtensions::Supports("GL_KHR_debug")) |