Remove methods from WebGraphicsContext3D that wrap type casts.

There were a set of methods that just pass through to the GLES2Interface
but do some type casting along the way. Move those casts to the caller
or use GL types instead of WGC3D types directly, and call GLES2Interface
instead of WebGraphicsContext3D for the methods.

R=bajones@chromium.org, pfeldman@chromium.org, piman@chromium.org
TBR=pfeldman
BUG=584497
CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel

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

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

2 files changed, 0 insertions, 131 deletions

diff --git a/gpu/blink/webgraphicscontext3d_impl.cc b/gpu/blink/webgraphicscontext3d_impl.cc
index 4c1b790..da34cb5 100644
--- a/gpu/blink/webgraphicscontext3d_impl.cc
+++ b/gpu/blink/webgraphicscontext3d_impl.cc
@@ -38,7 +38,6 @@ using blink::WGC3Dint64;
 using blink::WGC3Duint64;
 using blink::WGC3Duint;
 using blink::WebGLId;
-using blink::WGC3Dsync;
 
 namespace gpu_blink {
 
@@ -198,25 +197,6 @@ blink::WebString WebGraphicsContext3DImpl::
       gl_->GetRequestableExtensionsCHROMIUM());
 }
 
-void WebGraphicsContext3DImpl::blitFramebufferCHROMIUM(
-    WGC3Dint srcX0, WGC3Dint srcY0, WGC3Dint srcX1, WGC3Dint srcY1,
-    WGC3Dint dstX0, WGC3Dint dstY0, WGC3Dint dstX1, WGC3Dint dstY1,
-    WGC3Dbitfield mask, WGC3Denum filter) {
-  gl_->BlitFramebufferCHROMIUM(
-      srcX0, srcY0, srcX1, srcY1,
-      dstX0, dstY0, dstX1, dstY1,
-      mask, filter);
-}
-
-void WebGraphicsContext3DImpl::drawElements(WGC3Denum mode,
-                                                         WGC3Dsizei count,
-                                                         WGC3Denum type,
-                                                         WGC3Dintptr offset) {
-  gl_->DrawElements(
-      mode, count, type,
-      reinterpret_cast<void*>(static_cast<intptr_t>(offset)));
-}
-
 bool WebGraphicsContext3DImpl::getActiveAttrib(
     WebGLId program, WGC3Duint index, ActiveInfo& info) {
   GLint max_name_length = -1;
@@ -344,38 +324,12 @@ blink::WebString WebGraphicsContext3DImpl::getString(
       reinterpret_cast<const char*>(gl_->GetString(name)));
 }
 
-void WebGraphicsContext3DImpl::getSynciv(blink::WGC3Dsync sync,
-                                         blink::WGC3Denum pname,
-                                         blink::WGC3Dsizei bufSize,
-                                         blink::WGC3Dsizei *length,
-                                         blink::WGC3Dint *params) {
-  return gl_->GetSynciv(
-      reinterpret_cast<GLsync>(sync), pname, bufSize, length, params);
-}
-
-WGC3Dsizeiptr WebGraphicsContext3DImpl::getVertexAttribOffset(
-    WGC3Duint index, WGC3Denum pname) {
-  GLvoid* value = NULL;
-  // NOTE: If pname is ever a value that returns more then 1 element
-  // this will corrupt memory.
-  gl_->GetVertexAttribPointerv(index, pname, &value);
-  return static_cast<WGC3Dsizeiptr>(reinterpret_cast<intptr_t>(value));
-}
-
 void WebGraphicsContext3DImpl::shaderSource(
     WebGLId shader, const WGC3Dchar* string) {
   GLint length = strlen(string);
   gl_->ShaderSource(shader, 1, &string, &length);
 }
 
