commit 7a1f09ca2b0859655dfe5fbca3e4e2eae6144f9c
author Brian Salomon <bsalomon@google.com> Thu Jan 26 09:16:02 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jan 26 18:07:39 2017 +0000
tree a1dd27b4d6554f54fe6c6aeb3660a8d4c607776e
parent 0c0da2b0e21e37c33ae577e0af3e921df320ce5b

Fix extension suffic for getting procs from GL_EXT_debug_marker on ES

Change-Id: I483fbf7c5f6d4489802def78fa855f70313e4a19
Reviewed-on: https://skia-review.googlesource.com/7602
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/gl/GrGLAssembleInterface.cpp

diff --git a/src/gpu/gl/GrGLAssembleInterface.cpp b/src/gpu/gl/GrGLAssembleInterface.cpp
index 1c10214..3dbff4c 100644
--- a/src/gpu/gl/GrGLAssembleInterface.cpp
+++ b/src/gpu/gl/GrGLAssembleInterface.cpp
@@ -808,16 +808,9 @@
     }
 
     if (extensions.has("GL_EXT_debug_marker")) {
-        GET_PROC(InsertEventMarker);
-        GET_PROC(PushGroupMarker);
-        GET_PROC(PopGroupMarker);
-        // The below check is here because a device has been found that has the extension string but
-        // returns nullptr from the eglGetProcAddress for the functions
-        if (nullptr == functions->fInsertEventMarker ||
-            nullptr == functions->fPushGroupMarker ||
-            nullptr == functions->fPopGroupMarker) {
-            extensions.remove("GL_EXT_debug_marker");
-        }
+        GET_PROC_SUFFIX(InsertEventMarker, EXT);
+        GET_PROC_SUFFIX(PushGroupMarker, EXT);
+        GET_PROC_SUFFIX(PopGroupMarker, EXT);
     }
 
     GET_PROC(InvalidateFramebuffer);