Remove remaining GLES3 methods from WebGraphicsContext3D.

Make calls directly to the GLES2Interface instead. These were
all simple delegated methods in WebGraphicsContext3DImpl.

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

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

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

2 files changed, 0 insertions, 342 deletions

diff --git a/gpu/blink/webgraphicscontext3d_impl.cc b/gpu/blink/webgraphicscontext3d_impl.cc
index 4547528..98fbb71 100644
--- a/gpu/blink/webgraphicscontext3d_impl.cc
+++ b/gpu/blink/webgraphicscontext3d_impl.cc
@@ -62,124 +62,6 @@ void WebGraphicsContext3DErrorMessageCallback::OnErrorMessage(
   graphics_context_->OnErrorMessage(msg, id);
 }
 
-// Helper macros to reduce the amount of code.
-
-#define DELEGATE_TO_GL(name, glname)                                    \
-void WebGraphicsContext3DImpl::name() {                                 \
-  gl_->glname();                                                        \
-}
-
-#define DELEGATE_TO_GL_R(name, glname, rt)                              \
-rt WebGraphicsContext3DImpl::name() {                                   \
-  return gl_->glname();                                                 \
-}
-
-#define DELEGATE_TO_GL_1(name, glname, t1)                              \
-void WebGraphicsContext3DImpl::name(t1 a1) {                            \
-  gl_->glname(a1);                                                      \
-}
-
-#define DELEGATE_TO_GL_1R(name, glname, t1, rt)                         \
-rt WebGraphicsContext3DImpl::name(t1 a1) {                              \
-  return gl_->glname(a1);                                               \
-}
-
-#define DELEGATE_TO_GL_1RB(name, glname, t1, rt)                        \
-rt WebGraphicsContext3DImpl::name(t1 a1) {                              \
-  return gl_->glname(a1) ? true : false;                                \
-}
-
-#define DELEGATE_TO_GL_2(name, glname, t1, t2)                          \
-void WebGraphicsContext3DImpl::name(t1 a1, t2 a2) {                     \
-  gl_->glname(a1, a2);                                                  \
-}
-
-#define DELEGATE_TO_GL_2R(name, glname, t1, t2, rt)                     \
-rt WebGraphicsContext3DImpl::name(t1 a1, t2 a2) {                       \
-  return gl_->glname(a1, a2);                                           \
-}
-
-#define DELEGATE_TO_GL_3(name, glname, t1, t2, t3)                      \
-void WebGraphicsContext3DImpl::name(t1 a1, t2 a2, t3 a3) {              \
-  gl_->glname(a1, a2, a3);                                              \
-}
-
-#define DELEGATE_TO_GL_3R(name, glname, t1, t2, t3, rt)                 \
-rt WebGraphicsContext3DImpl::name(t1 a1, t2 a2, t3 a3) {                \
-  return gl_->glname(a1, a2, a3);                                       \
-}
-
-#define DELEGATE_TO_GL_4(name, glname, t1, t2, t3, t4)                  \
-void WebGraphicsContext3DImpl::name(t1 a1, t2 a2, t3 a3, t4 a4) {       \
-  gl_->glname(a1, a2, a3, a4);                                          \
-}
-
-#define DELEGATE_TO_GL_4R(name, glname, t1, t2, t3, t4, rt)             \
-rt WebGraphicsContext3DImpl::name(t1 a1, t2 a2, t3 a3, t4 a4) {         \
-  return gl_->glname(a1, a2, a3, a4);                                   \
-}
-
-#define DELEGATE_TO_GL_5(name, glname, t1, t2, t3, t4, t5)              \
-void WebGraphicsContext3DImpl::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5) {\
-                                                                        \
-  gl_->glname(a1, a2, a3, a4, a5);                                      \
-}
-
-#define DELEGATE_TO_GL_6(name, glname, t1, t2, t3, t4, t5, t6)          \
-void WebGraphicsContext3DImpl::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5,  \
-                                    t6 a6) {                            \
-  gl_->glname(a1, a2, a3, a4, a5, a6);                                  \
-}
-
-#define DELEGATE_TO_GL_7(name, glname, t1, t2, t3, t4, t5, t6, t7)      \
-void WebGraphicsContext3DImpl::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5,  \
-                                    t6 a6, t7 a7) {                     \
-  gl_->glname(a1, a2, a3, a4, a5, a6, a7);                              \
-}
-
-#define DELEGATE_TO_GL_8(name, glname, t1, t2, t3, t4, t5, t6, t7, t8)  \
-void WebGraphicsContext3DImpl::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5,  \
-                                    t6 a6, t7 a7, t8 a8) {              \
-  gl_->glname(a1, a2, a3, a4, a5, a6, a7, a8);                          \
-}
-
-#define DELEGATE_TO_GL_9(name, glname, t1, t2, t3, t4, t5, t6, t7, t8, t9) \
-void WebGraphicsContext3DImpl::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5,  \
-                                    t6 a6, t7 a7, t8 a8, t9 a9) {       \
-  gl_->glname(a1, a2, a3, a4, a5, a6, a7, a8, a9);                      \
-}
-
-#define DELEGATE_TO_GL_9R(name, glname, t1, t2, t3, t4, t5, t6, t7, t8, \
-                          t9, rt)                                       \
-rt WebGraphicsContext3DImpl::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5,    \
-                                    t6 a6, t7 a7, t8 a8, t9 a9) {       \
-  return gl_->glname(a1, a2, a3, a4, a5, a6, a7, a8, a9);               \
-}
-
-#define DELEGATE_TO_GL_10(name, glname, t1, t2, t3, t4, t5, t6, t7, t8, \
-                          t9, t10)                                      \
-void WebGraphicsContext3DImpl::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5,  \
-                                    t6 a6, t7 a7, t8 a8, t9 a9,         \
-                                    t10 a10) {                          \
-  gl_->glname(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10);                 \
-}
-
-#define DELEGATE_TO_GL_11(name, glname, t1, t2, t3, t4, t5, t6, t7, t8, \
-                          t9, t10, t11)                                 \
-void WebGraphicsContext3DImpl::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5,  \
-                                    t6 a6, t7 a7, t8 a8, t9 a9, t10 a10,\
-                                    t11 a11) {                          \
-  gl_->glname(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11);            \
-}
-
-#define DELEGATE_TO_GL_12(name, glname, t1, t2, t3, t4, t5, t6, t7, t8, \
-                          t9, t10, t11, t12)                            \
-void WebGraphicsContext3DImpl::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5,  \
-                                    t6 a6, t7 a7, t8 a8, t9 a9, t10 a10,\
-                                    t11 a11, t12 a12) {                 \
-  gl_->glname(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12);       \
-}
-
 WebGraphicsContext3DImpl::WebGraphicsContext3DImpl()
     : initialized_(false),
       initialize_failed_(false),
