commit af000f469e1b0153ce445c96ca3d20e6d12224cc
author paraboul <paraboul@gmail.com> Mon Nov 24 07:05:27 2014 -0800
committer Commit bot <commit-bot@chromium.org> Mon Nov 24 07:05:28 2014 -0800
tree ebcfeb918aefac246857233ae7f0a9d10b174dcf
parent 91175f19664a62851da4ca4e0984a7c7c45b258f

Add gpu support for Apple specific 'Vertex Arrays' functions

BUG=skia:

Review URL: https://codereview.chromium.org/754653002

AUTHORS

diff --git a/AUTHORS b/AUTHORS
index c36ea2c..1b98402 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -32,3 +32,4 @@
 Thiago Fransosi Farina <thiago.farina@gmail.com>
 Pavel Krajcevski <pavel@cs.unc.edu>
 Ion Rosca <rosca@adobe.com>
+Anthony Catel <paraboul@gmail.com>

src/gpu/gl/GrGLAssembleInterface.cpp

diff --git a/src/gpu/gl/GrGLAssembleInterface.cpp b/src/gpu/gl/GrGLAssembleInterface.cpp
index 425ed64..25f9e16 100644
--- a/src/gpu/gl/GrGLAssembleInterface.cpp
+++ b/src/gpu/gl/GrGLAssembleInterface.cpp
@@ -196,6 +196,10 @@
         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")) {

src/gpu/gl/GrGLCaps.cpp

diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp
index 6272aba..414f06d 100644
--- a/src/gpu/gl/GrGLCaps.cpp
+++ b/src/gpu/gl/GrGLCaps.cpp
@@ -235,7 +235,8 @@
 
     if (kGL_GrGLStandard == standard) {
         fVertexArrayObjectSupport = version >= GR_GL_VER(3, 0) ||
-                                    ctxInfo.hasExtension("GL_ARB_vertex_array_object");
+                                    ctxInfo.hasExtension("GL_ARB_vertex_array_object") ||
+                                    ctxInfo.hasExtension("GL_APPLE_vertex_array_object");
     } else {
         fVertexArrayObjectSupport = version >= GR_GL_VER(3, 0) ||
                                     ctxInfo.hasExtension("GL_OES_vertex_array_object");