Move simple methods [A-E] from WebGraphicsContext3D to GLES2Interface.

This removes methods from WebGraphicsContext3D that were simple macro-
based pass-throughs to the underlying GLES2Interface, and changes
callers in blink to use the GLES2Interface for them instead.

R=junov@chromium.org, kbr@chromium.org, piman, chrishtr
TBR=pfeldman, kbr
BUG=584497
CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel;tryserver.chromium.mac:mac_optional_gpu_tests_rel

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

Cr-Commit-Position: refs/heads/master@{#382081}

2 files changed, 1 insertions, 218 deletions

diff --git a/gpu/blink/webgraphicscontext3d_impl.cc b/gpu/blink/webgraphicscontext3d_impl.cc
index ffabe1b..5d087a2 100644
--- a/gpu/blink/webgraphicscontext3d_impl.cc
+++ b/gpu/blink/webgraphicscontext3d_impl.cc
@@ -199,30 +199,18 @@ void WebGraphicsContext3DImpl::synthesizeGLError(WGC3Denum error) {
   }
 }
 
-DELEGATE_TO_GL_R(lastFlushID, GetLastFlushIdCHROMIUM, WebGLId)
-
-DELEGATE_TO_GL_R(insertFenceSyncCHROMIUM, InsertFenceSyncCHROMIUM, WGC3Duint64)
-
 bool WebGraphicsContext3DImpl::genSyncTokenCHROMIUM(WGC3Duint64 fenceSync,
                                                     WGC3Dbyte* syncToken) {
   gl_->GenSyncTokenCHROMIUM(fenceSync, syncToken);
   return true;
 }
 
-DELEGATE_TO_GL_1(waitSyncTokenCHROMIUM, WaitSyncTokenCHROMIUM, const WGC3Dbyte*)
-
-DELEGATE_TO_GL_3(discardFramebufferEXT, DiscardFramebufferEXT, WGC3Denum,
-                 WGC3Dsizei, const WGC3Denum*)
-
 blink::WebString WebGraphicsContext3DImpl::
     getRequestableExtensionsCHROMIUM() {
   return blink::WebString::fromUTF8(
       gl_->GetRequestableExtensionsCHROMIUM());
 }
 
-DELEGATE_TO_GL_1(requestExtensionCHROMIUM, RequestExtensionCHROMIUM,
-                 const char*)
-
 void WebGraphicsContext3DImpl::blitFramebufferCHROMIUM(
     WGC3Dint srcX0, WGC3Dint srcY0, WGC3Dint srcX1, WGC3Dint srcY1,
     WGC3Dint dstX0, WGC3Dint dstY0, WGC3Dint dstX1, WGC3Dint dstY1,
@@ -233,97 +221,6 @@ void WebGraphicsContext3DImpl::blitFramebufferCHROMIUM(
       mask, filter);
 }
 
