Roll Skia to 7b971f0152299ae9a924252a9bfd220318497bdd

ui/gl/gl_bindings_skia_in_process.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 
 #include "ui/gl/gl_bindings_skia_in_process.h"
 
 #include "base/logging.h"
 #include "third_party/skia/include/gpu/gl/GrGLInterface.h"
 #include "ui/gl/gl_bindings.h"
@@ skipping 51 matching lines @@
 
 GLvoid StubGLBindVertexArray(GLuint array) {
   glBindVertexArrayOES(array);
 }
 
 GLvoid StubGLBlendColor(GLclampf red, GLclampf green, GLclampf blue,
                         GLclampf alpha) {
   glBlendColor(red, green, blue, alpha);
 }
 
+GLvoid StubGLBlendEquation(GLenum mode) {
+  glBlendEquation(mode);
+}
+
 GLvoid StubGLBlendFunc(GLenum sfactor, GLenum dfactor) {
   glBlendFunc(sfactor, dfactor);
 }
 
 GLvoid StubGLBlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
                              GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
                              GLbitfield mask, GLenum filter) {
   glBlitFramebufferEXT(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1,
                        mask, filter);
 }
@@ skipping 107 matching lines @@
 
 GLvoid StubGLDiscardFramebuffer(GLenum target, GLsizei numAttachments,
                                 const GLenum *attachments) {
   glDiscardFramebufferEXT(target, numAttachments, attachments);
 }
 
 GLvoid StubGLDrawArrays(GLenum mode, GLint first, GLsizei count) {
   glDrawArrays(mode, first, count);
 }
 
+GLvoid StubGLDrawArraysInstanced(GLenum mode, GLint first, GLsizei count,
+                                 GLsizei instanceCount) {
+  glDrawArraysInstancedANGLE(mode, first, count, instanceCount);
+}
+
+
 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);
 }
 
+GLvoid StubGLDrawElementsInstanced(GLenum mode, GLsizei count, GLenum type,
+                                   const GLvoid *indices,
+                                   GLsizei instanceCount) {
+  glDrawElementsInstancedANGLE(mode, count, type, indices, instanceCount);
+}
+
+
 GLvoid StubGLEnable(GLenum cap) {
   glEnable(cap);
 }
 
 GLvoid StubGLEnableVertexAttribArray(GLuint index) {
   glEnableVertexAttribArray(index);
 }
 
 GLvoid StubGLEndQuery(GLenum target) {
   glEndQuery(target);
@@ skipping 391 matching lines @@
 }
 
 GLvoid StubGLVertexAttrib3fv(GLuint indx, const GLfloat* values) {
   glVertexAttrib3fv(indx, values);
 }
 
 GLvoid StubGLVertexAttrib4fv(GLuint indx, const GLfloat* values) {
   glVertexAttrib4fv(indx, values);
 }
 
+GLvoid StubGLVertexAttribDivisor(GLuint index, GLuint divisor) {
+  glVertexAttribDivisorANGLE(index, divisor);
+}
+
 GLvoid StubGLVertexAttribPointer(GLuint indx, GLint size, GLenum type,
                                  GLboolean normalized, GLsizei stride,
                                  const void* ptr) {
   glVertexAttribPointer(indx, size, type, normalized, stride, ptr);
 }
 
 GLvoid StubGLViewport(GLint x, GLint y, GLsizei width, GLsizei height) {
   glViewport(x, y, width, height);
 }
 
@@ skipping 46 matching lines @@
   GrGLInterface::Functions* functions = &interface->fFunctions;
   functions->fActiveTexture = StubGLActiveTexture;
   functions->fAttachShader = StubGLAttachShader;
   functions->fBeginQuery = StubGLBeginQuery;
   functions->fBindAttribLocation = StubGLBindAttribLocation;
   functions->fBindBuffer = StubGLBindBuffer;
   functions->fBindFragDataLocation = StubGLBindFragDataLocation;
   functions->fBindTexture = StubGLBindTexture;
   functions->fBindVertexArray = StubGLBindVertexArray;
   functions->fBlendColor = StubGLBlendColor;