-void WebGraphicsContext3DImpl::vertexAttribPointer(
-    WGC3Duint index, WGC3Dint size, WGC3Denum type, WGC3Dboolean normalized,
-    WGC3Dsizei stride, WGC3Dintptr offset) {
-  gl_->VertexAttribPointer(
-      index, size, type, normalized, stride,
-      reinterpret_cast<void*>(static_cast<intptr_t>(offset)));
-}
-
 WebGLId WebGraphicsContext3DImpl::createBuffer() {
   GLuint o;
   gl_->GenBuffers(1, &o);
@@ -481,11 +435,6 @@ DELEGATE_TO_GL_3(clearBufferiv, ClearBufferiv, WGC3Denum, WGC3Dint,
                  const WGC3Dint *)
 DELEGATE_TO_GL_3(clearBufferuiv, ClearBufferuiv, WGC3Denum, WGC3Dint,
                  const WGC3Duint *)
-WGC3Denum WebGraphicsContext3DImpl::clientWaitSync(WGC3Dsync sync,
-                                                   WGC3Dbitfield flags,
-                                                   WGC3Duint64 timeout) {
-  return gl_->ClientWaitSync(reinterpret_cast<GLsync>(sync), flags, timeout);
-}
 DELEGATE_TO_GL_9(compressedTexImage3D, CompressedTexImage3D, WGC3Denum,
                  WGC3Dint, WGC3Denum, WGC3Dsizei, WGC3Dsizei, WGC3Dsizei,
                  WGC3Dint, WGC3Dsizei, const void *)
@@ -510,23 +459,10 @@ WebGLId WebGraphicsContext3DImpl::createTransformFeedback() {
 void WebGraphicsContext3DImpl::deleteSampler(WebGLId sampler) {
   gl_->DeleteSamplers(1, &sampler);
 }
-void WebGraphicsContext3DImpl::deleteSync(WGC3Dsync sync) {
-  gl_->DeleteSync(reinterpret_cast<GLsync>(sync));
-}
 void WebGraphicsContext3DImpl::deleteTransformFeedback(WebGLId tf) {
   gl_->DeleteTransformFeedbacks(1, &tf);
 }
-void WebGraphicsContext3DImpl::drawRangeElements(
-    WGC3Denum mode, WGC3Duint start, WGC3Duint end, WGC3Dsizei count,
-    WGC3Denum type, WGC3Dintptr offset) {
-  gl_->DrawRangeElements(mode, start, end, count, type,
-      reinterpret_cast<void*>(static_cast<intptr_t>(offset)));
-}
 DELEGATE_TO_GL(endTransformFeedback, EndTransformFeedback)
-WGC3Dsync WebGraphicsContext3DImpl::fenceSync(WGC3Denum condition,
-                                              WGC3Dbitfield flags) {
-  return reinterpret_cast<WGC3Dsync>(gl_->FenceSync(condition, flags));
-}
 DELEGATE_TO_GL_5(getActiveUniformBlockName, GetActiveUniformBlockName,
                  WGC3Duint, WGC3Duint, WGC3Dsizei, WGC3Dsizei *, WGC3Dchar *)
 DELEGATE_TO_GL_4(getActiveUniformBlockiv, GetActiveUniformBlockiv, WGC3Duint,
@@ -556,9 +492,6 @@ DELEGATE_TO_GL_7(invalidateSubFramebuffer, InvalidateSubFramebuffer, WGC3Denum,
                  WGC3Dsizei, const WGC3Denum *, WGC3Dint, WGC3Dint, WGC3Dsizei,
                  WGC3Dsizei)
 DELEGATE_TO_GL_1R(isSampler, IsSampler, WebGLId, WGC3Dboolean)
-WGC3Dboolean WebGraphicsContext3DImpl::isSync(WGC3Dsync sync) {
-  return gl_->IsSync(reinterpret_cast<GLsync>(sync));
-}
 DELEGATE_TO_GL_1R(isTransformFeedback, IsTransformFeedback, WGC3Duint,
                   WGC3Dboolean)
 DELEGATE_TO_GL_4R(mapBufferRange, MapBufferRange, WGC3Denum, WGC3Dintptr,
@@ -579,18 +512,6 @@ DELEGATE_TO_GL_3(samplerParameteriv, SamplerParameteriv, WGC3Duint, WGC3Denum,
 DELEGATE_TO_GL_4(transformFeedbackVaryings, TransformFeedbackVaryings,
                  WGC3Duint, WGC3Dsizei, const WGC3Dchar *const*, WGC3Denum)
 DELEGATE_TO_GL_1R(unmapBuffer, UnmapBuffer, WGC3Denum, WGC3Dboolean);
-void WebGraphicsContext3DImpl::vertexAttribIPointer(
-    WGC3Duint index, WGC3Dint size, WGC3Denum type, WGC3Dsizei stride,
-    WGC3Dintptr offset) {
-  gl_->VertexAttribIPointer(
-      index, size, type, stride,
-      reinterpret_cast<void*>(static_cast<intptr_t>(offset)));
-}
-void WebGraphicsContext3DImpl::waitSync(WGC3Dsync sync,
-                                        WGC3Dbitfield flags,
-                                        WGC3Duint64 timeout) {
-  gl_->WaitSync(reinterpret_cast<GLsync>(sync), flags, timeout);
-}
 
 ::gpu::gles2::GLES2Interface* WebGraphicsContext3DImpl::getGLES2Interface() {
   return gl_;
diff --git a/gpu/blink/webgraphicscontext3d_impl.h b/gpu/blink/webgraphicscontext3d_impl.h
index a03f7f9d..733a5e8 100644
--- a/gpu/blink/webgraphicscontext3d_impl.h
+++ b/gpu/blink/webgraphicscontext3d_impl.h
@@ -37,11 +37,6 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl
   //----------------------------------------------------------------------
   // WebGraphicsContext3D methods
 
-  void drawElements(blink::WGC3Denum mode,
-                    blink::WGC3Dsizei count,
-                    blink::WGC3Denum type,
-                    blink::WGC3Dintptr offset) override;
-
   bool getActiveAttrib(blink::WebGLId program,
                        blink::WGC3Duint index,
                        ActiveInfo&) override;
@@ -54,25 +49,9 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl
   blink::WebString getShaderSource(blink::WebGLId shader) override;
   blink::WebString getString(blink::WGC3Denum name) override;
 
-  void getSynciv(blink::WGC3Dsync sync,
-                 blink::WGC3Denum pname,
-                 blink::WGC3Dsizei bufSize,
-                 blink::WGC3Dsizei *length,
-                 blink::WGC3Dint *params) override;
-
-  blink::WGC3Dsizeiptr getVertexAttribOffset(blink::WGC3Duint index,
-                                             blink::WGC3Denum pname) override;
-
   void shaderSource(blink::WebGLId shader,
                     const blink::WGC3Dchar* string) override;
 
-  void vertexAttribPointer(blink::WGC3Duint index,
-                           blink::WGC3Dint size,
-                           blink::WGC3Denum type,
-                           blink::WGC3Dboolean normalized,
-                           blink::WGC3Dsizei stride,
-                           blink::WGC3Dintptr offset) override;
-
   blink::WebGLId createBuffer() override;
   blink::WebGLId createFramebuffer() override;
   blink::WebGLId createRenderbuffer() override;
@@ -85,16 +64,6 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl
 
   blink::WebString getRequestableExtensionsCHROMIUM() override;
 
-  void blitFramebufferCHROMIUM(blink::WGC3Dint srcX0,
-                               blink::WGC3Dint srcY0,
-                               blink::WGC3Dint srcX1,
-                               blink::WGC3Dint srcY1,
-                               blink::WGC3Dint dstX0,
-                               blink::WGC3Dint dstY0,
-                               blink::WGC3Dint dstX1,
-                               blink::WGC3Dint dstY1,
-                               blink::WGC3Dbitfield mask,
-                               blink::WGC3Denum filter) override;
   blink::WebString getTranslatedShaderSourceANGLE(
       blink::WebGLId shader) override;
 
@@ -142,9 +111,6 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl
   void clearBufferuiv(blink::WGC3Denum buffer,
                       blink::WGC3Dint drawbuffer,
                       const blink::WGC3Duint* value) override;
-  blink::WGC3Denum clientWaitSync(blink::WGC3Dsync sync,
-                                  blink::WGC3Dbitfield flags,
-                                  blink::WGC3Duint64 timeout) override;
   void compressedTexImage3D(blink::WGC3Denum target,
                             blink::WGC3Dint level,
                             blink::WGC3Denum internalformat,
@@ -182,17 +148,8 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl
   blink::WebGLId createSampler() override;
   blink::WebGLId createTransformFeedback() override;
   void deleteSampler(blink::WebGLId sampler) override;
-  void deleteSync(blink::WGC3Dsync sync) override;
   void deleteTransformFeedback(blink::WebGLId transformfeedback) override;
-  void drawRangeElements(blink::WGC3Denum mode,
-                         blink::WGC3Duint start,
-                         blink::WGC3Duint end,
-                         blink::WGC3Dsizei count,
-                         blink::WGC3Denum type,
-                         blink::WGC3Dintptr offset) override;
   void endTransformFeedback(void) override;
-  blink::WGC3Dsync fenceSync(blink::WGC3Denum condition,
-                             blink::WGC3Dbitfield flags) override;
   void getActiveUniformBlockName(blink::WGC3Duint program,
                                  blink::WGC3Duint uniformBlockIndex,
                                  blink::WGC3Dsizei bufSize,
@@ -248,7 +205,6 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl
                                 blink::WGC3Dsizei width,
                                 blink::WGC3Dsizei height) override;
   blink::WGC3Dboolean isSampler(blink::WebGLId sampler) override;
-  blink::WGC3Dboolean isSync(blink::WGC3Dsync sync) override;
   blink::WGC3Dboolean isTransformFeedback(blink::WGC3Duint id) override;
   void* mapBufferRange(blink::WGC3Denum target,
                        blink::WGC3Dintptr offset,
@@ -278,14 +234,6 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl
       const blink::WGC3Dchar* const* varyings,
       blink::WGC3Denum bufferMode) override;
   blink::WGC3Dboolean unmapBuffer(blink::WGC3Denum target) override;
-  void vertexAttribIPointer(blink::WGC3Duint index,
-                            blink::WGC3Dint size,
-                            blink::WGC3Denum type,
-                            blink::WGC3Dsizei stride,
-                            blink::WGC3Dintptr pointer) override;
-  void waitSync(blink::WGC3Dsync sync,
-                blink::WGC3Dbitfield flags,
-                blink::WGC3Duint64 timeout) override;
 
   // WebGraphicsContext3D implementation.
   ::gpu::gles2::GLES2Interface* getGLES2Interface() override;