Extensible GL extension support

1 files changed, 3 insertions, 84 deletions

diff --git a/android/cpp/native_map_view.cpp b/android/cpp/native_map_view.cpp
index 4a2e4099a3..4cd1669ef9 100644
--- a/android/cpp/native_map_view.cpp
+++ b/android/cpp/native_map_view.cpp
@@ -585,90 +585,9 @@ EGLConfig NativeMapView::chooseConfig(const EGLConfig configs[], EGLint numConfi
 }
 
 void loadExtensions() {
-    const GLubyte *str = glGetString(GL_EXTENSIONS);
-    if (str == nullptr) {
-        mbgl::Log::Error(mbgl::Event::OpenGL, "glGetString(GL_EXTENSIONS) returned error %d",
-                         glGetError());
-        return;
-    }
-
-    std::string extensions(reinterpret_cast<const char *>(str));
-
-    if (extensions.find("GL_OES_vertex_array_object") != std::string::npos) {
-        mbgl::Log::Info(mbgl::Event::OpenGL, "Using GL_OES_vertex_array_object.");
-        gl::BindVertexArray = reinterpret_cast<gl::PFNGLBINDVERTEXARRAYPROC>(
-            eglGetProcAddress("glBindVertexArrayOES"));
-        gl::DeleteVertexArrays = reinterpret_cast<gl::PFNGLDELETEVERTEXARRAYSPROC>(
-            eglGetProcAddress("glDeleteVertexArraysOES"));
-        gl::GenVertexArrays = reinterpret_cast<gl::PFNGLGENVERTEXARRAYSPROC>(
-            eglGetProcAddress("glGenVertexArraysOES"));
-        gl::IsVertexArray =
-            reinterpret_cast<gl::PFNGLISVERTEXARRAYPROC>(eglGetProcAddress("glIsVertexArrayOES"));
-        assert(gl::BindVertexArray != nullptr);
-        assert(gl::DeleteVertexArrays != nullptr);
-        assert(gl::GenVertexArrays != nullptr);
-        assert(gl::IsVertexArray != nullptr);
-    }
-
-    if (extensions.find("GL_KHR_debug") != std::string::npos) {
-        mbgl::Log::Info(mbgl::Event::OpenGL, "Using GL_KHR_debug.");
-        gl::DebugMessageControl = reinterpret_cast<gl::PFNGLDEBUGMESSAGECONTROLPROC>(
-            eglGetProcAddress("glDebugMessageControl"));
-        gl::DebugMessageInsert = reinterpret_cast<gl::PFNGLDEBUGMESSAGEINSERTPROC>(
-            eglGetProcAddress("glDebugMessageInsert"));
-        gl::DebugMessageCallback = reinterpret_cast<gl::PFNGLDEBUGMESSAGECALLBACKPROC>(
-            eglGetProcAddress("glDebugMessageCallback"));
-        gl::GetDebugMessageLog = reinterpret_cast<gl::PFNGLGETDEBUGMESSAGELOGPROC>(
-            eglGetProcAddress("glGetDebugMessageLog"));
-        gl::GetPointerv =
-            reinterpret_cast<gl::PFNGLGETPOINTERVPROC>(eglGetProcAddress("glGetPointerv"));
-        gl::PushDebugGroup =
-            reinterpret_cast<gl::PFNGLPUSHDEBUGGROUPPROC>(eglGetProcAddress("glPushDebugGroup"));
-        gl::PopDebugGroup =
-            reinterpret_cast<gl::PFNGLPOPDEBUGGROUPPROC>(eglGetProcAddress("glPopDebugGroup"));
-        gl::ObjectLabel =
-            reinterpret_cast<gl::PFNGLOBJECTLABELPROC>(eglGetProcAddress("glObjectLabel"));
-        gl::GetObjectLabel =
-            reinterpret_cast<gl::PFNGLGETOBJECTLABELPROC>(eglGetProcAddress("glGetObjectLabel"));
-        gl::ObjectPtrLabel =
-            reinterpret_cast<gl::PFNGLOBJECTPTRLABELPROC>(eglGetProcAddress("glObjectPtrLabel"));
-        gl::GetObjectPtrLabel = reinterpret_cast<gl::PFNGLGETOBJECTPTRLABELPROC>(
-            eglGetProcAddress("glGetObjectPtrLabel"));
-        assert(gl::DebugMessageControl != nullptr);
-        assert(gl::DebugMessageInsert != nullptr);
-        assert(gl::DebugMessageCallback != nullptr);
-        assert(gl::GetDebugMessageLog != nullptr);
-        assert(gl::GetPointerv != nullptr);
-        assert(gl::PushDebugGroup != nullptr);
-        assert(gl::PopDebugGroup != nullptr);
-        assert(gl::ObjectLabel != nullptr);
-        assert(gl::GetObjectLabel != nullptr);
-        assert(gl::ObjectPtrLabel != nullptr);
-        assert(gl::GetObjectPtrLabel != nullptr);
-    } else {
-        if (extensions.find("GL_EXT_debug_marker") != std::string::npos) {
-            mbgl::Log::Info(mbgl::Event::OpenGL, "Using GL_EXT_debug_marker.");
-            gl::InsertEventMarkerEXT = reinterpret_cast<gl::PFNGLINSERTEVENTMARKEREXTPROC>(
-                eglGetProcAddress("glInsertEventMarkerEXT"));
-            gl::PushGroupMarkerEXT = reinterpret_cast<gl::PFNGLPUSHGROUPMARKEREXTPROC>(
-                eglGetProcAddress("glPushGroupMarkerEXT"));
-            gl::PopGroupMarkerEXT = reinterpret_cast<gl::PFNGLPOPGROUPMARKEREXTPROC>(
-                eglGetProcAddress("glPopGroupMarkerEXT"));
-            assert(gl::InsertEventMarkerEXT != nullptr);
-            assert(gl::PushGroupMarkerEXT != nullptr);
-            assert(gl::PopGroupMarkerEXT != nullptr);
-        }
-
-        if (extensions.find("GL_EXT_debug_label") != std::string::npos) {
-            mbgl::Log::Info(mbgl::Event::OpenGL, "Using GL_EXT_debug_label.");
-            gl::LabelObjectEXT = reinterpret_cast<gl::PFNGLLABELOBJECTEXTPROC>(
-                eglGetProcAddress("glLabelObjectEXT"));
-            gl::GetObjectLabelEXT = reinterpret_cast<gl::PFNGLGETOBJECTLABELEXTPROC>(
-                eglGetProcAddress("glGetObjectLabelEXT"));
-            assert(gl::LabelObjectEXT != nullptr);
-            assert(gl::GetObjectLabelEXT != nullptr);
-        }
-    }
+    mbgl::gl::InitializeExtensions([] (const char * name) {
+         return reinterpret_cast<mbgl::gl::glProc>(eglGetProcAddress(name));
+    });
 }
 
 void NativeMapView::pause() {