Make GLES2Implementation based on GLES2Interface

gpu/command_buffer/client/gles2_implementation_impl_autogen.h

Index: gpu/command_buffer/client/gles2_implementation_impl_autogen.h
diff --git a/gpu/command_buffer/client/gles2_implementation_autogen.h b/gpu/command_buffer/client/gles2_implementation_impl_autogen.h
similarity index 83%
copy from gpu/command_buffer/client/gles2_implementation_autogen.h
copy to gpu/command_buffer/client/gles2_implementation_impl_autogen.h
index 8b7901f5f1a04a2dbba54a39c43692bbdde37d78..3beca1b110f0661648e001d2d1fb58b5fa1219b0 100644
--- a/gpu/command_buffer/client/gles2_implementation_autogen.h
+++ b/gpu/command_buffer/client/gles2_implementation_impl_autogen.h
@@ -6,22 +6,18 @@
 // gpu/command_buffer/build_gles2_cmd_buffer.py
 // DO NOT EDIT!
 
-// This file is included by gles2_implementation.h to declare the
+// This file is included by gles2_implementation.cc to define the
 // GL api functions.
-#ifndef GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_AUTOGEN_H_
-#define GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_AUTOGEN_H_
+#ifndef GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_IMPL_AUTOGEN_H_
+#define GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_IMPL_AUTOGEN_H_
 
-void ActiveTexture(GLenum texture);
-
-void AttachShader(GLuint program, GLuint shader) {
+void GLES2Implementation::AttachShader(GLuint program, GLuint shader) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glAttachShader(" << program << ", " << shader << ")");  // NOLINT
   helper_->AttachShader(program, shader);
 }
 
