diff options
| author | Lioncash <mathew1800@gmail.com> | 2014-11-21 20:08:49 -0500 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-11-21 20:08:49 -0500 |
| commit | f8879c8ec63c29520eeb14c0661dc343cf1d2079 (patch) | |
| tree | 2217660c05679164feb993f1de4de14fcb56fdab /Source/Core/VideoBackends | |
| parent | 3b6c49c8db72f657d72ee57d701e6b6a91098190 (diff) | |
| parent | 2fdeefb65b776d39cd18ffd638f21d424c40b6f7 (diff) | |
Merge pull request #1583 from Sonicadvance1/mobile-draw-elements-base-vertex
Adds support for OpenGL ES draw_elements_base_vertex.
Diffstat (limited to 'Source/Core/VideoBackends')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp | 6 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/OGL/Render.cpp | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp index 5cb449b00d..b5e45a16c0 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp +++ b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp @@ -1536,6 +1536,12 @@ const GLFunc gl_function_array[] = GLFUNC_REQUIRES(glDrawRangeElementsBaseVertex, "GL_ARB_draw_elements_base_vertex"), GLFUNC_REQUIRES(glMultiDrawElementsBaseVertex, "GL_ARB_draw_elements_base_vertex"), + // EXT_draw_elements_base_vertex + GLFUNC_SUFFIX(glDrawElementsBaseVertex, EXT, "GL_EXT_draw_elements_base_vertex !GL_ARB_draw_elements_base_vertex"), + GLFUNC_SUFFIX(glDrawElementsInstancedBaseVertex, EXT, "GL_EXT_draw_elements_base_vertex VERSION_GLES3 !GL_ARB_draw_elements_base_vertex"), + GLFUNC_SUFFIX(glDrawRangeElementsBaseVertex, EXT, "GL_EXT_draw_elements_base_vertex VERSION_GLES3 !GL_ARB_draw_elements_base_vertex"), + GLFUNC_SUFFIX(glMultiDrawElementsBaseVertex, EXT, "GL_EXT_draw_elements_base_vertex GL_EXT_multi_draw_arrays !GL_ARB_draw_elements_base_vertex"), + // ARB_sample_shading GLFUNC_REQUIRES(glMinSampleShadingARB, "GL_ARB_sample_shading"), diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index 502b7d31af..3d21b6891c 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Render.cpp @@ -475,7 +475,8 @@ Renderer::Renderer() g_ogl_config.bSupportsGLSLCache = GLExtensions::Supports("GL_ARB_get_program_binary"); g_ogl_config.bSupportsGLPinnedMemory = GLExtensions::Supports("GL_AMD_pinned_memory"); g_ogl_config.bSupportsGLSync = GLExtensions::Supports("GL_ARB_sync"); - g_ogl_config.bSupportsGLBaseVertex = GLExtensions::Supports("GL_ARB_draw_elements_base_vertex"); + g_ogl_config.bSupportsGLBaseVertex = GLExtensions::Supports("GL_ARB_draw_elements_base_vertex") || + GLExtensions::Supports("GL_EXT_draw_elements_base_vertex"); g_ogl_config.bSupportsGLBufferStorage = GLExtensions::Supports("GL_ARB_buffer_storage"); g_ogl_config.bSupportsMSAA = GLExtensions::Supports("GL_ARB_texture_multisample"); g_ogl_config.bSupportSampleShading = GLExtensions::Supports("GL_ARB_sample_shading"); |