-DELEGATE_TO_GL_5(renderbufferStorageMultisampleCHROMIUM,
-                 RenderbufferStorageMultisampleCHROMIUM, WGC3Denum, WGC3Dsizei,
-                 WGC3Denum, WGC3Dsizei, WGC3Dsizei)
-
-DELEGATE_TO_GL_1(activeTexture, ActiveTexture, WGC3Denum)
-
-DELEGATE_TO_GL(applyScreenSpaceAntialiasingCHROMIUM,
-               ApplyScreenSpaceAntialiasingCHROMIUM);
-
-DELEGATE_TO_GL_2(attachShader, AttachShader, WebGLId, WebGLId)
-
-DELEGATE_TO_GL_3(bindAttribLocation, BindAttribLocation, WebGLId,
-                 WGC3Duint, const WGC3Dchar*)
-
-DELEGATE_TO_GL_2(bindBuffer, BindBuffer, WGC3Denum, WebGLId)
-
-DELEGATE_TO_GL_2(bindFramebuffer, BindFramebuffer, WGC3Denum, WebGLId)
-
-DELEGATE_TO_GL_2(bindRenderbuffer, BindRenderbuffer, WGC3Denum, WebGLId)
-
-DELEGATE_TO_GL_2(bindTexture, BindTexture, WGC3Denum, WebGLId)
-
-DELEGATE_TO_GL_4(blendColor, BlendColor,
-                 WGC3Dclampf, WGC3Dclampf, WGC3Dclampf, WGC3Dclampf)
-
-DELEGATE_TO_GL_1(blendEquation, BlendEquation, WGC3Denum)
-
-DELEGATE_TO_GL_2(blendEquationSeparate, BlendEquationSeparate,
-                 WGC3Denum, WGC3Denum)
-
-DELEGATE_TO_GL_2(blendFunc, BlendFunc, WGC3Denum, WGC3Denum)
-
-DELEGATE_TO_GL_4(blendFuncSeparate, BlendFuncSeparate,
-                 WGC3Denum, WGC3Denum, WGC3Denum, WGC3Denum)
-
-DELEGATE_TO_GL_4(bufferData, BufferData,
-                 WGC3Denum, WGC3Dsizeiptr, const void*, WGC3Denum)
-
-DELEGATE_TO_GL_4(bufferSubData, BufferSubData,
-                 WGC3Denum, WGC3Dintptr, WGC3Dsizeiptr, const void*)
-
-DELEGATE_TO_GL_1R(checkFramebufferStatus, CheckFramebufferStatus,
-                  WGC3Denum, WGC3Denum)
-
-DELEGATE_TO_GL_1(clear, Clear, WGC3Dbitfield)
-
-DELEGATE_TO_GL_4(clearColor, ClearColor,
-                 WGC3Dclampf, WGC3Dclampf, WGC3Dclampf, WGC3Dclampf)
-
-DELEGATE_TO_GL_1(clearDepth, ClearDepthf, WGC3Dclampf)
-
-DELEGATE_TO_GL_1(clearStencil, ClearStencil, WGC3Dint)
-
-DELEGATE_TO_GL_4(colorMask, ColorMask,
-                 WGC3Dboolean, WGC3Dboolean, WGC3Dboolean, WGC3Dboolean)
-
-DELEGATE_TO_GL_1(compileShader, CompileShader, WebGLId)
-
-DELEGATE_TO_GL_8(compressedTexImage2D, CompressedTexImage2D,
-                 WGC3Denum, WGC3Dint, WGC3Denum, WGC3Dint, WGC3Dint,
-                 WGC3Dsizei, WGC3Dsizei, const void*)
-
-DELEGATE_TO_GL_9(compressedTexSubImage2D, CompressedTexSubImage2D,
-                 WGC3Denum, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint,
-                 WGC3Denum, WGC3Dsizei, const void*)
-
-DELEGATE_TO_GL_8(copyTexImage2D, CopyTexImage2D,
-                 WGC3Denum, WGC3Dint, WGC3Denum, WGC3Dint, WGC3Dint,
-                 WGC3Dsizei, WGC3Dsizei, WGC3Dint)
-
-DELEGATE_TO_GL_8(copyTexSubImage2D, CopyTexSubImage2D,
-                 WGC3Denum, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint,
-                 WGC3Dsizei, WGC3Dsizei)
-
-DELEGATE_TO_GL_1(cullFace, CullFace, WGC3Denum)
-
-DELEGATE_TO_GL_1(depthFunc, DepthFunc, WGC3Denum)
-
-DELEGATE_TO_GL_1(depthMask, DepthMask, WGC3Dboolean)
-
-DELEGATE_TO_GL_2(depthRange, DepthRangef, WGC3Dclampf, WGC3Dclampf)
-
-DELEGATE_TO_GL_2(detachShader, DetachShader, WebGLId, WebGLId)
-
-DELEGATE_TO_GL_1(disable, Disable, WGC3Denum)
-
-DELEGATE_TO_GL_1(disableVertexAttribArray, DisableVertexAttribArray,
-                 WGC3Duint)
-
-DELEGATE_TO_GL_3(drawArrays, DrawArrays, WGC3Denum, WGC3Dint, WGC3Dsizei)
-
 void WebGraphicsContext3DImpl::drawElements(WGC3Denum mode,
                                                          WGC3Dsizei count,
                                                          WGC3Denum type,
@@ -333,11 +230,6 @@ void WebGraphicsContext3DImpl::drawElements(WGC3Denum mode,
       reinterpret_cast<void*>(static_cast<intptr_t>(offset)));
 }
 
