diff options
-rw-r--r-- | AUTHORS | 1 | ||||
-rw-r--r-- | src/gpu/gl/GrGLAssembleInterface.cpp | 4 | ||||
-rw-r--r-- | src/gpu/gl/GrGLCaps.cpp | 3 |
3 files changed, 1 insertions, 7 deletions
@@ -32,4 +32,3 @@ The Chromium Authors <*@chromium.org> Thiago Fransosi Farina <thiago.farina@gmail.com> Pavel Krajcevski <pavel@cs.unc.edu> Ion Rosca <rosca@adobe.com> -Anthony Catel <paraboul@gmail.com> diff --git a/src/gpu/gl/GrGLAssembleInterface.cpp b/src/gpu/gl/GrGLAssembleInterface.cpp index 25f9e161f4..425ed647c5 100644 --- a/src/gpu/gl/GrGLAssembleInterface.cpp +++ b/src/gpu/gl/GrGLAssembleInterface.cpp @@ -196,10 +196,6 @@ const GrGLInterface* GrGLAssembleGLInterface(void* ctx, GrGLGetProc get) { GET_PROC(BindVertexArray); GET_PROC(GenVertexArrays); GET_PROC(DeleteVertexArrays); - } else if (extensions.has("GL_APPLE_vertex_array_object")) { - GET_PROC_SUFFIX(BindVertexArray, APPLE); - GET_PROC_SUFFIX(GenVertexArrays, APPLE); - GET_PROC_SUFFIX(DeleteVertexArrays, APPLE); } if (glVer >= GR_GL_VER(3,0) || extensions.has("GL_ARB_map_buffer_range")) { diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index 414f06d6ae..6272aba127 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -235,8 +235,7 @@ bool GrGLCaps::init(const GrGLContextInfo& ctxInfo, const GrGLInterface* gli) { if (kGL_GrGLStandard == standard) { fVertexArrayObjectSupport = version >= GR_GL_VER(3, 0) || - ctxInfo.hasExtension("GL_ARB_vertex_array_object") || - ctxInfo.hasExtension("GL_APPLE_vertex_array_object"); + ctxInfo.hasExtension("GL_ARB_vertex_array_object"); } else { fVertexArrayObjectSupport = version >= GR_GL_VER(3, 0) || ctxInfo.hasExtension("GL_OES_vertex_array_object"); |