+  functions->fBlendEquation = StubGLBlendEquation;
   functions->fBlendFunc = StubGLBlendFunc;
   functions->fBufferData = StubGLBufferData;
   functions->fBufferSubData = StubGLBufferSubData;
   functions->fClear = StubGLClear;
   functions->fClearColor = StubGLClearColor;
   functions->fClearStencil = StubGLClearStencil;
   functions->fColorMask = StubGLColorMask;
   functions->fCompileShader = StubGLCompileShader;
   functions->fCompressedTexImage2D = StubGLCompressedTexImage2D;
   functions->fCopyTexSubImage2D = StubGLCopyTexSubImage2D;
   functions->fCreateProgram = StubGLCreateProgram;
   functions->fCreateShader = StubGLCreateShader;
   functions->fCullFace = StubGLCullFace;
   functions->fDeleteBuffers = StubGLDeleteBuffers;
   functions->fDeleteProgram = StubGLDeleteProgram;
   functions->fDeleteQueries = StubGLDeleteQueries;
   functions->fDeleteShader = StubGLDeleteShader;
   functions->fDeleteTextures = StubGLDeleteTextures;
   functions->fDeleteVertexArrays = StubGLDeleteVertexArrays;
   functions->fDepthMask = StubGLDepthMask;
   functions->fDisable = StubGLDisable;
   functions->fDisableVertexAttribArray = StubGLDisableVertexAttribArray;
   functions->fDiscardFramebuffer = StubGLDiscardFramebuffer;
   functions->fDrawArrays = StubGLDrawArrays;
+  functions->fDrawArraysInstanced = StubGLDrawArraysInstanced;
   functions->fDrawBuffer = StubGLDrawBuffer;
   functions->fDrawBuffers = StubGLDrawBuffers;
   functions->fDrawElements = StubGLDrawElements;
+  functions->fDrawElementsInstanced = StubGLDrawElementsInstanced;
   functions->fEnable = StubGLEnable;
   functions->fEnableVertexAttribArray = StubGLEnableVertexAttribArray;
   functions->fEndQuery = StubGLEndQuery;
   functions->fFinish = StubGLFinish;
   functions->fFlush = StubGLFlush;
   functions->fFlushMappedBufferRange = StubGLFlushMappedBufferRange;
   functions->fFrontFace = StubGLFrontFace;
   functions->fGenBuffers = StubGLGenBuffers;
   functions->fGenQueries = StubGLGenQueries;
   functions->fGenTextures = StubGLGenTextures;
@@ skipping 58 matching lines @@
   functions->fUniform4fv = StubGLUniform4fv;
   functions->fUniform4iv = StubGLUniform4iv;
   functions->fUniformMatrix2fv = StubGLUniformMatrix2fv;
   functions->fUniformMatrix3fv = StubGLUniformMatrix3fv;
   functions->fUniformMatrix4fv = StubGLUniformMatrix4fv;
   functions->fUseProgram = StubGLUseProgram;
   functions->fVertexAttrib1f = StubGLVertexAttrib1f;
   functions->fVertexAttrib2fv = StubGLVertexAttrib2fv;
   functions->fVertexAttrib3fv = StubGLVertexAttrib3fv;
   functions->fVertexAttrib4fv = StubGLVertexAttrib4fv;
+  functions->fVertexAttribDivisor = StubGLVertexAttribDivisor;
   functions->fVertexAttribPointer = StubGLVertexAttribPointer;
   functions->fViewport = StubGLViewport;
   functions->fBindFramebuffer = StubGLBindFramebuffer;
   functions->fBindRenderbuffer = StubGLBindRenderbuffer;
   functions->fCheckFramebufferStatus = StubGLCheckFramebufferStatus;
   functions->fDeleteFramebuffers = StubGLDeleteFramebuffers;
   functions->fDeleteRenderbuffers = StubGLDeleteRenderbuffers;
   functions->fFramebufferRenderbuffer = StubGLFramebufferRenderbuffer;
   functions->fFramebufferTexture2D = StubGLFramebufferTexture2D;
   functions->fFramebufferTexture2DMultisample =
@@ skipping 16 matching lines @@
   functions->fMapBuffer = StubGLMapBuffer;
   functions->fUnmapBuffer = StubGLUnmapBuffer;
   functions->fBindFragDataLocationIndexed =
     StubGLBindFragDataLocationIndexed;
   functions->fGetProgramResourceLocation = StubGLGetProgramResourceLocation;
 
   return interface;
 }
 
 }  // namespace gfx