Set vertex array object function pointers in GL interfaces used by Skia.

Review URL: https://codereview.chromium.org/12391072 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186172 0039d316-1c4b-4281-b951-d872f2087c98
Denger-Network · Mar 5, 2013 · 5fc973f · 5fc973f
1 parent e0774ec
commit 5fc973f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/ui/gl/gl_bindings_skia_in_process.cc b/ui/gl/gl_bindings_skia_in_process.cc
@@ -60,6 +60,10 @@ GLvoid StubGLBindTexture(GLenum target, GLuint texture) {
   glBindTexture(target, texture);
 }
 
+GLvoid StubGLBindVertexArray(GLuint array) {
+  glBindVertexArrayOES(array);
+}
+
 GLvoid StubGLBlendColor(GLclampf red, GLclampf green, GLclampf blue,
                         GLclampf alpha) {
   glBlendColor(red, green, blue, alpha);
@@ -160,6 +164,10 @@ GLvoid StubGLDeleteTextures(GLsizei n, const GLuint* textures) {
   glDeleteTextures(n, textures);
 }
 
+GLvoid StubGLDeleteVertexArrays(GLsizei n, const GLuint* arrays) {
+  glDeleteVertexArraysOES(n, arrays);
+}
+
 GLvoid StubGLDepthMask(GLboolean flag) {
   glDepthMask(flag);
 }
@@ -246,6 +254,10 @@ GLvoid StubGLGenTextures(GLsizei n, GLuint* textures) {
   glGenTextures(n, textures);
 }
 
+GLvoid StubGLGenVertexArrays(GLsizei n, GLuint* arrays) {
+  glGenVertexArraysOES(n, arrays);
+}
+
 GLvoid StubGLGetBufferParameteriv(GLenum target, GLenum pname, GLint* params) {
   glGetBufferParameteriv(target, pname, params);
 }
@@ -564,6 +576,7 @@ GrGLInterface* CreateInProcessSkiaGLBinding() {
   interface->fBindBuffer = StubGLBindBuffer;
   interface->fBindFragDataLocation = StubGLBindFragDataLocation;
   interface->fBindTexture = StubGLBindTexture;
+  interface->fBindVertexArray = StubGLBindVertexArray;
   interface->fBlendColor = StubGLBlendColor;
   interface->fBlendFunc = StubGLBlendFunc;
   interface->fBufferData = StubGLBufferData;
@@ -582,6 +595,7 @@ GrGLInterface* CreateInProcessSkiaGLBinding() {
   interface->fDeleteQueries = StubGLDeleteQueries;
   interface->fDeleteShader = StubGLDeleteShader;
   interface->fDeleteTextures = StubGLDeleteTextures;
+  interface->fDeleteVertexArrays = StubGLDeleteVertexArrays;
   interface->fDepthMask = StubGLDepthMask;
   interface->fDisable = StubGLDisable;
   interface->fDisableVertexAttribArray = StubGLDisableVertexAttribArray;
@@ -598,6 +612,7 @@ GrGLInterface* CreateInProcessSkiaGLBinding() {
   interface->fGenBuffers = StubGLGenBuffers;
   interface->fGenQueries = StubGLGenQueries;
   interface->fGenTextures = StubGLGenTextures;
+  interface->fGenVertexArrays = StubGLGenVertexArrays;
   interface->fGetBufferParameteriv = StubGLGetBufferParameteriv;
   interface->fGetError = StubGLGetError;
   interface->fGetIntegerv = StubGLGetIntegerv;

diff --git a/webkit/gpu/gl_bindings_skia_cmd_buffer.cc b/webkit/gpu/gl_bindings_skia_cmd_buffer.cc
@@ -23,6 +23,7 @@ GrGLInterface* CreateCommandBufferSkiaGLBinding() {
   interface->fBindAttribLocation = glBindAttribLocation;
   interface->fBindBuffer = glBindBuffer;
   interface->fBindTexture = glBindTexture;
+  interface->fBindVertexArray = glBindVertexArrayOES;
   interface->fBlendColor = glBlendColor;
   interface->fBlendFunc = glBlendFunc;
   interface->fBufferData = glBufferData;
@@ -40,6 +41,7 @@ GrGLInterface* CreateCommandBufferSkiaGLBinding() {
   interface->fDeleteProgram = glDeleteProgram;
   interface->fDeleteShader = glDeleteShader;
   interface->fDeleteTextures = glDeleteTextures;
+  interface->fDeleteVertexArrays = glDeleteVertexArraysOES;
   interface->fDepthMask = glDepthMask;
   interface->fDisable = glDisable;
   interface->fDisableVertexAttribArray = glDisableVertexAttribArray;
@@ -52,6 +54,7 @@ GrGLInterface* CreateCommandBufferSkiaGLBinding() {
   interface->fFrontFace = glFrontFace;
   interface->fGenBuffers = glGenBuffers;
   interface->fGenTextures = glGenTextures;
+  interface->fGenVertexArrays = glGenVertexArraysOES;
   interface->fGetBufferParameteriv = glGetBufferParameteriv;
   interface->fGetError = glGetError;
   interface->fGetIntegerv = glGetIntegerv;