@@ -345,84 +227,6 @@ void WebGraphicsContext3DImpl::pushGroupMarkerEXT(
   gl_->PushGroupMarkerEXT(0, marker);
 }
 
-DELEGATE_TO_GL_1(beginTransformFeedback, BeginTransformFeedback, WGC3Denum)
-DELEGATE_TO_GL_3(bindBufferBase, BindBufferBase, WGC3Denum, WGC3Duint,
-                 WGC3Duint)
-DELEGATE_TO_GL_5(bindBufferRange, BindBufferRange, WGC3Denum, WGC3Duint,
-                 WGC3Duint, WGC3Dintptr, WGC3Dsizeiptr)
-DELEGATE_TO_GL_2(bindSampler, BindSampler, WGC3Duint, WebGLId)
-DELEGATE_TO_GL_2(bindTransformFeedback, BindTransformFeedback, WGC3Denum,
-                 WebGLId)
-DELEGATE_TO_GL_4(clearBufferfi, ClearBufferfi, WGC3Denum, WGC3Dint, WGC3Dfloat,
-                 WGC3Dint)
-DELEGATE_TO_GL_3(clearBufferfv, ClearBufferfv, WGC3Denum, WGC3Dint,
-                 const WGC3Dfloat *)
-DELEGATE_TO_GL_3(clearBufferiv, ClearBufferiv, WGC3Denum, WGC3Dint,
-                 const WGC3Dint *)
-DELEGATE_TO_GL_3(clearBufferuiv, ClearBufferuiv, WGC3Denum, WGC3Dint,
-                 const WGC3Duint *)
-DELEGATE_TO_GL_9(compressedTexImage3D, CompressedTexImage3D, WGC3Denum,
-                 WGC3Dint, WGC3Denum, WGC3Dsizei, WGC3Dsizei, WGC3Dsizei,
-                 WGC3Dint, WGC3Dsizei, const void *)
-DELEGATE_TO_GL_11(compressedTexSubImage3D, CompressedTexSubImage3D, WGC3Denum,
-                  WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dsizei,
-                  WGC3Dsizei, WGC3Dsizei, WGC3Denum, WGC3Dsizei, const void *)
-DELEGATE_TO_GL_5(copyBufferSubData, CopyBufferSubData, WGC3Denum, WGC3Denum,
-                 WGC3Dintptr, WGC3Dintptr, WGC3Dsizeiptr)
-DELEGATE_TO_GL_9(copyTexSubImage3D, CopyTexSubImage3D, WGC3Denum, WGC3Dint,
-                 WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dsizei,
-                 WGC3Dsizei)
-DELEGATE_TO_GL(endTransformFeedback, EndTransformFeedback)
-DELEGATE_TO_GL_5(getActiveUniformBlockName, GetActiveUniformBlockName,
-                 WGC3Duint, WGC3Duint, WGC3Dsizei, WGC3Dsizei *, WGC3Dchar *)
-DELEGATE_TO_GL_4(getActiveUniformBlockiv, GetActiveUniformBlockiv, WGC3Duint,
-                 WGC3Duint, WGC3Denum, WGC3Dint *)
-DELEGATE_TO_GL_5(getActiveUniformsiv, GetActiveUniformsiv, WGC3Duint,
-                 WGC3Dsizei, const WGC3Duint *, WGC3Denum, WGC3Dint *)
-DELEGATE_TO_GL_2R(getFragDataLocation, GetFragDataLocation, WGC3Duint,
-                  const WGC3Dchar *, WGC3Dint)
-DELEGATE_TO_GL_5(getInternalformativ, GetInternalformativ, WGC3Denum, WGC3Denum,
-                 WGC3Denum, WGC3Dsizei, WGC3Dint *)
-DELEGATE_TO_GL_3(getSamplerParameterfv, GetSamplerParameterfv, WGC3Duint,
-                 WGC3Denum, WGC3Dfloat *)
-DELEGATE_TO_GL_3(getSamplerParameteriv, GetSamplerParameteriv, WGC3Duint,
-                 WGC3Denum, WGC3Dint *)
-DELEGATE_TO_GL_7(getTransformFeedbackVarying, GetTransformFeedbackVarying,
-                 WGC3Duint, WGC3Duint, WGC3Dsizei, WGC3Dsizei *, WGC3Dsizei *,
-                 WGC3Denum *, WGC3Dchar *)
-DELEGATE_TO_GL_2R(getUniformBlockIndex, GetUniformBlockIndex, WGC3Duint,
-                  const WGC3Dchar *, WGC3Duint)
-DELEGATE_TO_GL_4(getUniformIndices, GetUniformIndices, WGC3Duint, WGC3Dsizei,
-                 const WGC3Dchar *const*, WGC3Duint *)
-DELEGATE_TO_GL_3(getUniformuiv, GetUniformuiv, WGC3Duint, WGC3Dint,
-                 WGC3Duint *)
-DELEGATE_TO_GL_3(invalidateFramebuffer, InvalidateFramebuffer, WGC3Denum,
-                 WGC3Dsizei, const WGC3Denum *)
-DELEGATE_TO_GL_7(invalidateSubFramebuffer, InvalidateSubFramebuffer, WGC3Denum,
-                 WGC3Dsizei, const WGC3Denum *, WGC3Dint, WGC3Dint, WGC3Dsizei,
-                 WGC3Dsizei)
-DELEGATE_TO_GL_1R(isSampler, IsSampler, WebGLId, WGC3Dboolean)
-DELEGATE_TO_GL_1R(isTransformFeedback, IsTransformFeedback, WGC3Duint,
-                  WGC3Dboolean)
-DELEGATE_TO_GL_4R(mapBufferRange, MapBufferRange, WGC3Denum, WGC3Dintptr,
-                  WGC3Dsizeiptr, WGC3Dbitfield, void*);
-DELEGATE_TO_GL(pauseTransformFeedback, PauseTransformFeedback)
-//DELEGATE_TO_GL_3(programParameteri, ProgramParameteri, WGC3Duint, WGC3Denum,
-//                 WGC3Dint)
-DELEGATE_TO_GL_1(readBuffer, ReadBuffer, WGC3Denum)
-DELEGATE_TO_GL(resumeTransformFeedback, ResumeTransformFeedback)
-DELEGATE_TO_GL_3(samplerParameterf, SamplerParameterf, WGC3Duint, WGC3Denum,
-                 WGC3Dfloat)
-DELEGATE_TO_GL_3(samplerParameterfv, SamplerParameterfv, WGC3Duint, WGC3Denum,
-                 const WGC3Dfloat *)
-DELEGATE_TO_GL_3(samplerParameteri, SamplerParameteri, WGC3Duint, WGC3Denum,
-                 WGC3Dint)
-DELEGATE_TO_GL_3(samplerParameteriv, SamplerParameteriv, WGC3Duint, WGC3Denum,
-                 const WGC3Dint *)
-DELEGATE_TO_GL_4(transformFeedbackVaryings, TransformFeedbackVaryings,
-                 WGC3Duint, WGC3Dsizei, const WGC3Dchar *const*, WGC3Denum)
-DELEGATE_TO_GL_1R(unmapBuffer, UnmapBuffer, WGC3Denum, WGC3Dboolean);
-
 ::gpu::gles2::GLES2Interface* WebGraphicsContext3DImpl::getGLES2Interface() {
   return gl_;
 }
