Roll skia to r2034 (and add new gl bindings)

Review URL: http://codereview.chromium.org/7564013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95462 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 24 insertions, 0 deletions

diff --git a/ui/gfx/gl/generate_bindings.py b/ui/gfx/gl/generate_bindings.py
index a71e96e..be38b71 100644
--- a/ui/gfx/gl/generate_bindings.py
+++ b/ui/gfx/gl/generate_bindings.py
@@ -84,6 +84,8 @@ GL_FUNCTIONS = [
 ['void', ['glDisable'], 'GLenum cap'],
 ['void', ['glDisableVertexAttribArray'], 'GLuint index'],
 ['void', ['glDrawArrays'], 'GLenum mode, GLint first, GLsizei count'],
+['void', ['glDrawBuffer'], 'GLenum mode'],
+['void', ['glDrawBuffersARB'], 'GLsizei n, const GLenum* bufs'],
 ['void', ['glDrawElements'],
     'GLenum mode, GLsizei count, GLenum type, const void* indices'],
 ['void', ['glEGLImageTargetTexture2DOES'],
@@ -168,6 +170,7 @@ GL_FUNCTIONS = [
 ['void*', ['glMapBuffer'], 'GLenum target, GLenum access'],
 ['void', ['glPixelStorei'], 'GLenum pname, GLint param'],
 ['void', ['glPolygonOffset'], 'GLfloat factor, GLfloat units'],
+['void', ['glReadBuffer'], 'GLenum src'],
 ['void', ['glReadPixels'],
     'GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, '
     'GLenum type, void* pixels'],
diff --git a/ui/gfx/gl/gl_bindings_skia_in_process.cc b/ui/gfx/gl/gl_bindings_skia_in_process.cc
index 4b947cb..73b0270 100644
--- a/ui/gfx/gl/gl_bindings_skia_in_process.cc
+++ b/ui/gfx/gl/gl_bindings_skia_in_process.cc
@@ -164,6 +164,14 @@ GLvoid StubGLDrawArrays(GLenum mode, GLint first, GLsizei count) {
   glDrawArrays(mode, first, count);
 }
 
+GLvoid StubGLDrawBuffer(GLenum mode) {
+  glDrawBuffer(mode);
+}
+
+GLvoid StubGLDrawBuffers(GLsizei n, const GLenum* bufs) {
+  glDrawBuffersARB(n, bufs);
+}
+
 GLvoid StubGLDrawElements(GLenum mode, GLsizei count, GLenum type,
                           const void* indices) {
   glDrawElements(mode, count, type, indices);
@@ -280,6 +288,10 @@ GLvoid StubGLPixelStorei(GLenum pname, GLint param) {
   glPixelStorei(pname, param);
 }
 
+GLvoid StubGLReadBuffer(GLenum src) {
+  glReadBuffer(src);
+}
+
 GLvoid StubGLReadPixels(GLint x, GLint y, GLsizei width, GLsizei height,
                         GLenum format, GLenum type, void* pixels) {
   glReadPixels(x, y, width, height, format, type, pixels);
@@ -519,6 +531,8 @@ void BindSkiaToInProcessGL() {
       NULL,  // glDisableClientState
       StubGLDisableVertexAttribArray,
       StubGLDrawArrays,
+      StubGLDrawBuffer,
+      StubGLDrawBuffers,
       StubGLDrawElements,
       StubGLEnable,
       NULL,  // glEnableClientState
@@ -542,6 +556,7 @@ void BindSkiaToInProcessGL() {
       NULL,  // glMatrixMode
       StubGLPixelStorei,
       NULL,  // glPointSize
+      StubGLReadBuffer,
       StubGLReadPixels,
       StubGLScissor,
       NULL,  // glShadeModel
diff --git a/ui/gfx/gl/gl_interface.h b/ui/gfx/gl/gl_interface.h
index 4b483c1..79eb98b 100644
--- a/ui/gfx/gl/gl_interface.h
+++ b/ui/gfx/gl/gl_interface.h
@@ -168,6 +168,10 @@ class GLInterface {
 
   virtual void DrawArrays(GLenum mode, GLint first, GLsizei count) = 0;
 
+  virtual void DrawBuffer(GLenum mode) = 0;
+
+  virtual void DrawBuffersARB(GLsizei n, const GLenum* bufs) = 0;
+
   virtual void DrawElements(GLenum mode,
                             GLsizei count,
                             GLenum type,
@@ -346,6 +350,8 @@ class GLInterface {
 
   virtual void PolygonOffset(GLfloat factor, GLfloat units) = 0;
 
+  virtual void ReadBuffer(GLenum src) = 0;
+
   virtual void ReadPixels(GLint x, GLint y,
                           GLsizei width, GLsizei height,
                           GLenum format,