-void BindAttribLocation(GLuint program, GLuint index, const char* name);
-
-void BindBuffer(GLenum target, GLuint buffer) {
+void GLES2Implementation::BindBuffer(GLenum target, GLuint buffer) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glBindBuffer(" << GLES2Util::GetStringBufferTarget(target) << ", " << buffer << ")");  // NOLINT
   if (IsBufferReservedId(buffer)) {
@@ -32,7 +28,7 @@ void BindBuffer(GLenum target, GLuint buffer) {
   helper_->BindBuffer(target, buffer);
 }
 
-void BindFramebuffer(GLenum target, GLuint framebuffer) {
+void GLES2Implementation::BindFramebuffer(GLenum target, GLuint framebuffer) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glBindFramebuffer(" << GLES2Util::GetStringFrameBufferTarget(target) << ", " << framebuffer << ")");  // NOLINT
   if (IsFramebufferReservedId(framebuffer)) {
@@ -44,7 +40,8 @@ void BindFramebuffer(GLenum target, GLuint framebuffer) {
   helper_->BindFramebuffer(target, framebuffer);
 }
 
-void BindRenderbuffer(GLenum target, GLuint renderbuffer) {
+void GLES2Implementation::BindRenderbuffer(
+    GLenum target, GLuint renderbuffer) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glBindRenderbuffer(" << GLES2Util::GetStringRenderBufferTarget(target) << ", " << renderbuffer << ")");  // NOLINT
   if (IsRenderbufferReservedId(renderbuffer)) {
@@ -56,7 +53,7 @@ void BindRenderbuffer(GLenum target, GLuint renderbuffer) {
   helper_->BindRenderbuffer(target, renderbuffer);
 }
 
-void BindTexture(GLenum target, GLuint texture) {
+void GLES2Implementation::BindTexture(GLenum target, GLuint texture) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glBindTexture(" << GLES2Util::GetStringTextureBindTarget(target) << ", " << texture << ")");  // NOLINT
   if (IsTextureReservedId(texture)) {
@@ -67,44 +64,40 @@ void BindTexture(GLenum target, GLuint texture) {
   helper_->BindTexture(target, texture);
 }
 
-void BlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha) {
+void GLES2Implementation::BlendColor(
+    GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glBlendColor(" << red << ", " << green << ", " << blue << ", " << alpha << ")");  // NOLINT
   helper_->BlendColor(red, green, blue, alpha);
 }
 
-void BlendEquation(GLenum mode) {
+void GLES2Implementation::BlendEquation(GLenum mode) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glBlendEquation(" << GLES2Util::GetStringEquation(mode) << ")");  // NOLINT
   helper_->BlendEquation(mode);
 }
 
-void BlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha) {
+void GLES2Implementation::BlendEquationSeparate(
+    GLenum modeRGB, GLenum modeAlpha) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glBlendEquationSeparate(" << GLES2Util::GetStringEquation(modeRGB) << ", " << GLES2Util::GetStringEquation(modeAlpha) << ")");  // NOLINT
   helper_->BlendEquationSeparate(modeRGB, modeAlpha);
 }
 
-void BlendFunc(GLenum sfactor, GLenum dfactor) {
+void GLES2Implementation::BlendFunc(GLenum sfactor, GLenum dfactor) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glBlendFunc(" << GLES2Util::GetStringSrcBlendFactor(sfactor) << ", " << GLES2Util::GetStringDstBlendFactor(dfactor) << ")");  // NOLINT
   helper_->BlendFunc(sfactor, dfactor);
 }
 
-void BlendFuncSeparate(
+void GLES2Implementation::BlendFuncSeparate(
     GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glBlendFuncSeparate(" << GLES2Util::GetStringSrcBlendFactor(srcRGB) << ", " << GLES2Util::GetStringDstBlendFactor(dstRGB) << ", " << GLES2Util::GetStringSrcBlendFactor(srcAlpha) << ", " << GLES2Util::GetStringDstBlendFactor(dstAlpha) << ")");  // NOLINT
   helper_->BlendFuncSeparate(srcRGB, dstRGB, srcAlpha, dstAlpha);
 }
 
-void BufferData(
-    GLenum target, GLsizeiptr size, const void* data, GLenum usage);
-
-void BufferSubData(
-    GLenum target, GLintptr offset, GLsizeiptr size, const void* data);
-
-GLenum CheckFramebufferStatus(GLenum target) {
+GLenum GLES2Implementation::CheckFramebufferStatus(GLenum target) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glCheckFramebufferStatus(" << GLES2Util::GetStringFrameBufferTarget(target) << ")");  // NOLINT
   typedef CheckFramebufferStatus::Result Result;
@@ -120,48 +113,39 @@ GLenum CheckFramebufferStatus(GLenum target) {
   return *result;
 }
 
-void Clear(GLbitfield mask);
-
-void ClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha) {
+void GLES2Implementation::ClearColor(
+    GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glClearColor(" << red << ", " << green << ", " << blue << ", " << alpha << ")");  // NOLINT
   helper_->ClearColor(red, green, blue, alpha);
 }
 
-void ClearDepthf(GLclampf depth) {
+void GLES2Implementation::ClearDepthf(GLclampf depth) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glClearDepthf(" << depth << ")");
   helper_->ClearDepthf(depth);
 }
 
-void ClearStencil(GLint s) {
+void GLES2Implementation::ClearStencil(GLint s) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glClearStencil(" << s << ")");
   helper_->ClearStencil(s);
 }
 
-void ColorMask(
+void GLES2Implementation::ColorMask(
     GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glColorMask(" << GLES2Util::GetStringBool(red) << ", " << GLES2Util::GetStringBool(green) << ", " << GLES2Util::GetStringBool(blue) << ", " << GLES2Util::GetStringBool(alpha) << ")");  // NOLINT
   helper_->ColorMask(red, green, blue, alpha);
 }
 
-void CompileShader(GLuint shader) {
+void GLES2Implementation::CompileShader(GLuint shader) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glCompileShader(" << shader << ")");  // NOLINT
   helper_->CompileShader(shader);
 }
 
-void CompressedTexImage2D(
-    GLenum target, GLint level, GLenum internalformat, GLsizei width,
-    GLsizei height, GLint border, GLsizei imageSize, const void* data);
-
-void CompressedTexSubImage2D(
-    GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
-    GLsizei height, GLenum format, GLsizei imageSize, const void* data);
-
-void CopyTexImage2D(
+void GLES2Implementation::CopyTexImage2D(
     GLenum target, GLint level, GLenum internalformat, GLint x, GLint y,
     GLsizei width, GLsizei height, GLint border) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
@@ -178,7 +162,7 @@ void CopyTexImage2D(
       target, level, internalformat, x, y, width, height, border);
 }
 
-void CopyTexSubImage2D(
+void GLES2Implementation::CopyTexSubImage2D(
     GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y,
     GLsizei width, GLsizei height) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
@@ -195,7 +179,7 @@ void CopyTexSubImage2D(
       target, level, xoffset, yoffset, x, y, width, height);
 }
 
-GLuint CreateProgram() {
+GLuint GLES2Implementation::CreateProgram() {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glCreateProgram(" << ")");
   GLuint client_id;
@@ -206,7 +190,7 @@ GLuint CreateProgram() {
   return client_id;
 }
 
-GLuint CreateShader(GLenum type) {
+GLuint GLES2Implementation::CreateShader(GLenum type) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glCreateShader(" << GLES2Util::GetStringShaderType(type) << ")");  // NOLINT
   GLuint client_id;
@@ -217,13 +201,13 @@ GLuint CreateShader(GLenum type) {
   return client_id;
 }
 
-void CullFace(GLenum mode) {
+void GLES2Implementation::CullFace(GLenum mode) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glCullFace(" << GLES2Util::GetStringFaceType(mode) << ")");  // NOLINT
   helper_->CullFace(mode);
 }
 
-void DeleteBuffers(GLsizei n, const GLuint* buffers) {
+void GLES2Implementation::DeleteBuffers(GLsizei n, const GLuint* buffers) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDeleteBuffers(" << n << ", " << static_cast<const void*>(buffers) << ")");  // NOLINT
   GPU_CLIENT_LOG_CODE_BLOCK({
@@ -243,7 +227,8 @@ void DeleteBuffers(GLsizei n, const GLuint* buffers) {
   DeleteBuffersHelper(n, buffers);
 }
 
-void DeleteFramebuffers(GLsizei n, const GLuint* framebuffers) {
+void GLES2Implementation::DeleteFramebuffers(
+    GLsizei n, const GLuint* framebuffers) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDeleteFramebuffers(" << n << ", " << static_cast<const void*>(framebuffers) << ")");  // NOLINT
   GPU_CLIENT_LOG_CODE_BLOCK({
@@ -263,14 +248,15 @@ void DeleteFramebuffers(GLsizei n, const GLuint* framebuffers) {
   DeleteFramebuffersHelper(n, framebuffers);
 }
 
-void DeleteProgram(GLuint program) {
+void GLES2Implementation::DeleteProgram(GLuint program) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDeleteProgram(" << program << ")");  // NOLINT
   GPU_CLIENT_DCHECK(program != 0);
   DeleteProgramHelper(program);
 }
 
-void DeleteRenderbuffers(GLsizei n, const GLuint* renderbuffers) {
+void GLES2Implementation::DeleteRenderbuffers(
+    GLsizei n, const GLuint* renderbuffers) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDeleteRenderbuffers(" << n << ", " << static_cast<const void*>(renderbuffers) << ")");  // NOLINT
   GPU_CLIENT_LOG_CODE_BLOCK({
@@ -290,14 +276,14 @@ void DeleteRenderbuffers(GLsizei n, const GLuint* renderbuffers) {
   DeleteRenderbuffersHelper(n, renderbuffers);
 }
 
-void DeleteShader(GLuint shader) {
+void GLES2Implementation::DeleteShader(GLuint shader) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDeleteShader(" << shader << ")");
   GPU_CLIENT_DCHECK(shader != 0);
   DeleteShaderHelper(shader);
 }
 
-void DeleteTextures(GLsizei n, const GLuint* textures) {
+void GLES2Implementation::DeleteTextures(GLsizei n, const GLuint* textures) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDeleteTextures(" << n << ", " << static_cast<const void*>(textures) << ")");  // NOLINT
   GPU_CLIENT_LOG_CODE_BLOCK({
@@ -317,46 +303,31 @@ void DeleteTextures(GLsizei n, const GLuint* textures) {
   DeleteTexturesHelper(n, textures);
 }
 
-void DepthFunc(GLenum func) {
+void GLES2Implementation::DepthFunc(GLenum func) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDepthFunc(" << GLES2Util::GetStringCmpFunction(func) << ")");  // NOLINT
   helper_->DepthFunc(func);
 }
 
-void DepthMask(GLboolean flag) {
+void GLES2Implementation::DepthMask(GLboolean flag) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDepthMask(" << GLES2Util::GetStringBool(flag) << ")");  // NOLINT
   helper_->DepthMask(flag);
 }
 
-void DepthRangef(GLclampf zNear, GLclampf zFar) {
+void GLES2Implementation::DepthRangef(GLclampf zNear, GLclampf zFar) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDepthRangef(" << zNear << ", " << zFar << ")");  // NOLINT
   helper_->DepthRangef(zNear, zFar);
 }
 
-void DetachShader(GLuint program, GLuint shader) {
+void GLES2Implementation::DetachShader(GLuint program, GLuint shader) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDetachShader(" << program << ", " << shader << ")");  // NOLINT
   helper_->DetachShader(program, shader);
 }
 
-void Disable(GLenum cap);
-
-void DrawArrays(GLenum mode, GLint first, GLsizei count);
-
-void DrawElements(
-    GLenum mode, GLsizei count, GLenum type, const void* indices);
-
-void Enable(GLenum cap);
-
-void Finish();
-
-void Flush();
-
-void ShallowFlushCHROMIUM();
-
-void FramebufferRenderbuffer(
+void GLES2Implementation::FramebufferRenderbuffer(
     GLenum target, GLenum attachment, GLenum renderbuffertarget,
     GLuint renderbuffer) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
@@ -365,7 +336,7 @@ void FramebufferRenderbuffer(
       target, attachment, renderbuffertarget, renderbuffer);
 }
 
-void FramebufferTexture2D(
+void GLES2Implementation::FramebufferTexture2D(
     GLenum target, GLenum attachment, GLenum textarget, GLuint texture,
     GLint level) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
@@ -373,13 +344,13 @@ void FramebufferTexture2D(
   helper_->FramebufferTexture2D(target, attachment, textarget, texture, level);
 }
 
-void FrontFace(GLenum mode) {
+void GLES2Implementation::FrontFace(GLenum mode) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glFrontFace(" << GLES2Util::GetStringFaceMode(mode) << ")");  // NOLINT
   helper_->FrontFace(mode);
 }
 
-void GenBuffers(GLsizei n, GLuint* buffers) {
+void GLES2Implementation::GenBuffers(GLsizei n, GLuint* buffers) {
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGenBuffers(" << n << ", " << static_cast<const void*>(buffers) << ")");  // NOLINT
   if (n < 0) {
     SetGLError(GL_INVALID_VALUE, "glGenBuffers", "n < 0");
@@ -396,13 +367,13 @@ void GenBuffers(GLsizei n, GLuint* buffers) {
   });
 }
 
-void GenerateMipmap(GLenum target) {
+void GLES2Implementation::GenerateMipmap(GLenum target) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGenerateMipmap(" << GLES2Util::GetStringTextureBindTarget(target) << ")");  // NOLINT
   helper_->GenerateMipmap(target);
 }
 
-void GenFramebuffers(GLsizei n, GLuint* framebuffers) {
+void GLES2Implementation::GenFramebuffers(GLsizei n, GLuint* framebuffers) {
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGenFramebuffers(" << n << ", " << static_cast<const void*>(framebuffers) << ")");  // NOLINT
   if (n < 0) {
     SetGLError(GL_INVALID_VALUE, "glGenFramebuffers", "n < 0");
@@ -419,7 +390,7 @@ void GenFramebuffers(GLsizei n, GLuint* framebuffers) {
   });
 }
 
-void GenRenderbuffers(GLsizei n, GLuint* renderbuffers) {
+void GLES2Implementation::GenRenderbuffers(GLsizei n, GLuint* renderbuffers) {
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGenRenderbuffers(" << n << ", " << static_cast<const void*>(renderbuffers) << ")");  // NOLINT
   if (n < 0) {
     SetGLError(GL_INVALID_VALUE, "glGenRenderbuffers", "n < 0");
@@ -436,7 +407,7 @@ void GenRenderbuffers(GLsizei n, GLuint* renderbuffers) {
   });
 }
 
-void GenTextures(GLsizei n, GLuint* textures) {
+void GLES2Implementation::GenTextures(GLsizei n, GLuint* textures) {
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGenTextures(" << n << ", " << static_cast<const void*>(textures) << ")");  // NOLINT
   if (n < 0) {
     SetGLError(GL_INVALID_VALUE, "glGenTextures", "n < 0");
@@ -453,20 +424,7 @@ void GenTextures(GLsizei n, GLuint* textures) {
   });
 }
 
-void GetActiveAttrib(
-    GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size,
-    GLenum* type, char* name);
-
-void GetActiveUniform(
-    GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size,
-    GLenum* type, char* name);
-
-void GetAttachedShaders(
-    GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders);
-
-GLint GetAttribLocation(GLuint program, const char* name);
-
-void GetBooleanv(GLenum pname, GLboolean* params) {
+void GLES2Implementation::GetBooleanv(GLenum pname, GLboolean* params) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_VALIDATE_DESTINATION_INITALIZATION(GLboolean, params);
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetBooleanv(" << GLES2Util::GetStringGLState(pname) << ", " << static_cast<const void*>(params) << ")");  // NOLINT
@@ -489,7 +447,8 @@ void GetBooleanv(GLenum pname, GLboolean* params) {
     }
   });
 }
-void GetBufferParameteriv(GLenum target, GLenum pname, GLint* params) {
+void GLES2Implementation::GetBufferParameteriv(
+    GLenum target, GLenum pname, GLint* params) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_VALIDATE_DESTINATION_INITALIZATION(GLint, params);
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetBufferParameteriv(" << GLES2Util::GetStringBufferTarget(target) << ", " << GLES2Util::GetStringBufferParameter(pname) << ", " << static_cast<const void*>(params) << ")");  // NOLINT
@@ -512,9 +471,7 @@ void GetBufferParameteriv(GLenum target, GLenum pname, GLint* params) {
     }
   });
 }
-GLenum GetError();
-
-void GetFloatv(GLenum pname, GLfloat* params) {
+void GLES2Implementation::GetFloatv(GLenum pname, GLfloat* params) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetFloatv(" << GLES2Util::GetStringGLState(pname) << ", " << static_cast<const void*>(params) << ")");  // NOLINT
   if (GetFloatvHelper(pname, params)) {
@@ -536,7 +493,7 @@ void GetFloatv(GLenum pname, GLfloat* params) {
     }
   });
 }
-void GetFramebufferAttachmentParameteriv(
+void GLES2Implementation::GetFramebufferAttachmentParameteriv(
     GLenum target, GLenum attachment, GLenum pname, GLint* params) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_VALIDATE_DESTINATION_INITALIZATION(GLint, params);
@@ -561,7 +518,7 @@ void GetFramebufferAttachmentParameteriv(
     }
   });
 }
-void GetIntegerv(GLenum pname, GLint* params) {
+void GLES2Implementation::GetIntegerv(GLenum pname, GLint* params) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_VALIDATE_DESTINATION_INITALIZATION(GLint, params);
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetIntegerv(" << GLES2Util::GetStringGLState(pname) << ", " << static_cast<const void*>(params) << ")");  // NOLINT
@@ -584,7 +541,8 @@ void GetIntegerv(GLenum pname, GLint* params) {
     }
   });
 }
-void GetProgramiv(GLuint program, GLenum pname, GLint* params) {
+void GLES2Implementation::GetProgramiv(
+    GLuint program, GLenum pname, GLint* params) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_VALIDATE_DESTINATION_INITALIZATION(GLint, params);
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetProgramiv(" << program << ", " << GLES2Util::GetStringProgramParameter(pname) << ", " << static_cast<const void*>(params) << ")");  // NOLINT
@@ -607,7 +565,7 @@ void GetProgramiv(GLuint program, GLenum pname, GLint* params) {
     }
   });
 }
-void GetProgramInfoLog(
+void GLES2Implementation::GetProgramInfoLog(
     GLuint program, GLsizei bufsize, GLsizei* length, char* infolog) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_VALIDATE_DESTINATION_OPTIONAL_INITALIZATION(GLsizei, length);
@@ -634,7 +592,8 @@ void GetProgramInfoLog(
     *length = max_size;
   }
 }
-void GetRenderbufferParameteriv(GLenum target, GLenum pname, GLint* params) {
+void GLES2Implementation::GetRenderbufferParameteriv(
+    GLenum target, GLenum pname, GLint* params) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_VALIDATE_DESTINATION_INITALIZATION(GLint, params);
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetRenderbufferParameteriv(" << GLES2Util::GetStringRenderBufferTarget(target) << ", " << GLES2Util::GetStringRenderBufferParameter(pname) << ", " << static_cast<const void*>(params) << ")");  // NOLINT
@@ -657,7 +616,8 @@ void GetRenderbufferParameteriv(GLenum target, GLenum pname, GLint* params) {
     }
   });
 }
-void GetShaderiv(GLuint shader, GLenum pname, GLint* params) {
+void GLES2Implementation::GetShaderiv(
+    GLuint shader, GLenum pname, GLint* params) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_VALIDATE_DESTINATION_INITALIZATION(GLint, params);
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetShaderiv(" << shader << ", " << GLES2Util::GetStringShaderParameter(pname) << ", " << static_cast<const void*>(params) << ")");  // NOLINT
@@ -680,7 +640,7 @@ void GetShaderiv(GLuint shader, GLenum pname, GLint* params) {
     }
   });
 }
-void GetShaderInfoLog(
+void GLES2Implementation::GetShaderInfoLog(
     GLuint shader, GLsizei bufsize, GLsizei* length, char* infolog) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_VALIDATE_DESTINATION_OPTIONAL_INITALIZATION(GLsizei, length);
@@ -707,10 +667,7 @@ void GetShaderInfoLog(
     *length = max_size;
   }
 }
-void GetShaderPrecisionFormat(
-    GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision);
-
-void GetShaderSource(
+void GLES2Implementation::GetShaderSource(
     GLuint shader, GLsizei bufsize, GLsizei* length, char* source) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_VALIDATE_DESTINATION_OPTIONAL_INITALIZATION(GLsizei, length);
@@ -737,9 +694,8 @@ void GetShaderSource(
     *length = max_size;
   }
 }
-const GLubyte* GetString(GLenum name);
-
-void GetTexParameterfv(GLenum target, GLenum pname, GLfloat* params) {
+void GLES2Implementation::GetTexParameterfv(
+    GLenum target, GLenum pname, GLfloat* params) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetTexParameterfv(" << GLES2Util::GetStringGetTexParamTarget(target) << ", " << GLES2Util::GetStringTextureParameter(pname) << ", " << static_cast<const void*>(params) << ")");  // NOLINT
   if (GetTexParameterfvHelper(target, pname, params)) {
@@ -761,7 +717,8 @@ void GetTexParameterfv(GLenum target, GLenum pname, GLfloat* params) {
     }
   });
 }
-void GetTexParameteriv(GLenum target, GLenum pname, GLint* params) {
+void GLES2Implementation::GetTexParameteriv(
+    GLenum target, GLenum pname, GLint* params) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_VALIDATE_DESTINATION_INITALIZATION(GLint, params);
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGetTexParameteriv(" << GLES2Util::GetStringGetTexParamTarget(target) << ", " << GLES2Util::GetStringTextureParameter(pname) << ", " << static_cast<const void*>(params) << ")");  // NOLINT
@@ -784,21 +741,13 @@ void GetTexParameteriv(GLenum target, GLenum pname, GLint* params) {
     }
   });
 }
-void GetUniformfv(GLuint program, GLint location, GLfloat* params);
-
-void GetUniformiv(GLuint program, GLint location, GLint* params);
-
-GLint GetUniformLocation(GLuint program, const char* name);
-
-void GetVertexAttribPointerv(GLuint index, GLenum pname, void** pointer);
-
-void Hint(GLenum target, GLenum mode) {
+void GLES2Implementation::Hint(GLenum target, GLenum mode) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glHint(" << GLES2Util::GetStringHintTarget(target) << ", " << GLES2Util::GetStringHintMode(mode) << ")");  // NOLINT
   helper_->Hint(target, mode);
 }
 
-GLboolean IsBuffer(GLuint buffer) {
+GLboolean GLES2Implementation::IsBuffer(GLuint buffer) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glIsBuffer(" << buffer << ")");
   typedef IsBuffer::Result Result;
@@ -813,9 +762,7 @@ GLboolean IsBuffer(GLuint buffer) {
   return *result;
 }
 
-GLboolean IsEnabled(GLenum cap);
-
-GLboolean IsFramebuffer(GLuint framebuffer) {
+GLboolean GLES2Implementation::IsFramebuffer(GLuint framebuffer) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glIsFramebuffer(" << framebuffer << ")");  // NOLINT
   typedef IsFramebuffer::Result Result;
@@ -830,7 +777,7 @@ GLboolean IsFramebuffer(GLuint framebuffer) {
   return *result;
 }
 
-GLboolean IsProgram(GLuint program) {
+GLboolean GLES2Implementation::IsProgram(GLuint program) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glIsProgram(" << program << ")");
   typedef IsProgram::Result Result;
@@ -845,7 +792,7 @@ GLboolean IsProgram(GLuint program) {
   return *result;
 }
 
-GLboolean IsRenderbuffer(GLuint renderbuffer) {
+GLboolean GLES2Implementation::IsRenderbuffer(GLuint renderbuffer) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glIsRenderbuffer(" << renderbuffer << ")");  // NOLINT
   typedef IsRenderbuffer::Result Result;
@@ -861,7 +808,7 @@ GLboolean IsRenderbuffer(GLuint renderbuffer) {
   return *result;
 }
 
-GLboolean IsShader(GLuint shader) {
+GLboolean GLES2Implementation::IsShader(GLuint shader) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glIsShader(" << shader << ")");
   typedef IsShader::Result Result;
@@ -876,7 +823,7 @@ GLboolean IsShader(GLuint shader) {
   return *result;
 }
 
-GLboolean IsTexture(GLuint texture) {
+GLboolean GLES2Implementation::IsTexture(GLuint texture) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glIsTexture(" << texture << ")");
   typedef IsTexture::Result Result;
@@ -891,33 +838,25 @@ GLboolean IsTexture(GLuint texture) {
   return *result;
 }
 
-void LineWidth(GLfloat width) {
+void GLES2Implementation::LineWidth(GLfloat width) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glLineWidth(" << width << ")");
   helper_->LineWidth(width);
 }
 
-void LinkProgram(GLuint program);
-
-void PixelStorei(GLenum pname, GLint param);
-
-void PolygonOffset(GLfloat factor, GLfloat units) {
+void GLES2Implementation::PolygonOffset(GLfloat factor, GLfloat units) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glPolygonOffset(" << factor << ", " << units << ")");  // NOLINT
   helper_->PolygonOffset(factor, units);
 }
 
-void ReadPixels(
-    GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type,
-    void* pixels);
-
-void ReleaseShaderCompiler() {
+void GLES2Implementation::ReleaseShaderCompiler() {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glReleaseShaderCompiler(" << ")");
   helper_->ReleaseShaderCompiler();
 }
 
-void RenderbufferStorage(
+void GLES2Implementation::RenderbufferStorage(
     GLenum target, GLenum internalformat, GLsizei width, GLsizei height) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glRenderbufferStorage(" << GLES2Util::GetStringRenderBufferTarget(target) << ", " << GLES2Util::GetStringRenderBufferFormat(internalformat) << ", " << width << ", " << height << ")");  // NOLINT
@@ -932,13 +871,14 @@ void RenderbufferStorage(
   helper_->RenderbufferStorage(target, internalformat, width, height);
 }
 
-void SampleCoverage(GLclampf value, GLboolean invert) {
+void GLES2Implementation::SampleCoverage(GLclampf value, GLboolean invert) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glSampleCoverage(" << value << ", " << GLES2Util::GetStringBool(invert) << ")");  // NOLINT
   helper_->SampleCoverage(value, invert);
 }
 
-void Scissor(GLint x, GLint y, GLsizei width, GLsizei height) {
+void GLES2Implementation::Scissor(
+    GLint x, GLint y, GLsizei width, GLsizei height) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glScissor(" << x << ", " << y << ", " << width << ", " << height << ")");  // NOLINT
   if (width < 0) {
@@ -952,91 +892,82 @@ void Scissor(GLint x, GLint y, GLsizei width, GLsizei height) {
   helper_->Scissor(x, y, width, height);
 }
 
-void ShaderBinary(
-    GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary,
-    GLsizei length);
-
-void ShaderSource(
-    GLuint shader, GLsizei count, const char** str, const GLint* length);
-
-void StencilFunc(GLenum func, GLint ref, GLuint mask) {
+void GLES2Implementation::StencilFunc(GLenum func, GLint ref, GLuint mask) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glStencilFunc(" << GLES2Util::GetStringCmpFunction(func) << ", " << ref << ", " << mask << ")");  // NOLINT
   helper_->StencilFunc(func, ref, mask);
 }
 
-void StencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask) {
+void GLES2Implementation::StencilFuncSeparate(
+    GLenum face, GLenum func, GLint ref, GLuint mask) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glStencilFuncSeparate(" << GLES2Util::GetStringFaceType(face) << ", " << GLES2Util::GetStringCmpFunction(func) << ", " << ref << ", " << mask << ")");  // NOLINT
   helper_->StencilFuncSeparate(face, func, ref, mask);
 }
 
-void StencilMask(GLuint mask) {
+void GLES2Implementation::StencilMask(GLuint mask) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glStencilMask(" << mask << ")");
   helper_->StencilMask(mask);
 }
 
-void StencilMaskSeparate(GLenum face, GLuint mask) {
+void GLES2Implementation::StencilMaskSeparate(GLenum face, GLuint mask) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glStencilMaskSeparate(" << GLES2Util::GetStringFaceType(face) << ", " << mask << ")");  // NOLINT
   helper_->StencilMaskSeparate(face, mask);
 }
 
-void StencilOp(GLenum fail, GLenum zfail, GLenum zpass) {
+void GLES2Implementation::StencilOp(GLenum fail, GLenum zfail, GLenum zpass) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glStencilOp(" << GLES2Util::GetStringStencilOp(fail) << ", " << GLES2Util::GetStringStencilOp(zfail) << ", " << GLES2Util::GetStringStencilOp(zpass) << ")");  // NOLINT
   helper_->StencilOp(fail, zfail, zpass);
 }
 
-void StencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass) {
+void GLES2Implementation::StencilOpSeparate(
+    GLenum face, GLenum fail, GLenum zfail, GLenum zpass) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glStencilOpSeparate(" << GLES2Util::GetStringFaceType(face) << ", " << GLES2Util::GetStringStencilOp(fail) << ", " << GLES2Util::GetStringStencilOp(zfail) << ", " << GLES2Util::GetStringStencilOp(zpass) << ")");  // NOLINT
   helper_->StencilOpSeparate(face, fail, zfail, zpass);
 }
 
-void TexImage2D(
-    GLenum target, GLint level, GLint internalformat, GLsizei width,
-    GLsizei height, GLint border, GLenum format, GLenum type,
-    const void* pixels);
-
-void TexParameterf(GLenum target, GLenum pname, GLfloat param) {
+void GLES2Implementation::TexParameterf(
+    GLenum target, GLenum pname, GLfloat param) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glTexParameterf(" << GLES2Util::GetStringTextureBindTarget(target) << ", " << GLES2Util::GetStringTextureParameter(pname) << ", " << param << ")");  // NOLINT
   helper_->TexParameterf(target, pname, param);
 }
 
-void TexParameterfv(GLenum target, GLenum pname, const GLfloat* params) {
+void GLES2Implementation::TexParameterfv(
+    GLenum target, GLenum pname, const GLfloat* params) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glTexParameterfv(" << GLES2Util::GetStringTextureBindTarget(target) << ", " << GLES2Util::GetStringTextureParameter(pname) << ", " << static_cast<const void*>(params) << ")");  // NOLINT
   GPU_CLIENT_LOG("values: " << params[0]);
   helper_->TexParameterfvImmediate(target, pname, params);
 }
 
-void TexParameteri(GLenum target, GLenum pname, GLint param) {
+void GLES2Implementation::TexParameteri(
+    GLenum target, GLenum pname, GLint param) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glTexParameteri(" << GLES2Util::GetStringTextureBindTarget(target) << ", " << GLES2Util::GetStringTextureParameter(pname) << ", " << param << ")");  // NOLINT
   helper_->TexParameteri(target, pname, param);
 }
 
-void TexParameteriv(GLenum target, GLenum pname, const GLint* params) {
+void GLES2Implementation::TexParameteriv(
+    GLenum target, GLenum pname, const GLint* params) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glTexParameteriv(" << GLES2Util::GetStringTextureBindTarget(target) << ", " << GLES2Util::GetStringTextureParameter(pname) << ", " << static_cast<const void*>(params) << ")");  // NOLINT
   GPU_CLIENT_LOG("values: " << params[0]);
   helper_->TexParameterivImmediate(target, pname, params);
 }
 
-void TexSubImage2D(
-    GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
-    GLsizei height, GLenum format, GLenum type, const void* pixels);
-
-void Uniform1f(GLint location, GLfloat x) {
+void GLES2Implementation::Uniform1f(GLint location, GLfloat x) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glUniform1f(" << location << ", " << x << ")");  // NOLINT
   helper_->Uniform1f(location, x);
 }
 
-void Uniform1fv(GLint location, GLsizei count, const GLfloat* v) {
+void GLES2Implementation::Uniform1fv(
+    GLint location, GLsizei count, const GLfloat* v) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glUniform1fv(" << location << ", " << count << ", " << static_cast<const void*>(v) << ")");  // NOLINT
   GPU_CLIENT_LOG_CODE_BLOCK({
@@ -1051,13 +982,14 @@ void Uniform1fv(GLint location, GLsizei count, const GLfloat* v) {
   helper_->Uniform1fvImmediate(location, count, v);
 }
 
-void Uniform1i(GLint location, GLint x) {
+void GLES2Implementation::Uniform1i(GLint location, GLint x) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glUniform1i(" << location << ", " << x << ")");  // NOLINT
   helper_->Uniform1i(location, x);
 }
 
-void Uniform1iv(GLint location, GLsizei count, const GLint* v) {
+void GLES2Implementation::Uniform1iv(
+    GLint location, GLsizei count, const GLint* v) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glUniform1iv(" << location << ", " << count << ", " << static_cast<const void*>(v) << ")");  // NOLINT
   GPU_CLIENT_LOG_CODE_BLOCK({
@@ -1072,13 +1004,14 @@ void Uniform1iv(GLint location, GLsizei count, const GLint* v) {
   helper_->Uniform1ivImmediate(location, count, v);
 }
 
-void Uniform2f(GLint location, GLfloat x, GLfloat y) {
+void GLES2Implementation::Uniform2f(GLint location, GLfloat x, GLfloat y) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glUniform2f(" << location << ", " << x << ", " << y << ")");  // NOLINT
   helper_->Uniform2f(location, x, y);
 }
 
-void Uniform2fv(GLint location, GLsizei count, const GLfloat* v) {
+void GLES2Implementation::Uniform2fv(
+    GLint location, GLsizei count, const GLfloat* v) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glUniform2fv(" << location << ", " << count << ", " << static_cast<const void*>(v) << ")");  // NOLINT
   GPU_CLIENT_LOG_CODE_BLOCK({
@@ -1093,13 +1026,14 @@ void Uniform2fv(GLint location, GLsizei count, const GLfloat* v) {
   helper_->Uniform2fvImmediate(location, count, v);
 }
 
-void Uniform2i(GLint location, GLint x, GLint y) {
+void GLES2Implementation::Uniform2i(GLint location, GLint x, GLint y) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glUniform2i(" << location << ", " << x << ", " << y << ")");  // NOLINT
   helper_->Uniform2i(location, x, y);
 }
 
-void Uniform2iv(GLint location, GLsizei count, const GLint* v) {
+void GLES2Implementation::Uniform2iv(
+    GLint location, GLsizei count, const GLint* v) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glUniform2iv(" << location << ", " << count << ", " << static_cast<const void*>(v) << ")");  // NOLINT
   GPU_CLIENT_LOG_CODE_BLOCK({
@@ -1114,13 +1048,15 @@ void Uniform2iv(GLint location, GLsizei count, const GLint* v) {
   helper_->Uniform2ivImmediate(location, count, v);
 }
 
-void Uniform3f(GLint location, GLfloat x, GLfloat y, GLfloat z) {
+void GLES2Implementation::Uniform3f(
+    GLint location, GLfloat x, GLfloat y, GLfloat z) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glUniform3f(" << location << ", " << x << ", " << y << ", " << z << ")");  // NOLINT
   helper_->Uniform3f(location, x, y, z);
 }
 
-void Uniform3fv(GLint location, GLsizei count, const GLfloat* v) {
+void GLES2Implementation::Uniform3fv(
+    GLint location, GLsizei count, const GLfloat* v) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glUniform3fv(" << location << ", " << count << ", " << static_cast<const void*>(v) << ")");  // NOLINT
   GPU_CLIENT_LOG_CODE_BLOCK({
@@ -1135,13 +1071,15 @@ void Uniform3fv(GLint location, GLsizei count, const GLfloat* v) {
   helper_->Uniform3fvImmediate(location, count, v);
 }
 
-void Uniform3i(GLint location, GLint x, GLint y, GLint z) {
+void GLES2Implementation::Uniform3i(
+    GLint location, GLint x, GLint y, GLint z) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glUniform3i(" << location << ", " << x << ", " << y << ", " << z << ")");  // NOLINT
   helper_->Uniform3i(location, x, y, z);
 }
 
-void Uniform3iv(GLint location, GLsizei count, const GLint* v) {
+void GLES2Implementation::Uniform3iv(
+    GLint location, GLsizei count, const GLint* v) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glUniform3iv(" << location << ", " << count << ", " << static_cast<const void*>(v) << ")");  // NOLINT
   GPU_CLIENT_LOG_CODE_BLOCK({
@@ -1156,13 +1094,15 @@ void Uniform3iv(GLint location, GLsizei count, const GLint* v) {
   helper_->Uniform3ivImmediate(location, count, v);
 }
 
-void Uniform4f(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w) {
+void GLES2Implementation::Uniform4f(
+    GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glUniform4f(" << location << ", " << x << ", " << y << ", " << z << ", " << w << ")");  // NOLINT
   helper_->Uniform4f(location, x, y, z, w);
 }
 
-void Uniform4fv(GLint location, GLsizei count, const GLfloat* v) {
+void GLES2Implementation::Uniform4fv(
+    GLint location, GLsizei count, const GLfloat* v) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glUniform4fv(" << location << ", " << count << ", " << static_cast<const void*>(v) << ")");  // NOLINT
   GPU_CLIENT_LOG_CODE_BLOCK({
@@ -1177,13 +1117,15 @@ void Uniform4fv(GLint location, GLsizei count, const GLfloat* v) {
   helper_->Uniform4fvImmediate(location, count, v);
 }
 
-void Uniform4i(GLint location, GLint x, GLint y, GLint z, GLint w) {
+void GLES2Implementation::Uniform4i(
+    GLint location, GLint x, GLint y, GLint z, GLint w) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glUniform4i(" << location << ", " << x << ", " << y << ", " << z << ", " << w << ")");  // NOLINT
   helper_->Uniform4i(location, x, y, z, w);
 }
 
-void Uniform4iv(GLint location, GLsizei count, const GLint* v) {
+void GLES2Implementation::Uniform4iv(
+    GLint location, GLsizei count, const GLint* v) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glUniform4iv(" << location << ", " << count << ", " << static_cast<const void*>(v) << ")");  // NOLINT
   GPU_CLIENT_LOG_CODE_BLOCK({
@@ -1198,7 +1140,7 @@ void Uniform4iv(GLint location, GLsizei count, const GLint* v) {
   helper_->Uniform4ivImmediate(location, count, v);
 }
 
-void UniformMatrix2fv(
+void GLES2Implementation::UniformMatrix2fv(
     GLint location, GLsizei count, GLboolean transpose, const GLfloat* value) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glUniformMatrix2fv(" << location << ", " << count << ", " << GLES2Util::GetStringBool(transpose) << ", " << static_cast<const void*>(value) << ")");  // NOLINT
@@ -1214,7 +1156,7 @@ void UniformMatrix2fv(
   helper_->UniformMatrix2fvImmediate(location, count, transpose, value);
 }
 
-void UniformMatrix3fv(
+void GLES2Implementation::UniformMatrix3fv(
     GLint location, GLsizei count, GLboolean transpose, const GLfloat* value) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glUniformMatrix3fv(" << location << ", " << count << ", " << GLES2Util::GetStringBool(transpose) << ", " << static_cast<const void*>(value) << ")");  // NOLINT
@@ -1230,7 +1172,7 @@ void UniformMatrix3fv(
   helper_->UniformMatrix3fvImmediate(location, count, transpose, value);
 }
 
-void UniformMatrix4fv(
+void GLES2Implementation::UniformMatrix4fv(
     GLint location, GLsizei count, GLboolean transpose, const GLfloat* value) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glUniformMatrix4fv(" << location << ", " << count << ", " << GLES2Util::GetStringBool(transpose) << ", " << static_cast<const void*>(value) << ")");  // NOLINT
@@ -1246,75 +1188,74 @@ void UniformMatrix4fv(
   helper_->UniformMatrix4fvImmediate(location, count, transpose, value);
 }
 
-void UseProgram(GLuint program) {
+void GLES2Implementation::UseProgram(GLuint program) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glUseProgram(" << program << ")");
   helper_->UseProgram(program);
 }
 
-void ValidateProgram(GLuint program) {
+void GLES2Implementation::ValidateProgram(GLuint program) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glValidateProgram(" << program << ")");  // NOLINT
   helper_->ValidateProgram(program);
 }
 
-void VertexAttrib1f(GLuint indx, GLfloat x) {
+void GLES2Implementation::VertexAttrib1f(GLuint indx, GLfloat x) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glVertexAttrib1f(" << indx << ", " << x << ")");  // NOLINT
   helper_->VertexAttrib1f(indx, x);
 }
 
-void VertexAttrib1fv(GLuint indx, const GLfloat* values) {
+void GLES2Implementation::VertexAttrib1fv(GLuint indx, const GLfloat* values) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glVertexAttrib1fv(" << indx << ", " << static_cast<const void*>(values) << ")");  // NOLINT
   GPU_CLIENT_LOG("values: " << values[0]);
   helper_->VertexAttrib1fvImmediate(indx, values);
 }
 
-void VertexAttrib2f(GLuint indx, GLfloat x, GLfloat y) {
+void GLES2Implementation::VertexAttrib2f(GLuint indx, GLfloat x, GLfloat y) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glVertexAttrib2f(" << indx << ", " << x << ", " << y << ")");  // NOLINT
   helper_->VertexAttrib2f(indx, x, y);
 }
 
-void VertexAttrib2fv(GLuint indx, const GLfloat* values) {
+void GLES2Implementation::VertexAttrib2fv(GLuint indx, const GLfloat* values) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glVertexAttrib2fv(" << indx << ", " << static_cast<const void*>(values) << ")");  // NOLINT
   GPU_CLIENT_LOG("values: " << values[0] << ", " << values[1]);
   helper_->VertexAttrib2fvImmediate(indx, values);
 }
 
-void VertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z) {
+void GLES2Implementation::VertexAttrib3f(
+    GLuint indx, GLfloat x, GLfloat y, GLfloat z) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glVertexAttrib3f(" << indx << ", " << x << ", " << y << ", " << z << ")");  // NOLINT
   helper_->VertexAttrib3f(indx, x, y, z);
 }
 
-void VertexAttrib3fv(GLuint indx, const GLfloat* values) {
+void GLES2Implementation::VertexAttrib3fv(GLuint indx, const GLfloat* values) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glVertexAttrib3fv(" << indx << ", " << static_cast<const void*>(values) << ")");  // NOLINT
   GPU_CLIENT_LOG("values: " << values[0] << ", " << values[1] << ", " << values[2]);  // NOLINT
   helper_->VertexAttrib3fvImmediate(indx, values);
 }
 
-void VertexAttrib4f(GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w) {
+void GLES2Implementation::VertexAttrib4f(
+    GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glVertexAttrib4f(" << indx << ", " << x << ", " << y << ", " << z << ", " << w << ")");  // NOLINT
   helper_->VertexAttrib4f(indx, x, y, z, w);
 }
 
-void VertexAttrib4fv(GLuint indx, const GLfloat* values) {
+void GLES2Implementation::VertexAttrib4fv(GLuint indx, const GLfloat* values) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glVertexAttrib4fv(" << indx << ", " << static_cast<const void*>(values) << ")");  // NOLINT
   GPU_CLIENT_LOG("values: " << values[0] << ", " << values[1] << ", " << values[2] << ", " << values[3]);  // NOLINT
   helper_->VertexAttrib4fvImmediate(indx, values);
 }
 
-void VertexAttribPointer(
-    GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride,
-    const void* ptr);
-
-void Viewport(GLint x, GLint y, GLsizei width, GLsizei height) {
+void GLES2Implementation::Viewport(
+    GLint x, GLint y, GLsizei width, GLsizei height) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glViewport(" << x << ", " << y << ", " << width << ", " << height << ")");  // NOLINT
   if (width < 0) {
@@ -1328,7 +1269,7 @@ void Viewport(GLint x, GLint y, GLsizei width, GLsizei height) {
   helper_->Viewport(x, y, width, height);
 }
 
-void BlitFramebufferEXT(
+void GLES2Implementation::BlitFramebufferEXT(
     GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0,
     GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
@@ -1337,7 +1278,7 @@ void BlitFramebufferEXT(
       srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
 
-void RenderbufferStorageMultisampleEXT(
+void GLES2Implementation::RenderbufferStorageMultisampleEXT(
     GLenum target, GLsizei samples, GLenum internalformat, GLsizei width,
     GLsizei height) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
@@ -1361,7 +1302,7 @@ void RenderbufferStorageMultisampleEXT(
       target, samples, internalformat, width, height);
 }
 
-void TexStorage2DEXT(
+void GLES2Implementation::TexStorage2DEXT(
     GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width,
     GLsizei height) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
@@ -1381,7 +1322,7 @@ void TexStorage2DEXT(
   helper_->TexStorage2DEXT(target, levels, internalFormat, width, height);
 }
 
-void GenQueriesEXT(GLsizei n, GLuint* queries) {
+void GLES2Implementation::GenQueriesEXT(GLsizei n, GLuint* queries) {
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGenQueriesEXT(" << n << ", " << static_cast<const void*>(queries) << ")");  // NOLINT
   if (n < 0) {
     SetGLError(GL_INVALID_VALUE, "glGenQueriesEXT", "n < 0");
@@ -1398,7 +1339,7 @@ void GenQueriesEXT(GLsizei n, GLuint* queries) {
   });
 }
 
-void DeleteQueriesEXT(GLsizei n, const GLuint* queries) {
+void GLES2Implementation::DeleteQueriesEXT(GLsizei n, const GLuint* queries) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDeleteQueriesEXT(" << n << ", " << static_cast<const void*>(queries) << ")");  // NOLINT
   GPU_CLIENT_LOG_CODE_BLOCK({
@@ -1418,23 +1359,7 @@ void DeleteQueriesEXT(GLsizei n, const GLuint* queries) {
   DeleteQueriesEXTHelper(n, queries);
 }
 
-GLboolean IsQueryEXT(GLuint id);
-
-void BeginQueryEXT(GLenum target, GLuint id);
-
-void EndQueryEXT(GLenum target);
-
-void GetQueryivEXT(GLenum target, GLenum pname, GLint* params);
-
-void GetQueryObjectuivEXT(GLuint id, GLenum pname, GLuint* params);
-
-void InsertEventMarkerEXT(GLsizei length, const GLchar* marker);
-
-void PushGroupMarkerEXT(GLsizei length, const GLchar* marker);
-
-void PopGroupMarkerEXT();
-
-void GenVertexArraysOES(GLsizei n, GLuint* arrays) {
+void GLES2Implementation::GenVertexArraysOES(GLsizei n, GLuint* arrays) {
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGenVertexArraysOES(" << n << ", " << static_cast<const void*>(arrays) << ")");  // NOLINT
   if (n < 0) {
     SetGLError(GL_INVALID_VALUE, "glGenVertexArraysOES", "n < 0");
@@ -1451,7 +1376,8 @@ void GenVertexArraysOES(GLsizei n, GLuint* arrays) {
   });
 }
 
-void DeleteVertexArraysOES(GLsizei n, const GLuint* arrays) {
+void GLES2Implementation::DeleteVertexArraysOES(
+    GLsizei n, const GLuint* arrays) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDeleteVertexArraysOES(" << n << ", " << static_cast<const void*>(arrays) << ")");  // NOLINT
   GPU_CLIENT_LOG_CODE_BLOCK({
@@ -1471,7 +1397,7 @@ void DeleteVertexArraysOES(GLsizei n, const GLuint* arrays) {
   DeleteVertexArraysOESHelper(n, arrays);
 }
 
-GLboolean IsVertexArrayOES(GLuint array) {
+GLboolean GLES2Implementation::IsVertexArrayOES(GLuint array) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glIsVertexArrayOES(" << array << ")");  // NOLINT
   typedef IsVertexArrayOES::Result Result;
@@ -1486,7 +1412,7 @@ GLboolean IsVertexArrayOES(GLuint array) {
   return *result;
 }
 
-void BindVertexArrayOES(GLuint array) {
+void GLES2Implementation::BindVertexArrayOES(GLuint array) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glBindVertexArrayOES(" << array << ")");  // NOLINT
   if (IsVertexArrayReservedId(array)) {
@@ -1498,52 +1424,7 @@ void BindVertexArrayOES(GLuint array) {
   helper_->BindVertexArrayOES(array);
 }
 
-void SwapBuffers();
-
-GLuint GetMaxValueInBufferCHROMIUM(
-    GLuint buffer_id, GLsizei count, GLenum type, GLuint offset);
-
-void GenSharedIdsCHROMIUM(
-    GLuint namespace_id, GLuint id_offset, GLsizei n, GLuint* ids);
-
-void DeleteSharedIdsCHROMIUM(
-    GLuint namespace_id, GLsizei n, const GLuint* ids);
-
-void RegisterSharedIdsCHROMIUM(
-    GLuint namespace_id, GLsizei n, const GLuint* ids);
-
-GLboolean EnableFeatureCHROMIUM(const char* feature);
-
-void* MapBufferSubDataCHROMIUM(
-    GLuint target, GLintptr offset, GLsizeiptr size, GLenum access);
-
-void UnmapBufferSubDataCHROMIUM(const void* mem);
-
-void* MapTexSubImage2DCHROMIUM(
-    GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
-    GLsizei height, GLenum format, GLenum type, GLenum access);
-
-void UnmapTexSubImage2DCHROMIUM(const void* mem);
-
-void ResizeCHROMIUM(GLuint width, GLuint height);
-
-const GLchar* GetRequestableExtensionsCHROMIUM();
-
-void RequestExtensionCHROMIUM(const char* extension);
-
-void RateLimitOffscreenContextCHROMIUM();
-
-void GetMultipleIntegervCHROMIUM(
-    const GLenum* pnames, GLuint count, GLint* results, GLsizeiptr size);
-
-void GetProgramInfoCHROMIUM(
-    GLuint program, GLsizei bufsize, GLsizei* size, void* info);
-
-GLuint CreateStreamTextureCHROMIUM(GLuint texture);
-
-void DestroyStreamTextureCHROMIUM(GLuint texture);
-
-void GetTranslatedShaderSourceANGLE(
+void GLES2Implementation::GetTranslatedShaderSourceANGLE(
     GLuint shader, GLsizei bufsize, GLsizei* length, char* source) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_VALIDATE_DESTINATION_OPTIONAL_INITALIZATION(GLsizei, length);
@@ -1570,9 +1451,7 @@ void GetTranslatedShaderSourceANGLE(
     *length = max_size;
   }
 }
-void PostSubBufferCHROMIUM(GLint x, GLint y, GLint width, GLint height);
-
-void TexImageIOSurface2DCHROMIUM(
+void GLES2Implementation::TexImageIOSurface2DCHROMIUM(
     GLenum target, GLsizei width, GLsizei height, GLuint ioSurfaceId,
     GLuint plane) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
@@ -1590,7 +1469,7 @@ void TexImageIOSurface2DCHROMIUM(
       target, width, height, ioSurfaceId, plane);
 }
 
-void CopyTextureCHROMIUM(
+void GLES2Implementation::CopyTextureCHROMIUM(
     GLenum target, GLenum source_id, GLenum dest_id, GLint level,
     GLint internalformat) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
@@ -1599,33 +1478,21 @@ void CopyTextureCHROMIUM(
       target, source_id, dest_id, level, internalformat);
 }
 
-void DrawArraysInstancedANGLE(
-    GLenum mode, GLint first, GLsizei count, GLsizei primcount);
-
-void DrawElementsInstancedANGLE(
-    GLenum mode, GLsizei count, GLenum type, const void* indices,
-    GLsizei primcount);
-
-void VertexAttribDivisorANGLE(GLuint index, GLuint divisor);
-
-void GenMailboxCHROMIUM(GLbyte* mailbox);
-
-void ProduceTextureCHROMIUM(GLenum target, const GLbyte* mailbox) {
+void GLES2Implementation::ProduceTextureCHROMIUM(
+    GLenum target, const GLbyte* mailbox) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glProduceTextureCHROMIUM(" << GLES2Util::GetStringTextureTarget(target) << ", " << static_cast<const void*>(mailbox) << ")");  // NOLINT
   GPU_CLIENT_LOG("values: " << mailbox[0] << ", " << mailbox[1] << ", " << mailbox[2] << ", " << mailbox[3] << ", " << mailbox[4] << ", " << mailbox[5] << ", " << mailbox[6] << ", " << mailbox[7] << ", " << mailbox[8] << ", " << mailbox[9] << ", " << mailbox[10] << ", " << mailbox[11] << ", " << mailbox[12] << ", " << mailbox[13] << ", " << mailbox[14] << ", " << mailbox[15] << ", " << mailbox[16] << ", " << mailbox[17] << ", " << mailbox[18] << ", " << mailbox[19] << ", " << mailbox[20] << ", " << mailbox[21] << ", " << mailbox[22] << ", " << mailbox[23] << ", " << mailbox[24] << ", " << mailbox[25] << ", " << mailbox[26] << ", " << mailbox[27] << ", " << mailbox[28] << ", " << mailbox[29] << ", " << mailbox[30] << ", " << mailbox[31] << ", " << mailbox[32] << ", " << mailbox[33] << ", " << mailbox[34] << ", " << mailbox[35] << ", " << mailbox[36] << ", " << mailbox[37] << ", " << mailbox[38] << ", " << mailbox[39] << ", " << mailbox[40] << ", " << mailbox[41] << ", " << mailbox[42] << ", " << mailbox[43] << ", " << mailbox[44] << ", " << mailbox[45] << ", " << mailbox[46] << ", " << mailbox[47] << ", " << mailbox[48] << ", " << mailbox[49] << ", " << mailbox[50] << ", " << mailbox[51] << ", " << mailbox[52] << ", " << mailbox[53] << ", " << mailbox[54] << ", " << mailbox[55] << ", " << mailbox[56] << ", " << mailbox[57] << ", " << mailbox[58] << ", " << mailbox[59] << ", " << mailbox[60] << ", " << mailbox[61] << ", " << mailbox[62] << ", " << mailbox[63]);  // NOLINT
   helper_->ProduceTextureCHROMIUMImmediate(target, mailbox);
 }
 
-void ConsumeTextureCHROMIUM(GLenum target, const GLbyte* mailbox) {
+void GLES2Implementation::ConsumeTextureCHROMIUM(
+    GLenum target, const GLbyte* mailbox) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glConsumeTextureCHROMIUM(" << GLES2Util::GetStringTextureTarget(target) << ", " << static_cast<const void*>(mailbox) << ")");  // NOLINT
   GPU_CLIENT_LOG("values: " << mailbox[0] << ", " << mailbox[1] << ", " << mailbox[2] << ", " << mailbox[3] << ", " << mailbox[4] << ", " << mailbox[5] << ", " << mailbox[6] << ", " << mailbox[7] << ", " << mailbox[8] << ", " << mailbox[9] << ", " << mailbox[10] << ", " << mailbox[11] << ", " << mailbox[12] << ", " << mailbox[13] << ", " << mailbox[14] << ", " << mailbox[15] << ", " << mailbox[16] << ", " << mailbox[17] << ", " << mailbox[18] << ", " << mailbox[19] << ", " << mailbox[20] << ", " << mailbox[21] << ", " << mailbox[22] << ", " << mailbox[23] << ", " << mailbox[24] << ", " << mailbox[25] << ", " << mailbox[26] << ", " << mailbox[27] << ", " << mailbox[28] << ", " << mailbox[29] << ", " << mailbox[30] << ", " << mailbox[31] << ", " << mailbox[32] << ", " << mailbox[33] << ", " << mailbox[34] << ", " << mailbox[35] << ", " << mailbox[36] << ", " << mailbox[37] << ", " << mailbox[38] << ", " << mailbox[39] << ", " << mailbox[40] << ", " << mailbox[41] << ", " << mailbox[42] << ", " << mailbox[43] << ", " << mailbox[44] << ", " << mailbox[45] << ", " << mailbox[46] << ", " << mailbox[47] << ", " << mailbox[48] << ", " << mailbox[49] << ", " << mailbox[50] << ", " << mailbox[51] << ", " << mailbox[52] << ", " << mailbox[53] << ", " << mailbox[54] << ", " << mailbox[55] << ", " << mailbox[56] << ", " << mailbox[57] << ", " << mailbox[58] << ", " << mailbox[59] << ", " << mailbox[60] << ", " << mailbox[61] << ", " << mailbox[62] << ", " << mailbox[63]);  // NOLINT
   helper_->ConsumeTextureCHROMIUMImmediate(target, mailbox);
 }
 
-void BindUniformLocationCHROMIUM(
-    GLuint program, GLint location, const char* name);
-
-#endif  // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_AUTOGEN_H_
+#endif  // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_IMPL_AUTOGEN_H_