-DELEGATE_TO_GL_1(enable, Enable, WGC3Denum)
-
-DELEGATE_TO_GL_1(enableVertexAttribArray, EnableVertexAttribArray,
-                 WGC3Duint)
-
 DELEGATE_TO_GL(finish, Finish)
 DELEGATE_TO_GL(flush, Flush)
 
diff --git a/gpu/blink/webgraphicscontext3d_impl.h b/gpu/blink/webgraphicscontext3d_impl.h
index 16eb3f7..cd423bc 100644
--- a/gpu/blink/webgraphicscontext3d_impl.h
+++ b/gpu/blink/webgraphicscontext3d_impl.h
@@ -37,111 +37,14 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl
   //----------------------------------------------------------------------
   // WebGraphicsContext3D methods
 
-  uint32_t lastFlushID() override;
-
-  blink::WGC3Duint64 insertFenceSyncCHROMIUM() override;
   bool genSyncTokenCHROMIUM(blink::WGC3Duint64 fenceSync,
                             blink::WGC3Dbyte* syncToken) override;
-  void waitSyncTokenCHROMIUM(const blink::WGC3Dbyte* syncToken) override;
-
-  void activeTexture(blink::WGC3Denum texture) override;
-  void applyScreenSpaceAntialiasingCHROMIUM() override;
-  void attachShader(blink::WebGLId program, blink::WebGLId shader) override;
-  void bindAttribLocation(blink::WebGLId program,
-                          blink::WGC3Duint index,
-                          const blink::WGC3Dchar* name) override;
-  void bindBuffer(blink::WGC3Denum target, blink::WebGLId buffer) override;
-  void bindFramebuffer(blink::WGC3Denum target,
-                       blink::WebGLId framebuffer) override;
-  void bindRenderbuffer(blink::WGC3Denum target,
-                        blink::WebGLId renderbuffer) override;
-  void bindTexture(blink::WGC3Denum target, blink::WebGLId texture) override;
-  void blendColor(blink::WGC3Dclampf red,
-                  blink::WGC3Dclampf green,
-                  blink::WGC3Dclampf blue,
-                  blink::WGC3Dclampf alpha) override;
-  void blendEquation(blink::WGC3Denum mode) override;
-  void blendEquationSeparate(blink::WGC3Denum modeRGB,
-                             blink::WGC3Denum modeAlpha) override;
-  void blendFunc(blink::WGC3Denum sfactor, blink::WGC3Denum dfactor) override;
-  void blendFuncSeparate(blink::WGC3Denum srcRGB,
-                         blink::WGC3Denum dstRGB,
-                         blink::WGC3Denum srcAlpha,
-                         blink::WGC3Denum dstAlpha) override;
-
-  void bufferData(blink::WGC3Denum target,
-                  blink::WGC3Dsizeiptr size,
-                  const void* data,
-                  blink::WGC3Denum usage) override;
-  void bufferSubData(blink::WGC3Denum target,
-                     blink::WGC3Dintptr offset,
-                     blink::WGC3Dsizeiptr size,
-                     const void* data) override;
-
-  blink::WGC3Denum checkFramebufferStatus(blink::WGC3Denum target) override;
-  void clear(blink::WGC3Dbitfield mask) override;
-  void clearColor(blink::WGC3Dclampf red,
-                  blink::WGC3Dclampf green,
-                  blink::WGC3Dclampf blue,
-                  blink::WGC3Dclampf alpha) override;
-  void clearDepth(blink::WGC3Dclampf depth) override;
-  void clearStencil(blink::WGC3Dint s) override;
-  void colorMask(blink::WGC3Dboolean red,
-                 blink::WGC3Dboolean green,
-                 blink::WGC3Dboolean blue,
-                 blink::WGC3Dboolean alpha) override;
-  void compileShader(blink::WebGLId shader) override;
-
-  void compressedTexImage2D(blink::WGC3Denum target,
-                            blink::WGC3Dint level,
-                            blink::WGC3Denum internalformat,
-                            blink::WGC3Dsizei width,
-                            blink::WGC3Dsizei height,
-                            blink::WGC3Dint border,
-                            blink::WGC3Dsizei imageSize,
-                            const void* data) override;
-  void compressedTexSubImage2D(blink::WGC3Denum target,
-                               blink::WGC3Dint level,
-                               blink::WGC3Dint xoffset,
-                               blink::WGC3Dint yoffset,
-                               blink::WGC3Dsizei width,
-                               blink::WGC3Dsizei height,
-                               blink::WGC3Denum format,
-                               blink::WGC3Dsizei imageSize,
-                               const void* data) override;
-  void copyTexImage2D(blink::WGC3Denum target,
-                      blink::WGC3Dint level,
-                      blink::WGC3Denum internalformat,
-                      blink::WGC3Dint x,
-                      blink::WGC3Dint y,
-                      blink::WGC3Dsizei width,
-                      blink::WGC3Dsizei height,
-                      blink::WGC3Dint border) override;
-  void copyTexSubImage2D(blink::WGC3Denum target,
-                         blink::WGC3Dint level,
-                         blink::WGC3Dint xoffset,
-                         blink::WGC3Dint yoffset,
-                         blink::WGC3Dint x,
-                         blink::WGC3Dint y,
-                         blink::WGC3Dsizei width,
-                         blink::WGC3Dsizei height) override;
-  void cullFace(blink::WGC3Denum mode) override;
-  void depthFunc(blink::WGC3Denum func) override;
-  void depthMask(blink::WGC3Dboolean flag) override;
-  void depthRange(blink::WGC3Dclampf zNear, blink::WGC3Dclampf zFar) override;
-  void detachShader(blink::WebGLId program, blink::WebGLId shader) override;
-  void disable(blink::WGC3Denum cap) override;
-  void disableVertexAttribArray(blink::WGC3Duint index) override;
-  void drawArrays(blink::WGC3Denum mode,
-                  blink::WGC3Dint first,
-                  blink::WGC3Dsizei count) override;
+
   void drawElements(blink::WGC3Denum mode,
                     blink::WGC3Dsizei count,
                     blink::WGC3Denum type,
                     blink::WGC3Dintptr offset) override;
 
