From 184e4d7b4a16b2c2f6a4e40c3c4452344b3d8565 Mon Sep 17 00:00:00 2001 From: Jonathan Hamilton Date: Tue, 25 Jul 2017 12:52:39 -0700 Subject: [PATCH] Fix an incorrect OES suffix on glMultiDrawElementsBaseVertex The spec says it should have an EXT not OES suffix, as it's enabled as an interaction with GL_EXT_multi_draw_arrays. On some drivers GetProcAddress() returns NULL, which causes the GLExtensions init to fail This 'happened' to work if GetProcAddress() doesn't return NULL on missing functions (as allowed in EGL) - as the function appears to never be called so this would not have been noticed. Mesa also (incorrectly?) exports the EXT version, so this would all happen to work there, but appears to be contrary to the spec. This invalid prefix even ended up in the upstream khronos registry, the issue was reported here: https://github.com/KhronosGroup/OpenGL-Registry/issues/81 --- Source/Core/Common/GL/GLExtensions/GLExtensions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Common/GL/GLExtensions/GLExtensions.cpp b/Source/Core/Common/GL/GLExtensions/GLExtensions.cpp index cba40b35dc..80670b981d 100644 --- a/Source/Core/Common/GL/GLExtensions/GLExtensions.cpp +++ b/Source/Core/Common/GL/GLExtensions/GLExtensions.cpp @@ -1742,7 +1742,7 @@ const GLFunc gl_function_array[] = { "GL_OES_draw_elements_base_vertex VERSION_GLES_3 !VERSION_GLES_3_2"), GLFUNC_SUFFIX(glDrawRangeElementsBaseVertex, OES, "GL_OES_draw_elements_base_vertex VERSION_GLES_3 !VERSION_GLES_3_2"), - GLFUNC_SUFFIX(glMultiDrawElementsBaseVertex, OES, + GLFUNC_SUFFIX(glMultiDrawElementsBaseVertex, EXT, "GL_OES_draw_elements_base_vertex GL_EXT_multi_draw_arrays"), // EXT_draw_elements_base_vertex