aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Hal Canary <halcanary@google.com>2018-03-22 13:53:22 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-03-22 19:08:05 +0000
commit0fd12755e9a9c6e6ff8d19d97bb8c62e554319e2 (patch)
treef77996846232120011c4a6ef83bcabff96bd3cf0 /src
parent1b6930f55c7c05a8ae498d7905198764ec7cb549 (diff)
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>
Diffstat (limited to 'src')
-rw-r--r--src/gpu/gl/GrGLAssembleInterface.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/gpu/gl/GrGLAssembleInterface.cpp b/src/gpu/gl/GrGLAssembleInterface.cpp
index 5b4bde3610..6282488389 100644
--- a/src/gpu/gl/GrGLAssembleInterface.cpp
+++ b/src/gpu/gl/GrGLAssembleInterface.cpp
@@ -446,7 +446,16 @@ sk_sp<const GrGLInterface> GrGLMakeAssembledGLESInterface(void *ctx, GrGLGetProc
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 @@ sk_sp<const GrGLInterface> GrGLMakeAssembledGLESInterface(void *ctx, GrGLGetProc
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 @@ sk_sp<const GrGLInterface> GrGLMakeAssembledGLESInterface(void *ctx, GrGLGetProc
GET_PROC(GenBuffers);
GET_PROC(GenerateMipmap);
GET_PROC(GenTextures);
- GET_PROC_SUFFIX(GenVertexArrays, OES);
GET_PROC(GetBufferParameteriv);
GET_PROC(GetError);
GET_PROC(GetIntegerv);