-  void enable(blink::WGC3Denum cap) override;
-  void enableVertexAttribArray(blink::WGC3Duint index) override;
   void finish() override;
   void flush() override;
   void frontFace(blink::WGC3Denum mode) override;
@@ -442,12 +345,7 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl
 
   void synthesizeGLError(blink::WGC3Denum) override;
 
-  void discardFramebufferEXT(blink::WGC3Denum target,
-                             blink::WGC3Dsizei numAttachments,
-                             const blink::WGC3Denum* attachments) override;
-
   blink::WebString getRequestableExtensionsCHROMIUM() override;
-  void requestExtensionCHROMIUM(const char*) override;
 
   void blitFramebufferCHROMIUM(blink::WGC3Dint srcX0,
                                blink::WGC3Dint srcY0,
@@ -459,13 +357,6 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl
                                blink::WGC3Dint dstY1,
                                blink::WGC3Dbitfield mask,
                                blink::WGC3Denum filter) override;
-  void renderbufferStorageMultisampleCHROMIUM(
-      blink::WGC3Denum target,
-      blink::WGC3Dsizei samples,
-      blink::WGC3Denum internalformat,
-      blink::WGC3Dsizei width,
-      blink::WGC3Dsizei height) override;
-
   blink::WebString getTranslatedShaderSourceANGLE(
       blink::WebGLId shader) override;