diff --git a/gpu/blink/webgraphicscontext3d_impl.h b/gpu/blink/webgraphicscontext3d_impl.h
index f799dde..3f05ff1 100644
--- a/gpu/blink/webgraphicscontext3d_impl.h
+++ b/gpu/blink/webgraphicscontext3d_impl.h
@@ -65,152 +65,6 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl
 
   void pushGroupMarkerEXT(const blink::WGC3Dchar* marker) override;
 
-  // OpenGL ES 3.0 functions not represented by pre-existing extensions
-  void beginTransformFeedback(blink::WGC3Denum primitiveMode) override;
-  void bindBufferBase(blink::WGC3Denum target,
-                      blink::WGC3Duint index,
-                      blink::WGC3Duint buffer) override;
-  void bindBufferRange(blink::WGC3Denum target,
-                       blink::WGC3Duint index,
-                       blink::WGC3Duint buffer,
-                       blink::WGC3Dintptr offset,
-                       blink::WGC3Dsizeiptr size) override;
-  void bindSampler(blink::WGC3Duint unit, blink::WebGLId sampler) override;
-  void bindTransformFeedback(blink::WGC3Denum target,
-                             blink::WebGLId transformfeedback) override;
-  void clearBufferfi(blink::WGC3Denum buffer,
-                     blink::WGC3Dint drawbuffer,
-                     blink::WGC3Dfloat depth,
-                     blink::WGC3Dint stencil) override;
-  void clearBufferfv(blink::WGC3Denum buffer,
-                     blink::WGC3Dint drawbuffer,
-                     const blink::WGC3Dfloat* value) override;
-  void clearBufferiv(blink::WGC3Denum buffer,
-                     blink::WGC3Dint drawbuffer,
-                     const blink::WGC3Dint* value) override;
-  void clearBufferuiv(blink::WGC3Denum buffer,
-                      blink::WGC3Dint drawbuffer,
-                      const blink::WGC3Duint* value) override;
-  void compressedTexImage3D(blink::WGC3Denum target,
-                            blink::WGC3Dint level,
-                            blink::WGC3Denum internalformat,
-                            blink::WGC3Dsizei width,
-                            blink::WGC3Dsizei height,
-                            blink::WGC3Dsizei depth,
-                            blink::WGC3Dint border,
-                            blink::WGC3Dsizei imageSize,
-                            const void *data) override;
-  void compressedTexSubImage3D(blink::WGC3Denum target,
-                               blink::WGC3Dint level,
-                               blink::WGC3Dint xoffset,
-                               blink::WGC3Dint yoffset,
-                               blink::WGC3Dint zoffset,
-                               blink::WGC3Dsizei width,
-                               blink::WGC3Dsizei height,
-                               blink::WGC3Dsizei depth,
-                               blink::WGC3Denum format,
-                               blink::WGC3Dsizei imageSize,
-                               const void *data) override;
-  void copyBufferSubData(blink::WGC3Denum readTarget,
-                         blink::WGC3Denum writeTarget,
-                         blink::WGC3Dintptr readOffset,
-                         blink::WGC3Dintptr writeOffset,
-                         blink::WGC3Dsizeiptr size) override;
-  void copyTexSubImage3D(blink::WGC3Denum target,
-                         blink::WGC3Dint level,
-                         blink::WGC3Dint xoffset,
-                         blink::WGC3Dint yoffset,
-                         blink::WGC3Dint zoffset,
-                         blink::WGC3Dint x,
-                         blink::WGC3Dint y,
-                         blink::WGC3Dsizei width,
-                         blink::WGC3Dsizei height) override;
-  void endTransformFeedback(void) override;
-  void getActiveUniformBlockName(blink::WGC3Duint program,
-                                 blink::WGC3Duint uniformBlockIndex,
-                                 blink::WGC3Dsizei bufSize,
-                                 blink::WGC3Dsizei* length,
-                                 blink::WGC3Dchar* uniformBlockName) override;
-  void getActiveUniformBlockiv(blink::WGC3Duint program,
-                               blink::WGC3Duint uniformBlockIndex,
-                               blink::WGC3Denum pname,
-                               blink::WGC3Dint* params) override;
-  void getActiveUniformsiv(blink::WGC3Duint program,
-                           blink::WGC3Dsizei uniformCount,
-                           const blink::WGC3Duint *uniformIndices,
-                           blink::WGC3Denum pname,
-                           blink::WGC3Dint *params) override;
-  blink::WGC3Dint getFragDataLocation(blink::WGC3Duint program,
-                                      const blink::WGC3Dchar* name) override;
-  void getInternalformativ(blink::WGC3Denum target,
-                           blink::WGC3Denum internalformat,
-                           blink::WGC3Denum pname,
-                           blink::WGC3Dsizei bufSize,
-                           blink::WGC3Dint* params) override;
-  void getSamplerParameterfv(blink::WGC3Duint sampler,
-                             blink::WGC3Denum pname,
-                             blink::WGC3Dfloat* params) override;
-  void getSamplerParameteriv(blink::WGC3Duint sampler,
-                             blink::WGC3Denum pname,
-                             blink::WGC3Dint* params) override;
-  void getTransformFeedbackVarying(blink::WGC3Duint program,
-                                   blink::WGC3Duint index,
-                                   blink::WGC3Dsizei bufSize,
-                                   blink::WGC3Dsizei *length,
-                                   blink::WGC3Dsizei *size,
-                                   blink::WGC3Denum *type,
-                                   blink::WGC3Dchar *name) override;
-  blink::WGC3Duint getUniformBlockIndex(
-      blink::WGC3Duint program,
-      const blink::WGC3Dchar* uniformBlockName) override;
-  void getUniformIndices(blink::WGC3Duint program,
-                         blink::WGC3Dsizei uniformCount,
-                         const blink::WGC3Dchar *const*uniformNames,
-                         blink::WGC3Duint *uniformIndices) override;
-  void getUniformuiv(blink::WGC3Duint program,
-                     blink::WGC3Dint location,
-                     blink::WGC3Duint *params) override;
-  void invalidateFramebuffer(blink::WGC3Denum target,
-                             blink::WGC3Dsizei numAttachments,
-                             const blink::WGC3Denum* attachments) override;
-  void invalidateSubFramebuffer(blink::WGC3Denum target,
-                                blink::WGC3Dsizei numAttachments,
-                                const blink::WGC3Denum* attachments,
-                                blink::WGC3Dint x,
-                                blink::WGC3Dint y,
-                                blink::WGC3Dsizei width,
-                                blink::WGC3Dsizei height) override;
-  blink::WGC3Dboolean isSampler(blink::WebGLId sampler) override;
-  blink::WGC3Dboolean isTransformFeedback(blink::WGC3Duint id) override;
-  void* mapBufferRange(blink::WGC3Denum target,
-                       blink::WGC3Dintptr offset,
-                       blink::WGC3Dsizeiptr length,
-                       blink::WGC3Dbitfield access) override;
-  void pauseTransformFeedback(void) override;
-  //void programParameteri(blink::WGC3Duint program,
-  //                       blink::WGC3Denum pname,
-  //                       blink::WGC3Dint value) override;
-  void readBuffer(blink::WGC3Denum src) override;
-  void resumeTransformFeedback(void) override;
-  void samplerParameterf(blink::WGC3Duint sampler,
-                         blink::WGC3Denum pname,
-                         blink::WGC3Dfloat param) override;
-  void samplerParameterfv(blink::WGC3Duint sampler,
-                          blink::WGC3Denum pname,
-                          const blink::WGC3Dfloat* param) override;
-  void samplerParameteri(blink::WGC3Duint sampler,
-                         blink::WGC3Denum pname,
-                         blink::WGC3Dint param) override;
-  void samplerParameteriv(blink::WGC3Duint sampler,
-                          blink::WGC3Denum pname,
-                          const blink::WGC3Dint* param) override;
-  void transformFeedbackVaryings(
-      blink::WGC3Duint program,
-      blink::WGC3Dsizei count,
-      const blink::WGC3Dchar* const* varyings,
-      blink::WGC3Denum bufferMode) override;
-  blink::WGC3Dboolean unmapBuffer(blink::WGC3Denum target) override;
-
   // WebGraphicsContext3D implementation.
   ::gpu::gles2::GLES2Interface* getGLES2Interface() override;