Fix bug on android with GL_EXT_debug_marker

src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp

 // Modified from chromium/src/webkit/glue/gl_bindings_skia_cmd_buffer.cc
 
 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gl/GrGLExtensions.h"
 #include "gl/GrGLInterface.h"
 #include "gl/GrGLUtil.h"
 
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES
 #endif
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 
 #include <EGL/egl.h>
 
 static GrGLInterface* create_es_interface(GrGLVersion version,
-                                          const GrGLExtensions& extensions) {
+                                          GrGLExtensions* extensions) {
     if (version < GR_GL_VER(2,0)) {
         return NULL;
     }
 
     GrGLInterface* interface = SkNEW(GrGLInterface);
     interface->fStandard = kGLES_GrGLStandard;
     GrGLInterface::Functions* functions = &interface->fFunctions;
 
     functions->fActiveTexture = glActiveTexture;
     functions->fAttachShader = glAttachShader;
@@ skipping 120 matching lines @@
     if (version >= GR_GL_VER(3,0)) {
 #if GL_ES_VERSION_3_0
         functions->fRenderbufferStorageMultisample = glRenderbufferStorageMultisample;
         functions->fBlitFramebuffer = glBlitFramebuffer;
 #else
         functions->fRenderbufferStorageMultisample = (GrGLRenderbufferStorageMultisampleProc) eglGetProcAddress("glRenderbufferStorageMultisample");
         functions->fBlitFramebuffer = (GrGLBlitFramebufferProc) eglGetProcAddress("glBlitFramebuffer");
 #endif
     }
 
-    if (extensions.has("GL_EXT_multisampled_render_to_texture")) {
+    if (extensions->has("GL_EXT_multisampled_render_to_texture")) {
 #if GL_EXT_multisampled_render_to_texture
         functions->fFramebufferTexture2DMultisample = glFramebufferTexture2DMultisampleEXT;
         functions->fRenderbufferStorageMultisampleES2EXT = glRenderbufferStorageMultisampleEXT;
 #else
         functions->fFramebufferTexture2DMultisample = (GrGLFramebufferTexture2DMultisampleProc) eglGetProcAddress("glFramebufferTexture2DMultisampleEXT");
         functions->fRenderbufferStorageMultisampleES2EXT = (GrGLRenderbufferStorageMultisampleProc) eglGetProcAddress("glRenderbufferStorageMultisampleEXT");
 #endif
-    } else if (extensions.has("GL_IMG_multisampled_render_to_texture")) {
+    } else if (extensions->has("GL_IMG_multisampled_render_to_texture")) {
 #if GL_IMG_multisampled_render_to_texture
         functions->fFramebufferTexture2DMultisample = glFramebufferTexture2DMultisampleIMG;
         functions->fRenderbufferStorageMultisampleES2EXT = glRenderbufferStorageMultisampleIMG;
 #else
         functions->fFramebufferTexture2DMultisample = (GrGLFramebufferTexture2DMultisampleProc) eglGetProcAddress("glFramebufferTexture2DMultisampleIMG");
         functions->fRenderbufferStorageMultisampleES2EXT = (GrGLRenderbufferStorageMultisampleProc) eglGetProcAddress("glRenderbufferStorageMultisampleIMG");
 #endif
     }
 
     functions->fGenFramebuffers = glGenFramebuffers;
     functions->fGenRenderbuffers = glGenRenderbuffers;
     functions->fGetFramebufferAttachmentParameteriv = glGetFramebufferAttachmentParameteriv;
     functions->fGetRenderbufferParameteriv = glGetRenderbufferParameteriv;
     functions->fRenderbufferStorage = glRenderbufferStorage;
 #if GL_OES_mapbuffer
     functions->fMapBuffer = glMapBufferOES;
     functions->fUnmapBuffer = glUnmapBufferOES;
 #else
     functions->fMapBuffer = (GrGLMapBufferProc) eglGetProcAddress("glMapBufferOES");
     functions->fUnmapBuffer = (GrGLUnmapBufferProc) eglGetProcAddress("glUnmapBufferOES");
 #endif
 
-    if (extensions.has("GL_EXT_debug_marker")) {
-        functions->fInsertEventMarker = (GrGLInsertEventMarkerProc) eglGetProcAddress("glInsertEventMarkerEXT");
-        functions->fPushGroupMarker = (GrGLInsertEventMarkerProc) eglGetProcAddress("glPushGroupMarkerEXT");
-        functions->fPopGroupMarker = (GrGLPopGroupMarkerProc) eglGetProcAddress("glPopGroupMarkerEXT");
+    if (extensions->has("GL_EXT_debug_marker")) {
+        functions->fInsertEventMarker = (GrGLInsertEventMarkerProc) eglGetProcAddress("glInsertEventMarker");
+        functions->fPushGroupMarker = (GrGLInsertEventMarkerProc) eglGetProcAddress("glPushGroupMarker");
+        functions->fPopGroupMarker = (GrGLPopGroupMarkerProc) eglGetProcAddress("glPopGroupMarker");
+        // The below check is here because a device has been found that has the extension string but
+        // returns NULL from the eglGetProcAddress for the functions
+        if (NULL == functions->fInsertEventMarker ||
+            NULL == functions->fPushGroupMarker ||
+            NULL == functions->fPopGroupMarker) {
+            extensions->remove("GL_EXT_debug_marker");
+        }
     }
 
     return interface;
 }
 
 static GrGLInterface* create_desktop_interface(GrGLVersion version,
                                                const GrGLExtensions& extensions) {
     // Currently this assumes a 4.4 context or later. Supporting lower GL versions would require
     // getting suffixed versions of pointers for supported extensions.
     if (version < GR_GL_VER(4,4)) {
@@ skipping 200 matching lines @@
     GrGLVersion version = GrGLGetVersionFromString(verStr);
     GrGLStandard standard = GrGLGetStandardInUseFromString(verStr);
 
     GrGLExtensions extensions;
     if (!extensions.init(standard, glGetString, getStringi, glGetIntegerv)) {
         return NULL;
     }
 
     GrGLInterface* interface = NULL;
     if (kGLES_GrGLStandard == standard) {
-        interface = create_es_interface(version, extensions);
+        interface = create_es_interface(version, &extensions);
     } else if (kGL_GrGLStandard == standard) {
         interface = create_desktop_interface(version, extensions);
     }
 
     if (NULL != interface) {
         interface->fExtensions.swap(&extensions);
     }
 
     return interface;
 }