Update Skia GL bindings to ES3

gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc

 // Copyright 2013 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 "gpu/skia_bindings/gl_bindings_skia_cmd_buffer.h"
 
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "third_party/skia/include/gpu/gl/GrGLInterface.h"
 
 using gpu::gles2::GLES2Interface;
 
 namespace {
 template <typename R, typename... Args>
 std::function<R(Args...)> gles_bind(R (GLES2Interface::*func)(Args...),
                                     GLES2Interface* gles2Interface) {
   return [func, gles2Interface](Args... args) {
     return (gles2Interface->*func)(args...);
   };
 }
 }  // namespace
 
 namespace skia_bindings {
 
 sk_sp<GrGLInterface> CreateGLES2InterfaceBindings(GLES2Interface* impl) {
-  // Until Chromium is passing the WebGL 2.0 conformance we're limiting Skia to
-  // a GLES 2.0 interface (plus extensions).
-  auto get_string_version_override = [impl](GLenum name) {
-    if (name == GL_VERSION)
-      return reinterpret_cast<const GLubyte*>("OpenGL ES 2.0 Chromium");
-    return impl->GetString(name);
-  };
-
   sk_sp<GrGLInterface> interface(new GrGLInterface);
   interface->fStandard = kGLES_GrGLStandard;
-  interface->fExtensions.init(kGLES_GrGLStandard, get_string_version_override,
-                              nullptr,
-                              gles_bind(&GLES2Interface::GetIntegerv, impl));
+
+  auto get_string = gles_bind(&GLES2Interface::GetString, impl);
+  auto get_stringi = gles_bind(&GLES2Interface::GetStringi, impl);
+  auto get_integerv = gles_bind(&GLES2Interface::GetIntegerv, impl);
+  interface->fExtensions.init(kGLES_GrGLStandard, get_string, get_stringi,
+                              get_integerv);
 
   GrGLInterface::Functions* functions = &interface->fFunctions;
   functions->fActiveTexture = gles_bind(&GLES2Interface::ActiveTexture, impl);
   functions->fAttachShader = gles_bind(&GLES2Interface::AttachShader, impl);
   functions->fBindAttribLocation =
       gles_bind(&GLES2Interface::BindAttribLocation, impl);
   functions->fBindBuffer = gles_bind(&GLES2Interface::BindBuffer, impl);
   functions->fBindTexture = gles_bind(&GLES2Interface::BindTexture, impl);
   functions->fBindVertexArray =
       gles_bind(&GLES2Interface::BindVertexArrayOES, impl);
   functions->fBlendBarrier = gles_bind(&GLES2Interface::BlendBarrierKHR, impl);
   functions->fBlendColor = gles_bind(&GLES2Interface::BlendColor, impl);
   functions->fBlendEquation = gles_bind(&GLES2Interface::BlendEquation, impl);
   functions->fBlendFunc = gles_bind(&GLES2Interface::BlendFunc, impl);
   functions->fBufferData = gles_bind(&GLES2Interface::BufferData, impl);
   functions->fBufferSubData = gles_bind(&GLES2Interface::BufferSubData, impl);
   functions->fClear = gles_bind(&GLES2Interface::Clear, impl);
   functions->fClearColor = gles_bind(&GLES2Interface::ClearColor, impl);
   functions->fClearStencil = gles_bind(&GLES2Interface::ClearStencil, impl);
+  functions->fClientWaitSync = gles_bind(&GLES2Interface::ClientWaitSync, impl);
   functions->fColorMask = gles_bind(&GLES2Interface::ColorMask, impl);
   functions->fCompileShader = gles_bind(&GLES2Interface::CompileShader, impl);
   functions->fCompressedTexImage2D =
       gles_bind(&GLES2Interface::CompressedTexImage2D, impl);
   functions->fCompressedTexSubImage2D =
       gles_bind(&GLES2Interface::CompressedTexSubImage2D, impl);
   functions->fCopyTexSubImage2D =
       gles_bind(&GLES2Interface::CopyTexSubImage2D, impl);
   functions->fCreateProgram = gles_bind(&GLES2Interface::CreateProgram, impl);
   functions->fCreateShader = gles_bind(&GLES2Interface::CreateShader, impl);
   functions->fCullFace = gles_bind(&GLES2Interface::CullFace, impl);
   functions->fDeleteBuffers = gles_bind(&GLES2Interface::DeleteBuffers, impl);
   functions->fDeleteProgram = gles_bind(&GLES2Interface::DeleteProgram, impl);
   functions->fDeleteShader = gles_bind(&GLES2Interface::DeleteShader, impl);
+  functions->fDeleteSync = gles_bind(&GLES2Interface::DeleteSync, impl);
   functions->fDeleteTextures = gles_bind(&GLES2Interface::DeleteTextures, impl);
   functions->fDeleteVertexArrays =
       gles_bind(&GLES2Interface::DeleteVertexArraysOES, impl);
   functions->fDepthMask = gles_bind(&GLES2Interface::DepthMask, impl);
   functions->fDisable = gles_bind(&GLES2Interface::Disable, impl);
   functions->fDisableVertexAttribArray =
       gles_bind(&GLES2Interface::DisableVertexAttribArray, impl);
   functions->fDiscardFramebuffer =
       gles_bind(&GLES2Interface::DiscardFramebufferEXT, impl);
   functions->fDrawArrays = gles_bind(&GLES2Interface::DrawArrays, impl);
+  functions->fDrawArraysInstanced =
+      gles_bind(&GLES2Interface::DrawArraysInstancedANGLE, impl);
   functions->fDrawElements = gles_bind(&GLES2Interface::DrawElements, impl);
+  functions->fDrawElementsInstanced =
+      gles_bind(&GLES2Interface::DrawElementsInstancedANGLE, impl);
+  functions->fDrawRangeElements =
+      gles_bind(&GLES2Interface::DrawRangeElements, impl);
   functions->fEnable = gles_bind(&GLES2Interface::Enable, impl);
   functions->fEnableVertexAttribArray =
       gles_bind(&GLES2Interface::EnableVertexAttribArray, impl);
+  functions->fFenceSync = gles_bind(&GLES2Interface::FenceSync, impl);
   functions->fFinish = gles_bind(&GLES2Interface::Finish, impl);
   functions->fFlush = gles_bind(&GLES2Interface::Flush, impl);
+  functions->fFlushMappedBufferRange =
+      gles_bind(&GLES2Interface::FlushMappedBufferRange, impl);
   functions->fFrontFace = gles_bind(&GLES2Interface::FrontFace, impl);
   functions->fGenBuffers = gles_bind(&GLES2Interface::GenBuffers, impl);
   functions->fGenTextures = gles_bind(&GLES2Interface::GenTextures, impl);
   functions->fGenVertexArrays =
       gles_bind(&GLES2Interface::GenVertexArraysOES, impl);
   functions->fGetBufferParameteriv =
       gles_bind(&GLES2Interface::GetBufferParameteriv, impl);
   functions->fGetError = gles_bind(&GLES2Interface::GetError, impl);
-  functions->fGetIntegerv = gles_bind(&GLES2Interface::GetIntegerv, impl);
+  functions->fGetIntegerv = get_integerv;
   functions->fGetProgramInfoLog =
       gles_bind(&GLES2Interface::GetProgramInfoLog, impl);
   functions->fGetProgramiv = gles_bind(&GLES2Interface::GetProgramiv, impl);
   functions->fGetShaderInfoLog =
       gles_bind(&GLES2Interface::GetShaderInfoLog, impl);
   functions->fGetShaderiv = gles_bind(&GLES2Interface::GetShaderiv, impl);
   functions->fGetShaderPrecisionFormat =
       gles_bind(&GLES2Interface::GetShaderPrecisionFormat, impl);
-  functions->fGetString = get_string_version_override;
+  functions->fGetString = get_string;
+  functions->fGetStringi = get_stringi;
   functions->fGetUniformLocation =
       gles_bind(&GLES2Interface::GetUniformLocation, impl);
   functions->fInsertEventMarker =
       gles_bind(&GLES2Interface::InsertEventMarkerEXT, impl);
+  functions->fInvalidateFramebuffer =
+      gles_bind(&GLES2Interface::InvalidateFramebuffer, impl);
+  functions->fInvalidateSubFramebuffer =
+      gles_bind(&GLES2Interface::InvalidateSubFramebuffer, impl);
   functions->fIsTexture = gles_bind(&GLES2Interface::IsTexture, impl);
   functions->fLineWidth = gles_bind(&GLES2Interface::LineWidth, impl);
   functions->fLinkProgram = gles_bind(&GLES2Interface::LinkProgram, impl);
+  functions->fMapBufferRange = gles_bind(&GLES2Interface::MapBufferRange, impl);
   functions->fMapBufferSubData =
       gles_bind(&GLES2Interface::MapBufferSubDataCHROMIUM, impl);
   functions->fMapTexSubImage2D =
       gles_bind(&GLES2Interface::MapTexSubImage2DCHROMIUM, impl);
   functions->fPixelStorei = gles_bind(&GLES2Interface::PixelStorei, impl);
   functions->fPopGroupMarker =
       gles_bind(&GLES2Interface::PopGroupMarkerEXT, impl);
   functions->fPushGroupMarker =
       gles_bind(&GLES2Interface::PushGroupMarkerEXT, impl);
   functions->fReadPixels = gles_bind(&GLES2Interface::ReadPixels, impl);
@@ skipping 40 matching lines @@
   functions->fUnmapTexSubImage2D =
       gles_bind(&GLES2Interface::UnmapTexSubImage2DCHROMIUM, impl);
   functions->fUseProgram = gles_bind(&GLES2Interface::UseProgram, impl);
   functions->fVertexAttrib1f = gles_bind(&GLES2Interface::VertexAttrib1f, impl);
   functions->fVertexAttrib2fv =
       gles_bind(&GLES2Interface::VertexAttrib2fv, impl);
   functions->fVertexAttrib3fv =
       gles_bind(&GLES2Interface::VertexAttrib3fv, impl);
   functions->fVertexAttrib4fv =
       gles_bind(&GLES2Interface::VertexAttrib4fv, impl);
+  functions->fVertexAttribDivisor =
+      gles_bind(&GLES2Interface::VertexAttribDivisorANGLE, impl);
   functions->fVertexAttribPointer =
       gles_bind(&GLES2Interface::VertexAttribPointer, impl);
+  functions->fVertexAttribIPointer =
+      gles_bind(&GLES2Interface::VertexAttribIPointer, impl);
   functions->fViewport = gles_bind(&GLES2Interface::Viewport, impl);
+  functions->fWaitSync = gles_bind(&GLES2Interface::WaitSync, impl);
   functions->fBindFramebuffer =
       gles_bind(&GLES2Interface::BindFramebuffer, impl);
   functions->fBindRenderbuffer =
       gles_bind(&GLES2Interface::BindRenderbuffer, impl);
   functions->fCheckFramebufferStatus =
       gles_bind(&GLES2Interface::CheckFramebufferStatus, impl);
   functions->fDeleteFramebuffers =
       gles_bind(&GLES2Interface::DeleteFramebuffers, impl);
   functions->fDeleteRenderbuffers =
       gles_bind(&GLES2Interface::DeleteRenderbuffers, impl);
@@ skipping 69 matching lines @@
   functions->fProgramPathFragmentInputGen =
       gles_bind(&GLES2Interface::ProgramPathFragmentInputGenCHROMIUM, impl);
   functions->fBindFragmentInputLocation =
       gles_bind(&GLES2Interface::BindFragmentInputLocationCHROMIUM, impl);
   functions->fCoverageModulation =
       gles_bind(&GLES2Interface::CoverageModulationCHROMIUM, impl);
   return interface;
 }
 
 }  // namespace skia_bindings