commit 0fd12755e9a9c6e6ff8d19d97bb8c62e554319e2
author Hal Canary <halcanary@google.com> Thu Mar 22 13:53:22 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Mar 22 19:08:05 2018 +0000
tree f77996846232120011c4a6ef83bcabff96bd3cf0
parent 1b6930f55c7c05a8ae498d7905198764ec7cb549

GrGLES Interface: GL_OES_vertex_array_object ext

Change-Id: I712ec637b5699587a77ab4a6cd48784df075d8c5
Reviewed-on: https://skia-review.googlesource.com/115933
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>

src/gpu/gl/GrGLAssembleInterface.cpp

diff --git a/src/gpu/gl/GrGLAssembleInterface.cpp b/src/gpu/gl/GrGLAssembleInterface.cpp
index 5b4bde3..6282488 100644
--- a/src/gpu/gl/GrGLAssembleInterface.cpp
+++ b/src/gpu/gl/GrGLAssembleInterface.cpp
@@ -446,7 +446,16 @@
     GET_PROC(BindAttribLocation);
     GET_PROC(BindBuffer);
     GET_PROC(BindTexture);
-    GET_PROC_SUFFIX(BindVertexArray, OES);
+
+    if (version >= GR_GL_VER(3,0)) {
+        GET_PROC(BindVertexArray);
+        GET_PROC(DeleteVertexArrays);
+        GET_PROC(GenVertexArrays);
+    } else if (extensions.has("GL_OES_vertex_array_object")) {
+        GET_PROC_SUFFIX(BindVertexArray, OES);
+        GET_PROC_SUFFIX(DeleteVertexArrays, OES);
+        GET_PROC_SUFFIX(GenVertexArrays, OES);
+    }
 
     if (version >= GR_GL_VER(3,0) && extensions.has("GL_EXT_blend_func_extended")) {
         GET_PROC_SUFFIX(BindFragDataLocation, EXT);
@@ -483,7 +492,6 @@
     GET_PROC(DeleteProgram);
     GET_PROC(DeleteShader);
     GET_PROC(DeleteTextures);
-    GET_PROC_SUFFIX(DeleteVertexArrays, OES);
     GET_PROC(DepthMask);
     GET_PROC(Disable);
     GET_PROC(DisableVertexAttribArray);
@@ -515,7 +523,6 @@
     GET_PROC(GenBuffers);
     GET_PROC(GenerateMipmap);
     GET_PROC(GenTextures);
-    GET_PROC_SUFFIX(GenVertexArrays, OES);
     GET_PROC(GetBufferParameteriv);
     GET_PROC(GetError);
     GET_PROC(GetIntegerv);