Refactor/Rename a bunch of GPU stuff

gpu/command_buffer/service/gles2_cmd_decoder_autogen.h

Index: gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
index 5c41cc35550e56e1500fc80765732f930b52f0d0..2263a7fc445524b863709cecb01021569c7aedd5 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
@@ -11,14 +11,14 @@
 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_AUTOGEN_H_
 
 error::Error GLES2DecoderImpl::HandleActiveTexture(
-    uint32 immediate_data_size, const gles2::ActiveTexture& c) {
+    uint32 immediate_data_size, const gles2::cmds::ActiveTexture& c) {
   GLenum texture = static_cast<GLenum>(c.texture);
   DoActiveTexture(texture);
   return error::kNoError;
 }
 
 error::Error GLES2DecoderImpl::HandleAttachShader(
-    uint32 immediate_data_size, const gles2::AttachShader& c) {
+    uint32 immediate_data_size, const gles2::cmds::AttachShader& c) {
   GLuint program = c.program;
   GLuint shader = c.shader;
   DoAttachShader(program, shader);
@@ -26,7 +26,7 @@ error::Error GLES2DecoderImpl::HandleAttachShader(
 }
 
 error::Error GLES2DecoderImpl::HandleBindBuffer(
-    uint32 immediate_data_size, const gles2::BindBuffer& c) {
+    uint32 immediate_data_size, const gles2::cmds::BindBuffer& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLuint buffer = c.buffer;
   if (!validators_->buffer_target.IsValid(target)) {
@@ -38,7 +38,7 @@ error::Error GLES2DecoderImpl::HandleBindBuffer(
 }
 
 error::Error GLES2DecoderImpl::HandleBindFramebuffer(
-    uint32 immediate_data_size, const gles2::BindFramebuffer& c) {
+    uint32 immediate_data_size, const gles2::cmds::BindFramebuffer& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLuint framebuffer = c.framebuffer;
   if (!validators_->frame_buffer_target.IsValid(target)) {
@@ -50,7 +50,7 @@ error::Error GLES2DecoderImpl::HandleBindFramebuffer(
 }
 
 error::Error GLES2DecoderImpl::HandleBindRenderbuffer(
-    uint32 immediate_data_size, const gles2::BindRenderbuffer& c) {
+    uint32 immediate_data_size, const gles2::cmds::BindRenderbuffer& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLuint renderbuffer = c.renderbuffer;
   if (!validators_->render_buffer_target.IsValid(target)) {
@@ -62,7 +62,7 @@ error::Error GLES2DecoderImpl::HandleBindRenderbuffer(
 }
 
 error::Error GLES2DecoderImpl::HandleBindTexture(
-    uint32 immediate_data_size, const gles2::BindTexture& c) {
+    uint32 immediate_data_size, const gles2::cmds::BindTexture& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLuint texture = c.texture;
   if (!validators_->texture_bind_target.IsValid(target)) {
@@ -74,7 +74,7 @@ error::Error GLES2DecoderImpl::HandleBindTexture(
 }
 
 error::Error GLES2DecoderImpl::HandleBlendColor(
-    uint32 immediate_data_size, const gles2::BlendColor& c) {
+    uint32 immediate_data_size, const gles2::cmds::BlendColor& c) {
   GLclampf red = static_cast<GLclampf>(c.red);
   GLclampf green = static_cast<GLclampf>(c.green);
   GLclampf blue = static_cast<GLclampf>(c.blue);
@@ -93,7 +93,7 @@ error::Error GLES2DecoderImpl::HandleBlendColor(
 }
 
 error::Error GLES2DecoderImpl::HandleBlendEquation(
-    uint32 immediate_data_size, const gles2::BlendEquation& c) {
+    uint32 immediate_data_size, const gles2::cmds::BlendEquation& c) {
   GLenum mode = static_cast<GLenum>(c.mode);
   if (!validators_->equation.IsValid(mode)) {
     SetGLErrorInvalidEnum("glBlendEquation", mode, "mode");
@@ -109,7 +109,7 @@ error::Error GLES2DecoderImpl::HandleBlendEquation(
 }
 
 error::Error GLES2DecoderImpl::HandleBlendEquationSeparate(
-    uint32 immediate_data_size, const gles2::BlendEquationSeparate& c) {
+    uint32 immediate_data_size, const gles2::cmds::BlendEquationSeparate& c) {
   GLenum modeRGB = static_cast<GLenum>(c.modeRGB);
   GLenum modeAlpha = static_cast<GLenum>(c.modeAlpha);
   if (!validators_->equation.IsValid(modeRGB)) {
@@ -130,7 +130,7 @@ error::Error GLES2DecoderImpl::HandleBlendEquationSeparate(
 }
 
 error::Error GLES2DecoderImpl::HandleBlendFunc(
-    uint32 immediate_data_size, const gles2::BlendFunc& c) {
+    uint32 immediate_data_size, const gles2::cmds::BlendFunc& c) {
   GLenum sfactor = static_cast<GLenum>(c.sfactor);
   GLenum dfactor = static_cast<GLenum>(c.dfactor);
   if (!validators_->src_blend_factor.IsValid(sfactor)) {
@@ -155,7 +155,7 @@ error::Error GLES2DecoderImpl::HandleBlendFunc(
 }
 
 error::Error GLES2DecoderImpl::HandleBlendFuncSeparate(
-    uint32 immediate_data_size, const gles2::BlendFuncSeparate& c) {
+    uint32 immediate_data_size, const gles2::cmds::BlendFuncSeparate& c) {
   GLenum srcRGB = static_cast<GLenum>(c.srcRGB);
   GLenum dstRGB = static_cast<GLenum>(c.dstRGB);
   GLenum srcAlpha = static_cast<GLenum>(c.srcAlpha);
@@ -190,7 +190,7 @@ error::Error GLES2DecoderImpl::HandleBlendFuncSeparate(
 }
 
 error::Error GLES2DecoderImpl::HandleBufferSubData(
-    uint32 immediate_data_size, const gles2::BufferSubData& c) {
+    uint32 immediate_data_size, const gles2::cmds::BufferSubData& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLintptr offset = static_cast<GLintptr>(c.offset);
   GLsizeiptr size = static_cast<GLsizeiptr>(c.size);
@@ -213,7 +213,7 @@ error::Error GLES2DecoderImpl::HandleBufferSubData(
 }
 
 error::Error GLES2DecoderImpl::HandleBufferSubDataImmediate(
-    uint32 immediate_data_size, const gles2::BufferSubDataImmediate& c) {
+    uint32 immediate_data_size, const gles2::cmds::BufferSubDataImmediate& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLintptr offset = static_cast<GLintptr>(c.offset);
   GLsizeiptr size = static_cast<GLsizeiptr>(c.size);
@@ -236,9 +236,9 @@ error::Error GLES2DecoderImpl::HandleBufferSubDataImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleCheckFramebufferStatus(
-    uint32 immediate_data_size, const gles2::CheckFramebufferStatus& c) {
+    uint32 immediate_data_size, const gles2::cmds::CheckFramebufferStatus& c) {
   GLenum target = static_cast<GLenum>(c.target);
-  typedef CheckFramebufferStatus::Result Result;
+  typedef cmds::CheckFramebufferStatus::Result Result;
   Result* result_dst = GetSharedMemoryAs<Result*>(
       c.result_shm_id, c.result_shm_offset, sizeof(*result_dst));
   if (!result_dst) {
@@ -253,7 +253,7 @@ error::Error GLES2DecoderImpl::HandleCheckFramebufferStatus(
 }
 
 error::Error GLES2DecoderImpl::HandleClear(
-    uint32 immediate_data_size, const gles2::Clear& c) {
+    uint32 immediate_data_size, const gles2::cmds::Clear& c) {
   if (ShouldDeferDraws())
     return error::kDeferCommandUntilLater;
   GLbitfield mask = static_cast<GLbitfield>(c.mask);
@@ -262,7 +262,7 @@ error::Error GLES2DecoderImpl::HandleClear(
 }
 
 error::Error GLES2DecoderImpl::HandleClearColor(
-    uint32 immediate_data_size, const gles2::ClearColor& c) {
+    uint32 immediate_data_size, const gles2::cmds::ClearColor& c) {
   GLclampf red = static_cast<GLclampf>(c.red);
   GLclampf green = static_cast<GLclampf>(c.green);
   GLclampf blue = static_cast<GLclampf>(c.blue);
@@ -281,7 +281,7 @@ error::Error GLES2DecoderImpl::HandleClearColor(
 }
 
 error::Error GLES2DecoderImpl::HandleClearDepthf(
-    uint32 immediate_data_size, const gles2::ClearDepthf& c) {
+    uint32 immediate_data_size, const gles2::cmds::ClearDepthf& c) {
   GLclampf depth = static_cast<GLclampf>(c.depth);
   if (state_.depth_clear != depth) {
     state_.depth_clear = depth;
@@ -291,7 +291,7 @@ error::Error GLES2DecoderImpl::HandleClearDepthf(
 }
 
 error::Error GLES2DecoderImpl::HandleClearStencil(
-    uint32 immediate_data_size, const gles2::ClearStencil& c) {
+    uint32 immediate_data_size, const gles2::cmds::ClearStencil& c) {
   GLint s = static_cast<GLint>(c.s);
   if (state_.stencil_clear != s) {
     state_.stencil_clear = s;
@@ -301,7 +301,7 @@ error::Error GLES2DecoderImpl::HandleClearStencil(
 }
 
 error::Error GLES2DecoderImpl::HandleColorMask(
-    uint32 immediate_data_size, const gles2::ColorMask& c) {
+    uint32 immediate_data_size, const gles2::cmds::ColorMask& c) {
   GLboolean red = static_cast<GLboolean>(c.red);
   GLboolean green = static_cast<GLboolean>(c.green);
   GLboolean blue = static_cast<GLboolean>(c.blue);
@@ -320,14 +320,15 @@ error::Error GLES2DecoderImpl::HandleColorMask(
 }
 
 error::Error GLES2DecoderImpl::HandleCompileShader(
-    uint32 immediate_data_size, const gles2::CompileShader& c) {
+    uint32 immediate_data_size, const gles2::cmds::CompileShader& c) {
   GLuint shader = c.shader;
   DoCompileShader(shader);
   return error::kNoError;
 }
 
 error::Error GLES2DecoderImpl::HandleCompressedTexSubImage2D(
-    uint32 immediate_data_size, const gles2::CompressedTexSubImage2D& c) {
+    uint32 immediate_data_size,
+    const gles2::cmds::CompressedTexSubImage2D& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLint level = static_cast<GLint>(c.level);
   GLint xoffset = static_cast<GLint>(c.xoffset);
@@ -369,7 +370,7 @@ error::Error GLES2DecoderImpl::HandleCompressedTexSubImage2D(
 
 error::Error GLES2DecoderImpl::HandleCompressedTexSubImage2DImmediate(
     uint32 immediate_data_size,
-    const gles2::CompressedTexSubImage2DImmediate& c) {
+    const gles2::cmds::CompressedTexSubImage2DImmediate& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLint level = static_cast<GLint>(c.level);
   GLint xoffset = static_cast<GLint>(c.xoffset);
@@ -410,7 +411,7 @@ error::Error GLES2DecoderImpl::HandleCompressedTexSubImage2DImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleCopyTexImage2D(
-    uint32 immediate_data_size, const gles2::CopyTexImage2D& c) {
+    uint32 immediate_data_size, const gles2::cmds::CopyTexImage2D& c) {
   if (ShouldDeferReads())
     return error::kDeferCommandUntilLater;
   GLenum target = static_cast<GLenum>(c.target);
@@ -448,7 +449,7 @@ error::Error GLES2DecoderImpl::HandleCopyTexImage2D(
 }
 
 error::Error GLES2DecoderImpl::HandleCopyTexSubImage2D(
-    uint32 immediate_data_size, const gles2::CopyTexSubImage2D& c) {
+    uint32 immediate_data_size, const gles2::cmds::CopyTexSubImage2D& c) {
   if (ShouldDeferReads())
     return error::kDeferCommandUntilLater;
   GLenum target = static_cast<GLenum>(c.target);
@@ -476,7 +477,7 @@ error::Error GLES2DecoderImpl::HandleCopyTexSubImage2D(
 }
 
 error::Error GLES2DecoderImpl::HandleCreateProgram(
-    uint32 immediate_data_size, const gles2::CreateProgram& c) {
+    uint32 immediate_data_size, const gles2::cmds::CreateProgram& c) {
   uint32 client_id = c.client_id;
   if (!CreateProgramHelper(client_id)) {
     return error::kInvalidArguments;
@@ -485,7 +486,7 @@ error::Error GLES2DecoderImpl::HandleCreateProgram(
 }
 
 error::Error GLES2DecoderImpl::HandleCreateShader(
-    uint32 immediate_data_size, const gles2::CreateShader& c) {
+    uint32 immediate_data_size, const gles2::cmds::CreateShader& c) {
   GLenum type = static_cast<GLenum>(c.type);
   if (!validators_->shader_type.IsValid(type)) {
     SetGLErrorInvalidEnum("glCreateShader", type, "type");
@@ -499,7 +500,7 @@ error::Error GLES2DecoderImpl::HandleCreateShader(
 }
 
 error::Error GLES2DecoderImpl::HandleCullFace(
-    uint32 immediate_data_size, const gles2::CullFace& c) {
+    uint32 immediate_data_size, const gles2::cmds::CullFace& c) {
   GLenum mode = static_cast<GLenum>(c.mode);
   if (!validators_->face_type.IsValid(mode)) {
     SetGLErrorInvalidEnum("glCullFace", mode, "mode");
@@ -513,7 +514,7 @@ error::Error GLES2DecoderImpl::HandleCullFace(
 }
 
 error::Error GLES2DecoderImpl::HandleDeleteBuffers(
-    uint32 immediate_data_size, const gles2::DeleteBuffers& c) {
+    uint32 immediate_data_size, const gles2::cmds::DeleteBuffers& c) {
   GLsizei n = static_cast<GLsizei>(c.n);
   uint32 data_size;
   if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
@@ -529,7 +530,7 @@ error::Error GLES2DecoderImpl::HandleDeleteBuffers(
 }
 
 error::Error GLES2DecoderImpl::HandleDeleteBuffersImmediate(
-    uint32 immediate_data_size, const gles2::DeleteBuffersImmediate& c) {
+    uint32 immediate_data_size, const gles2::cmds::DeleteBuffersImmediate& c) {
   GLsizei n = static_cast<GLsizei>(c.n);
   uint32 data_size;
   if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
@@ -545,7 +546,7 @@ error::Error GLES2DecoderImpl::HandleDeleteBuffersImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleDeleteFramebuffers(
-    uint32 immediate_data_size, const gles2::DeleteFramebuffers& c) {
+    uint32 immediate_data_size, const gles2::cmds::DeleteFramebuffers& c) {
   GLsizei n = static_cast<GLsizei>(c.n);
   uint32 data_size;
   if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
@@ -561,7 +562,8 @@ error::Error GLES2DecoderImpl::HandleDeleteFramebuffers(
 }
 
 error::Error GLES2DecoderImpl::HandleDeleteFramebuffersImmediate(
-    uint32 immediate_data_size, const gles2::DeleteFramebuffersImmediate& c) {
+    uint32 immediate_data_size,
+    const gles2::cmds::DeleteFramebuffersImmediate& c) {
   GLsizei n = static_cast<GLsizei>(c.n);
   uint32 data_size;
   if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
@@ -577,7 +579,7 @@ error::Error GLES2DecoderImpl::HandleDeleteFramebuffersImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleDeleteRenderbuffers(
-    uint32 immediate_data_size, const gles2::DeleteRenderbuffers& c) {
+    uint32 immediate_data_size, const gles2::cmds::DeleteRenderbuffers& c) {
   GLsizei n = static_cast<GLsizei>(c.n);
   uint32 data_size;
   if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
@@ -593,7 +595,8 @@ error::Error GLES2DecoderImpl::HandleDeleteRenderbuffers(
 }
 
 error::Error GLES2DecoderImpl::HandleDeleteRenderbuffersImmediate(
-    uint32 immediate_data_size, const gles2::DeleteRenderbuffersImmediate& c) {
+    uint32 immediate_data_size,
+    const gles2::cmds::DeleteRenderbuffersImmediate& c) {
   GLsizei n = static_cast<GLsizei>(c.n);
   uint32 data_size;
   if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
@@ -609,7 +612,7 @@ error::Error GLES2DecoderImpl::HandleDeleteRenderbuffersImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleDeleteTextures(
-    uint32 immediate_data_size, const gles2::DeleteTextures& c) {
+    uint32 immediate_data_size, const gles2::cmds::DeleteTextures& c) {
   GLsizei n = static_cast<GLsizei>(c.n);
   uint32 data_size;
   if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
@@ -625,7 +628,8 @@ error::Error GLES2DecoderImpl::HandleDeleteTextures(
 }
 
 error::Error GLES2DecoderImpl::HandleDeleteTexturesImmediate(
-    uint32 immediate_data_size, const gles2::DeleteTexturesImmediate& c) {
+    uint32 immediate_data_size,
+    const gles2::cmds::DeleteTexturesImmediate& c) {
   GLsizei n = static_cast<GLsizei>(c.n);
   uint32 data_size;
   if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
@@ -641,7 +645,7 @@ error::Error GLES2DecoderImpl::HandleDeleteTexturesImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleDepthFunc(
-    uint32 immediate_data_size, const gles2::DepthFunc& c) {
+    uint32 immediate_data_size, const gles2::cmds::DepthFunc& c) {
   GLenum func = static_cast<GLenum>(c.func);
   if (!validators_->cmp_function.IsValid(func)) {
     SetGLErrorInvalidEnum("glDepthFunc", func, "func");
@@ -655,7 +659,7 @@ error::Error GLES2DecoderImpl::HandleDepthFunc(
 }
 
 error::Error GLES2DecoderImpl::HandleDepthMask(
-    uint32 immediate_data_size, const gles2::DepthMask& c) {
+    uint32 immediate_data_size, const gles2::cmds::DepthMask& c) {
   GLboolean flag = static_cast<GLboolean>(c.flag);
   if (state_.depth_mask != flag) {
     state_.depth_mask = flag;
@@ -665,7 +669,7 @@ error::Error GLES2DecoderImpl::HandleDepthMask(
 }
 
 error::Error GLES2DecoderImpl::HandleDepthRangef(
-    uint32 immediate_data_size, const gles2::DepthRangef& c) {
+    uint32 immediate_data_size, const gles2::cmds::DepthRangef& c) {
   GLclampf zNear = static_cast<GLclampf>(c.zNear);
   GLclampf zFar = static_cast<GLclampf>(c.zFar);
   DoDepthRangef(zNear, zFar);
@@ -673,7 +677,7 @@ error::Error GLES2DecoderImpl::HandleDepthRangef(
 }
 
 error::Error GLES2DecoderImpl::HandleDetachShader(
-    uint32 immediate_data_size, const gles2::DetachShader& c) {
+    uint32 immediate_data_size, const gles2::cmds::DetachShader& c) {
   GLuint program = c.program;
   GLuint shader = c.shader;
   DoDetachShader(program, shader);
@@ -681,7 +685,7 @@ error::Error GLES2DecoderImpl::HandleDetachShader(
 }
 
 error::Error GLES2DecoderImpl::HandleDisable(
-    uint32 immediate_data_size, const gles2::Disable& c) {
+    uint32 immediate_data_size, const gles2::cmds::Disable& c) {
   GLenum cap = static_cast<GLenum>(c.cap);
   if (!validators_->capability.IsValid(cap)) {
     SetGLErrorInvalidEnum("glDisable", cap, "cap");
@@ -692,14 +696,15 @@ error::Error GLES2DecoderImpl::HandleDisable(
 }
 
 error::Error GLES2DecoderImpl::HandleDisableVertexAttribArray(
-    uint32 immediate_data_size, const gles2::DisableVertexAttribArray& c) {
+    uint32 immediate_data_size,
+    const gles2::cmds::DisableVertexAttribArray& c) {
   GLuint index = static_cast<GLuint>(c.index);
   DoDisableVertexAttribArray(index);
   return error::kNoError;
 }
 
 error::Error GLES2DecoderImpl::HandleEnable(
-    uint32 immediate_data_size, const gles2::Enable& c) {
+    uint32 immediate_data_size, const gles2::cmds::Enable& c) {
   GLenum cap = static_cast<GLenum>(c.cap);
   if (!validators_->capability.IsValid(cap)) {
     SetGLErrorInvalidEnum("glEnable", cap, "cap");
@@ -710,26 +715,28 @@ error::Error GLES2DecoderImpl::HandleEnable(
 }
 
 error::Error GLES2DecoderImpl::HandleEnableVertexAttribArray(
-    uint32 immediate_data_size, const gles2::EnableVertexAttribArray& c) {
+    uint32 immediate_data_size,
+    const gles2::cmds::EnableVertexAttribArray& c) {
   GLuint index = static_cast<GLuint>(c.index);
   DoEnableVertexAttribArray(index);
   return error::kNoError;
 }
 
 error::Error GLES2DecoderImpl::HandleFinish(
-    uint32 immediate_data_size, const gles2::Finish& c) {
+    uint32 immediate_data_size, const gles2::cmds::Finish& c) {
   DoFinish();
   return error::kNoError;
 }
 
 error::Error GLES2DecoderImpl::HandleFlush(
-    uint32 immediate_data_size, const gles2::Flush& c) {
+    uint32 immediate_data_size, const gles2::cmds::Flush& c) {
   DoFlush();
   return error::kNoError;
 }
 
 error::Error GLES2DecoderImpl::HandleFramebufferRenderbuffer(
-    uint32 immediate_data_size, const gles2::FramebufferRenderbuffer& c) {
+    uint32 immediate_data_size,
+    const gles2::cmds::FramebufferRenderbuffer& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLenum attachment = static_cast<GLenum>(c.attachment);
   GLenum renderbuffertarget = static_cast<GLenum>(c.renderbuffertarget);
@@ -754,7 +761,7 @@ error::Error GLES2DecoderImpl::HandleFramebufferRenderbuffer(
 }
 
 error::Error GLES2DecoderImpl::HandleFramebufferTexture2D(
-    uint32 immediate_data_size, const gles2::FramebufferTexture2D& c) {
+    uint32 immediate_data_size, const gles2::cmds::FramebufferTexture2D& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLenum attachment = static_cast<GLenum>(c.attachment);
   GLenum textarget = static_cast<GLenum>(c.textarget);
@@ -782,7 +789,7 @@ error::Error GLES2DecoderImpl::HandleFramebufferTexture2D(
 }
 
 error::Error GLES2DecoderImpl::HandleFrontFace(
-    uint32 immediate_data_size, const gles2::FrontFace& c) {
+    uint32 immediate_data_size, const gles2::cmds::FrontFace& c) {
   GLenum mode = static_cast<GLenum>(c.mode);
   if (!validators_->face_mode.IsValid(mode)) {
     SetGLErrorInvalidEnum("glFrontFace", mode, "mode");
@@ -796,7 +803,7 @@ error::Error GLES2DecoderImpl::HandleFrontFace(
 }
 
 error::Error GLES2DecoderImpl::HandleGenBuffers(
-    uint32 immediate_data_size, const gles2::GenBuffers& c) {
+    uint32 immediate_data_size, const gles2::cmds::GenBuffers& c) {
   GLsizei n = static_cast<GLsizei>(c.n);
   uint32 data_size;
   if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
@@ -814,7 +821,7 @@ error::Error GLES2DecoderImpl::HandleGenBuffers(
 }
 
 error::Error GLES2DecoderImpl::HandleGenBuffersImmediate(
-    uint32 immediate_data_size, const gles2::GenBuffersImmediate& c) {
+    uint32 immediate_data_size, const gles2::cmds::GenBuffersImmediate& c) {
   GLsizei n = static_cast<GLsizei>(c.n);
   uint32 data_size;
   if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
@@ -832,7 +839,7 @@ error::Error GLES2DecoderImpl::HandleGenBuffersImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleGenerateMipmap(
-    uint32 immediate_data_size, const gles2::GenerateMipmap& c) {
+    uint32 immediate_data_size, const gles2::cmds::GenerateMipmap& c) {
   GLenum target = static_cast<GLenum>(c.target);
   if (!validators_->texture_bind_target.IsValid(target)) {
     SetGLErrorInvalidEnum("glGenerateMipmap", target, "target");
@@ -843,7 +850,7 @@ error::Error GLES2DecoderImpl::HandleGenerateMipmap(
 }
 
 error::Error GLES2DecoderImpl::HandleGenFramebuffers(
-    uint32 immediate_data_size, const gles2::GenFramebuffers& c) {
+    uint32 immediate_data_size, const gles2::cmds::GenFramebuffers& c) {
   GLsizei n = static_cast<GLsizei>(c.n);
   uint32 data_size;
   if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
@@ -861,7 +868,8 @@ error::Error GLES2DecoderImpl::HandleGenFramebuffers(
 }
 
 error::Error GLES2DecoderImpl::HandleGenFramebuffersImmediate(
-    uint32 immediate_data_size, const gles2::GenFramebuffersImmediate& c) {
+    uint32 immediate_data_size,
+    const gles2::cmds::GenFramebuffersImmediate& c) {
   GLsizei n = static_cast<GLsizei>(c.n);
   uint32 data_size;
   if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
@@ -879,7 +887,7 @@ error::Error GLES2DecoderImpl::HandleGenFramebuffersImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleGenRenderbuffers(
-    uint32 immediate_data_size, const gles2::GenRenderbuffers& c) {
+    uint32 immediate_data_size, const gles2::cmds::GenRenderbuffers& c) {
   GLsizei n = static_cast<GLsizei>(c.n);
   uint32 data_size;
   if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
@@ -897,7 +905,8 @@ error::Error GLES2DecoderImpl::HandleGenRenderbuffers(
 }
 
 error::Error GLES2DecoderImpl::HandleGenRenderbuffersImmediate(
-    uint32 immediate_data_size, const gles2::GenRenderbuffersImmediate& c) {
+    uint32 immediate_data_size,
+    const gles2::cmds::GenRenderbuffersImmediate& c) {
   GLsizei n = static_cast<GLsizei>(c.n);
   uint32 data_size;
   if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
@@ -915,7 +924,7 @@ error::Error GLES2DecoderImpl::HandleGenRenderbuffersImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleGenTextures(
-    uint32 immediate_data_size, const gles2::GenTextures& c) {
+    uint32 immediate_data_size, const gles2::cmds::GenTextures& c) {
   GLsizei n = static_cast<GLsizei>(c.n);
   uint32 data_size;
   if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
@@ -933,7 +942,7 @@ error::Error GLES2DecoderImpl::HandleGenTextures(
 }
 
 error::Error GLES2DecoderImpl::HandleGenTexturesImmediate(
-    uint32 immediate_data_size, const gles2::GenTexturesImmediate& c) {
+    uint32 immediate_data_size, const gles2::cmds::GenTexturesImmediate& c) {
   GLsizei n = static_cast<GLsizei>(c.n);
   uint32 data_size;
   if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
@@ -951,9 +960,9 @@ error::Error GLES2DecoderImpl::HandleGenTexturesImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleGetBooleanv(
-    uint32 immediate_data_size, const gles2::GetBooleanv& c) {
+    uint32 immediate_data_size, const gles2::cmds::GetBooleanv& c) {
   GLenum pname = static_cast<GLenum>(c.pname);
-  typedef GetBooleanv::Result Result;
+  typedef cmds::GetBooleanv::Result Result;
   GLsizei num_values = 0;
   GetNumValuesReturnedForGLGet(pname, &num_values);
   Result* result = GetSharedMemoryAs<Result*>(
@@ -982,10 +991,10 @@ error::Error GLES2DecoderImpl::HandleGetBooleanv(
 }
 
 error::Error GLES2DecoderImpl::HandleGetBufferParameteriv(
-    uint32 immediate_data_size, const gles2::GetBufferParameteriv& c) {
+    uint32 immediate_data_size, const gles2::cmds::GetBufferParameteriv& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLenum pname = static_cast<GLenum>(c.pname);
-  typedef GetBufferParameteriv::Result Result;
+  typedef cmds::GetBufferParameteriv::Result Result;
   GLsizei num_values = 0;
   GetNumValuesReturnedForGLGet(pname, &num_values);
   Result* result = GetSharedMemoryAs<Result*>(
@@ -1018,8 +1027,8 @@ error::Error GLES2DecoderImpl::HandleGetBufferParameteriv(
 }
 
 error::Error GLES2DecoderImpl::HandleGetError(
-    uint32 immediate_data_size, const gles2::GetError& c) {
-  typedef GetError::Result Result;
+    uint32 immediate_data_size, const gles2::cmds::GetError& c) {
+  typedef cmds::GetError::Result Result;
   Result* result_dst = GetSharedMemoryAs<Result*>(
       c.result_shm_id, c.result_shm_offset, sizeof(*result_dst));
   if (!result_dst) {
@@ -1030,9 +1039,9 @@ error::Error GLES2DecoderImpl::HandleGetError(
 }
 
 error::Error GLES2DecoderImpl::HandleGetFloatv(
-    uint32 immediate_data_size, const gles2::GetFloatv& c) {
+    uint32 immediate_data_size, const gles2::cmds::GetFloatv& c) {
   GLenum pname = static_cast<GLenum>(c.pname);
-  typedef GetFloatv::Result Result;
+  typedef cmds::GetFloatv::Result Result;
   GLsizei num_values = 0;
   GetNumValuesReturnedForGLGet(pname, &num_values);
   Result* result = GetSharedMemoryAs<Result*>(
@@ -1062,11 +1071,11 @@ error::Error GLES2DecoderImpl::HandleGetFloatv(
 
 error::Error GLES2DecoderImpl::HandleGetFramebufferAttachmentParameteriv(
     uint32 immediate_data_size,
-    const gles2::GetFramebufferAttachmentParameteriv& c) {
+    const gles2::cmds::GetFramebufferAttachmentParameteriv& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLenum attachment = static_cast<GLenum>(c.attachment);
   GLenum pname = static_cast<GLenum>(c.pname);
-  typedef GetFramebufferAttachmentParameteriv::Result Result;
+  typedef cmds::GetFramebufferAttachmentParameteriv::Result Result;
   GLsizei num_values = 0;
   GetNumValuesReturnedForGLGet(pname, &num_values);
   Result* result = GetSharedMemoryAs<Result*>(
@@ -1106,9 +1115,9 @@ error::Error GLES2DecoderImpl::HandleGetFramebufferAttachmentParameteriv(
 }
 
 error::Error GLES2DecoderImpl::HandleGetIntegerv(
-    uint32 immediate_data_size, const gles2::GetIntegerv& c) {
+    uint32 immediate_data_size, const gles2::cmds::GetIntegerv& c) {
   GLenum pname = static_cast<GLenum>(c.pname);
-  typedef GetIntegerv::Result Result;
+  typedef cmds::GetIntegerv::Result Result;
   GLsizei num_values = 0;
   GetNumValuesReturnedForGLGet(pname, &num_values);
   Result* result = GetSharedMemoryAs<Result*>(
@@ -1137,10 +1146,10 @@ error::Error GLES2DecoderImpl::HandleGetIntegerv(
 }
 
 error::Error GLES2DecoderImpl::HandleGetProgramiv(
-    uint32 immediate_data_size, const gles2::GetProgramiv& c) {
+    uint32 immediate_data_size, const gles2::cmds::GetProgramiv& c) {
   GLuint program = c.program;
   GLenum pname = static_cast<GLenum>(c.pname);
-  typedef GetProgramiv::Result Result;
+  typedef cmds::GetProgramiv::Result Result;
   GLsizei num_values = 0;
   GetNumValuesReturnedForGLGet(pname, &num_values);
   Result* result = GetSharedMemoryAs<Result*>(
@@ -1169,10 +1178,11 @@ error::Error GLES2DecoderImpl::HandleGetProgramiv(
 }
 
 error::Error GLES2DecoderImpl::HandleGetRenderbufferParameteriv(
-    uint32 immediate_data_size, const gles2::GetRenderbufferParameteriv& c) {
+    uint32 immediate_data_size,
+    const gles2::cmds::GetRenderbufferParameteriv& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLenum pname = static_cast<GLenum>(c.pname);
-  typedef GetRenderbufferParameteriv::Result Result;
+  typedef cmds::GetRenderbufferParameteriv::Result Result;
   GLsizei num_values = 0;
   GetNumValuesReturnedForGLGet(pname, &num_values);
   Result* result = GetSharedMemoryAs<Result*>(
@@ -1205,10 +1215,10 @@ error::Error GLES2DecoderImpl::HandleGetRenderbufferParameteriv(
 }
 
 error::Error GLES2DecoderImpl::HandleGetShaderiv(
-    uint32 immediate_data_size, const gles2::GetShaderiv& c) {
+    uint32 immediate_data_size, const gles2::cmds::GetShaderiv& c) {
   GLuint shader = c.shader;
   GLenum pname = static_cast<GLenum>(c.pname);
-  typedef GetShaderiv::Result Result;
+  typedef cmds::GetShaderiv::Result Result;
   GLsizei num_values = 0;
   GetNumValuesReturnedForGLGet(pname, &num_values);
   Result* result = GetSharedMemoryAs<Result*>(
@@ -1237,10 +1247,10 @@ error::Error GLES2DecoderImpl::HandleGetShaderiv(
 }
 
 error::Error GLES2DecoderImpl::HandleGetTexParameterfv(
-    uint32 immediate_data_size, const gles2::GetTexParameterfv& c) {
+    uint32 immediate_data_size, const gles2::cmds::GetTexParameterfv& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLenum pname = static_cast<GLenum>(c.pname);
-  typedef GetTexParameterfv::Result Result;
+  typedef cmds::GetTexParameterfv::Result Result;
   GLsizei num_values = 0;
   GetNumValuesReturnedForGLGet(pname, &num_values);
   Result* result = GetSharedMemoryAs<Result*>(
@@ -1273,10 +1283,10 @@ error::Error GLES2DecoderImpl::HandleGetTexParameterfv(
 }
 
 error::Error GLES2DecoderImpl::HandleGetTexParameteriv(
-    uint32 immediate_data_size, const gles2::GetTexParameteriv& c) {
+    uint32 immediate_data_size, const gles2::cmds::GetTexParameteriv& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLenum pname = static_cast<GLenum>(c.pname);
-  typedef GetTexParameteriv::Result Result;
+  typedef cmds::GetTexParameteriv::Result Result;
   GLsizei num_values = 0;
   GetNumValuesReturnedForGLGet(pname, &num_values);
   Result* result = GetSharedMemoryAs<Result*>(
@@ -1309,10 +1319,10 @@ error::Error GLES2DecoderImpl::HandleGetTexParameteriv(
 }
 
 error::Error GLES2DecoderImpl::HandleGetVertexAttribfv(
-    uint32 immediate_data_size, const gles2::GetVertexAttribfv& c) {
+    uint32 immediate_data_size, const gles2::cmds::GetVertexAttribfv& c) {
   GLuint index = static_cast<GLuint>(c.index);
   GLenum pname = static_cast<GLenum>(c.pname);
-  typedef GetVertexAttribfv::Result Result;
+  typedef cmds::GetVertexAttribfv::Result Result;
   GLsizei num_values = 0;
   GetNumValuesReturnedForGLGet(pname, &num_values);
   Result* result = GetSharedMemoryAs<Result*>(
@@ -1341,10 +1351,10 @@ error::Error GLES2DecoderImpl::HandleGetVertexAttribfv(
 }
 
 error::Error GLES2DecoderImpl::HandleGetVertexAttribiv(
-    uint32 immediate_data_size, const gles2::GetVertexAttribiv& c) {
+    uint32 immediate_data_size, const gles2::cmds::GetVertexAttribiv& c) {
   GLuint index = static_cast<GLuint>(c.index);
   GLenum pname = static_cast<GLenum>(c.pname);
-  typedef GetVertexAttribiv::Result Result;
+  typedef cmds::GetVertexAttribiv::Result Result;
   GLsizei num_values = 0;
   GetNumValuesReturnedForGLGet(pname, &num_values);
   Result* result = GetSharedMemoryAs<Result*>(
@@ -1373,7 +1383,7 @@ error::Error GLES2DecoderImpl::HandleGetVertexAttribiv(
 }
 
 error::Error GLES2DecoderImpl::HandleHint(
-    uint32 immediate_data_size, const gles2::Hint& c) {
+    uint32 immediate_data_size, const gles2::cmds::Hint& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLenum mode = static_cast<GLenum>(c.mode);
   if (!validators_->hint_target.IsValid(target)) {
@@ -1389,9 +1399,9 @@ error::Error GLES2DecoderImpl::HandleHint(
 }
 
 error::Error GLES2DecoderImpl::HandleIsBuffer(
-    uint32 immediate_data_size, const gles2::IsBuffer& c) {
+    uint32 immediate_data_size, const gles2::cmds::IsBuffer& c) {
   GLuint buffer = c.buffer;
-  typedef IsBuffer::Result Result;
+  typedef cmds::IsBuffer::Result Result;
   Result* result_dst = GetSharedMemoryAs<Result*>(
       c.result_shm_id, c.result_shm_offset, sizeof(*result_dst));
   if (!result_dst) {
@@ -1402,9 +1412,9 @@ error::Error GLES2DecoderImpl::HandleIsBuffer(
 }
 
 error::Error GLES2DecoderImpl::HandleIsEnabled(
-    uint32 immediate_data_size, const gles2::IsEnabled& c) {
+    uint32 immediate_data_size, const gles2::cmds::IsEnabled& c) {
   GLenum cap = static_cast<GLenum>(c.cap);
-  typedef IsEnabled::Result Result;
+  typedef cmds::IsEnabled::Result Result;
   Result* result_dst = GetSharedMemoryAs<Result*>(
       c.result_shm_id, c.result_shm_offset, sizeof(*result_dst));
   if (!result_dst) {
@@ -1419,9 +1429,9 @@ error::Error GLES2DecoderImpl::HandleIsEnabled(
 }
 
 error::Error GLES2DecoderImpl::HandleIsFramebuffer(
-    uint32 immediate_data_size, const gles2::IsFramebuffer& c) {
+    uint32 immediate_data_size, const gles2::cmds::IsFramebuffer& c) {
   GLuint framebuffer = c.framebuffer;
-  typedef IsFramebuffer::Result Result;
+  typedef cmds::IsFramebuffer::Result Result;
   Result* result_dst = GetSharedMemoryAs<Result*>(
       c.result_shm_id, c.result_shm_offset, sizeof(*result_dst));
   if (!result_dst) {
@@ -1432,9 +1442,9 @@ error::Error GLES2DecoderImpl::HandleIsFramebuffer(
 }
 
 error::Error GLES2DecoderImpl::HandleIsProgram(
-    uint32 immediate_data_size, const gles2::IsProgram& c) {
+    uint32 immediate_data_size, const gles2::cmds::IsProgram& c) {
   GLuint program = c.program;
-  typedef IsProgram::Result Result;
+  typedef cmds::IsProgram::Result Result;
   Result* result_dst = GetSharedMemoryAs<Result*>(
       c.result_shm_id, c.result_shm_offset, sizeof(*result_dst));
   if (!result_dst) {
@@ -1445,9 +1455,9 @@ error::Error GLES2DecoderImpl::HandleIsProgram(
 }
 
 error::Error GLES2DecoderImpl::HandleIsRenderbuffer(
-    uint32 immediate_data_size, const gles2::IsRenderbuffer& c) {
+    uint32 immediate_data_size, const gles2::cmds::IsRenderbuffer& c) {
   GLuint renderbuffer = c.renderbuffer;
-  typedef IsRenderbuffer::Result Result;
+  typedef cmds::IsRenderbuffer::Result Result;
   Result* result_dst = GetSharedMemoryAs<Result*>(
       c.result_shm_id, c.result_shm_offset, sizeof(*result_dst));
   if (!result_dst) {
@@ -1458,9 +1468,9 @@ error::Error GLES2DecoderImpl::HandleIsRenderbuffer(
 }
 
 error::Error GLES2DecoderImpl::HandleIsShader(
-    uint32 immediate_data_size, const gles2::IsShader& c) {
+    uint32 immediate_data_size, const gles2::cmds::IsShader& c) {
   GLuint shader = c.shader;
-  typedef IsShader::Result Result;
+  typedef cmds::IsShader::Result Result;
   Result* result_dst = GetSharedMemoryAs<Result*>(
       c.result_shm_id, c.result_shm_offset, sizeof(*result_dst));
   if (!result_dst) {
@@ -1471,9 +1481,9 @@ error::Error GLES2DecoderImpl::HandleIsShader(
 }
 
 error::Error GLES2DecoderImpl::HandleIsTexture(
-    uint32 immediate_data_size, const gles2::IsTexture& c) {
+    uint32 immediate_data_size, const gles2::cmds::IsTexture& c) {
   GLuint texture = c.texture;
-  typedef IsTexture::Result Result;
+  typedef cmds::IsTexture::Result Result;
   Result* result_dst = GetSharedMemoryAs<Result*>(
       c.result_shm_id, c.result_shm_offset, sizeof(*result_dst));
   if (!result_dst) {
@@ -1484,7 +1494,7 @@ error::Error GLES2DecoderImpl::HandleIsTexture(
 }
 
 error::Error GLES2DecoderImpl::HandleLineWidth(
-    uint32 immediate_data_size, const gles2::LineWidth& c) {
+    uint32 immediate_data_size, const gles2::cmds::LineWidth& c) {
   GLfloat width = static_cast<GLfloat>(c.width);
   if (width <= 0.0f) {
     SetGLError(GL_INVALID_VALUE, "LineWidth", "width out of range");
@@ -1498,14 +1508,14 @@ error::Error GLES2DecoderImpl::HandleLineWidth(
 }
 
 error::Error GLES2DecoderImpl::HandleLinkProgram(
-    uint32 immediate_data_size, const gles2::LinkProgram& c) {
+    uint32 immediate_data_size, const gles2::cmds::LinkProgram& c) {
   GLuint program = c.program;
   DoLinkProgram(program);
   return error::kNoError;
 }
 
 error::Error GLES2DecoderImpl::HandlePolygonOffset(
-    uint32 immediate_data_size, const gles2::PolygonOffset& c) {
+    uint32 immediate_data_size, const gles2::cmds::PolygonOffset& c) {
   GLfloat factor = static_cast<GLfloat>(c.factor);
   GLfloat units = static_cast<GLfloat>(c.units);
   if (state_.polygon_offset_factor != factor ||
@@ -1518,13 +1528,13 @@ error::Error GLES2DecoderImpl::HandlePolygonOffset(
 }
 
 error::Error GLES2DecoderImpl::HandleReleaseShaderCompiler(
-    uint32 immediate_data_size, const gles2::ReleaseShaderCompiler& c) {
+    uint32 immediate_data_size, const gles2::cmds::ReleaseShaderCompiler& c) {
   DoReleaseShaderCompiler();
   return error::kNoError;
 }
 
 error::Error GLES2DecoderImpl::HandleRenderbufferStorage(
-    uint32 immediate_data_size, const gles2::RenderbufferStorage& c) {
+    uint32 immediate_data_size, const gles2::cmds::RenderbufferStorage& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLenum internalformat = static_cast<GLenum>(c.internalformat);
   GLsizei width = static_cast<GLsizei>(c.width);
@@ -1551,7 +1561,7 @@ error::Error GLES2DecoderImpl::HandleRenderbufferStorage(
 }
 
 error::Error GLES2DecoderImpl::HandleSampleCoverage(
-    uint32 immediate_data_size, const gles2::SampleCoverage& c) {
+    uint32 immediate_data_size, const gles2::cmds::SampleCoverage& c) {
   GLclampf value = static_cast<GLclampf>(c.value);
   GLboolean invert = static_cast<GLboolean>(c.invert);
   DoSampleCoverage(value, invert);
@@ -1559,7 +1569,7 @@ error::Error GLES2DecoderImpl::HandleSampleCoverage(
 }
 
 error::Error GLES2DecoderImpl::HandleScissor(
-    uint32 immediate_data_size, const gles2::Scissor& c) {
+    uint32 immediate_data_size, const gles2::cmds::Scissor& c) {
   GLint x = static_cast<GLint>(c.x);
   GLint y = static_cast<GLint>(c.y);
   GLsizei width = static_cast<GLsizei>(c.width);
@@ -1586,7 +1596,7 @@ error::Error GLES2DecoderImpl::HandleScissor(
 }
 
 error::Error GLES2DecoderImpl::HandleStencilFunc(
-    uint32 immediate_data_size, const gles2::StencilFunc& c) {
+    uint32 immediate_data_size, const gles2::cmds::StencilFunc& c) {
   GLenum func = static_cast<GLenum>(c.func);
   GLint ref = static_cast<GLint>(c.ref);
   GLuint mask = static_cast<GLuint>(c.mask);
@@ -1612,7 +1622,7 @@ error::Error GLES2DecoderImpl::HandleStencilFunc(
 }
 
 error::Error GLES2DecoderImpl::HandleStencilFuncSeparate(
-    uint32 immediate_data_size, const gles2::StencilFuncSeparate& c) {
+    uint32 immediate_data_size, const gles2::cmds::StencilFuncSeparate& c) {
   GLenum face = static_cast<GLenum>(c.face);
   GLenum func = static_cast<GLenum>(c.func);
   GLint ref = static_cast<GLint>(c.ref);
@@ -1653,7 +1663,7 @@ error::Error GLES2DecoderImpl::HandleStencilFuncSeparate(
 }
 
 error::Error GLES2DecoderImpl::HandleStencilMask(
-    uint32 immediate_data_size, const gles2::StencilMask& c) {
+    uint32 immediate_data_size, const gles2::cmds::StencilMask& c) {
   GLuint mask = static_cast<GLuint>(c.mask);
   if (state_.stencil_front_writemask != mask ||
       state_.stencil_back_writemask != mask) {
@@ -1665,7 +1675,7 @@ error::Error GLES2DecoderImpl::HandleStencilMask(
 }
 
 error::Error GLES2DecoderImpl::HandleStencilMaskSeparate(
-    uint32 immediate_data_size, const gles2::StencilMaskSeparate& c) {
+    uint32 immediate_data_size, const gles2::cmds::StencilMaskSeparate& c) {
   GLenum face = static_cast<GLenum>(c.face);
   GLuint mask = static_cast<GLuint>(c.mask);
   if (!validators_->face_type.IsValid(face)) {
@@ -1692,7 +1702,7 @@ error::Error GLES2DecoderImpl::HandleStencilMaskSeparate(
 }
 
 error::Error GLES2DecoderImpl::HandleStencilOp(
-    uint32 immediate_data_size, const gles2::StencilOp& c) {
+    uint32 immediate_data_size, const gles2::cmds::StencilOp& c) {
   GLenum fail = static_cast<GLenum>(c.fail);
   GLenum zfail = static_cast<GLenum>(c.zfail);
   GLenum zpass = static_cast<GLenum>(c.zpass);
@@ -1726,7 +1736,7 @@ error::Error GLES2DecoderImpl::HandleStencilOp(
 }
 
 error::Error GLES2DecoderImpl::HandleStencilOpSeparate(
-    uint32 immediate_data_size, const gles2::StencilOpSeparate& c) {
+    uint32 immediate_data_size, const gles2::cmds::StencilOpSeparate& c) {
   GLenum face = static_cast<GLenum>(c.face);
   GLenum fail = static_cast<GLenum>(c.fail);
   GLenum zfail = static_cast<GLenum>(c.zfail);
@@ -1775,7 +1785,7 @@ error::Error GLES2DecoderImpl::HandleStencilOpSeparate(
 }
 
 error::Error GLES2DecoderImpl::HandleTexParameterf(
-    uint32 immediate_data_size, const gles2::TexParameterf& c) {
+    uint32 immediate_data_size, const gles2::cmds::TexParameterf& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLenum pname = static_cast<GLenum>(c.pname);
   GLfloat param = static_cast<GLfloat>(c.param);
@@ -1792,7 +1802,7 @@ error::Error GLES2DecoderImpl::HandleTexParameterf(
 }
 
 error::Error GLES2DecoderImpl::HandleTexParameterfv(
-    uint32 immediate_data_size, const gles2::TexParameterfv& c) {
+    uint32 immediate_data_size, const gles2::cmds::TexParameterfv& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLenum pname = static_cast<GLenum>(c.pname);
   uint32 data_size;
@@ -1817,7 +1827,8 @@ error::Error GLES2DecoderImpl::HandleTexParameterfv(
 }
 
 error::Error GLES2DecoderImpl::HandleTexParameterfvImmediate(
-    uint32 immediate_data_size, const gles2::TexParameterfvImmediate& c) {
+    uint32 immediate_data_size,
+    const gles2::cmds::TexParameterfvImmediate& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLenum pname = static_cast<GLenum>(c.pname);
   uint32 data_size;
@@ -1845,7 +1856,7 @@ error::Error GLES2DecoderImpl::HandleTexParameterfvImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleTexParameteri(
-    uint32 immediate_data_size, const gles2::TexParameteri& c) {
+    uint32 immediate_data_size, const gles2::cmds::TexParameteri& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLenum pname = static_cast<GLenum>(c.pname);
   GLint param = static_cast<GLint>(c.param);
@@ -1862,7 +1873,7 @@ error::Error GLES2DecoderImpl::HandleTexParameteri(
 }
 
 error::Error GLES2DecoderImpl::HandleTexParameteriv(
-    uint32 immediate_data_size, const gles2::TexParameteriv& c) {
+    uint32 immediate_data_size, const gles2::cmds::TexParameteriv& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLenum pname = static_cast<GLenum>(c.pname);
   uint32 data_size;
@@ -1887,7 +1898,8 @@ error::Error GLES2DecoderImpl::HandleTexParameteriv(
 }
 
 error::Error GLES2DecoderImpl::HandleTexParameterivImmediate(
-    uint32 immediate_data_size, const gles2::TexParameterivImmediate& c) {
+    uint32 immediate_data_size,
+    const gles2::cmds::TexParameterivImmediate& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLenum pname = static_cast<GLenum>(c.pname);
   uint32 data_size;
@@ -1915,7 +1927,7 @@ error::Error GLES2DecoderImpl::HandleTexParameterivImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleUniform1f(
-    uint32 immediate_data_size, const gles2::Uniform1f& c) {
+    uint32 immediate_data_size, const gles2::cmds::Uniform1f& c) {
   GLint location = static_cast<GLint>(c.location);
   GLfloat x = static_cast<GLfloat>(c.x);
   GLfloat temp[1] = { x, };
@@ -1924,7 +1936,7 @@ error::Error GLES2DecoderImpl::HandleUniform1f(
 }
 
 error::Error GLES2DecoderImpl::HandleUniform1fv(
-    uint32 immediate_data_size, const gles2::Uniform1fv& c) {
+    uint32 immediate_data_size, const gles2::cmds::Uniform1fv& c) {
   GLint location = static_cast<GLint>(c.location);
   GLsizei count = static_cast<GLsizei>(c.count);
   uint32 data_size;
@@ -1941,7 +1953,7 @@ error::Error GLES2DecoderImpl::HandleUniform1fv(
 }
 
 error::Error GLES2DecoderImpl::HandleUniform1fvImmediate(
-    uint32 immediate_data_size, const gles2::Uniform1fvImmediate& c) {
+    uint32 immediate_data_size, const gles2::cmds::Uniform1fvImmediate& c) {
   GLint location = static_cast<GLint>(c.location);
   GLsizei count = static_cast<GLsizei>(c.count);
   uint32 data_size;
@@ -1961,7 +1973,7 @@ error::Error GLES2DecoderImpl::HandleUniform1fvImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleUniform1i(
-    uint32 immediate_data_size, const gles2::Uniform1i& c) {
+    uint32 immediate_data_size, const gles2::cmds::Uniform1i& c) {
   GLint location = static_cast<GLint>(c.location);
   GLint x = static_cast<GLint>(c.x);
   DoUniform1i(location, x);
@@ -1969,7 +1981,7 @@ error::Error GLES2DecoderImpl::HandleUniform1i(
 }
 
 error::Error GLES2DecoderImpl::HandleUniform1iv(
-    uint32 immediate_data_size, const gles2::Uniform1iv& c) {
+    uint32 immediate_data_size, const gles2::cmds::Uniform1iv& c) {
   GLint location = static_cast<GLint>(c.location);
   GLsizei count = static_cast<GLsizei>(c.count);
   uint32 data_size;
@@ -1986,7 +1998,7 @@ error::Error GLES2DecoderImpl::HandleUniform1iv(
 }
 
 error::Error GLES2DecoderImpl::HandleUniform1ivImmediate(
-    uint32 immediate_data_size, const gles2::Uniform1ivImmediate& c) {
+    uint32 immediate_data_size, const gles2::cmds::Uniform1ivImmediate& c) {
   GLint location = static_cast<GLint>(c.location);
   GLsizei count = static_cast<GLsizei>(c.count);
   uint32 data_size;
@@ -2006,7 +2018,7 @@ error::Error GLES2DecoderImpl::HandleUniform1ivImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleUniform2f(
-    uint32 immediate_data_size, const gles2::Uniform2f& c) {
+    uint32 immediate_data_size, const gles2::cmds::Uniform2f& c) {
   GLint location = static_cast<GLint>(c.location);
   GLfloat x = static_cast<GLfloat>(c.x);
   GLfloat y = static_cast<GLfloat>(c.y);
@@ -2016,7 +2028,7 @@ error::Error GLES2DecoderImpl::HandleUniform2f(
 }
 
 error::Error GLES2DecoderImpl::HandleUniform2fv(
-    uint32 immediate_data_size, const gles2::Uniform2fv& c) {
+    uint32 immediate_data_size, const gles2::cmds::Uniform2fv& c) {
   GLint location = static_cast<GLint>(c.location);
   GLsizei count = static_cast<GLsizei>(c.count);
   uint32 data_size;
@@ -2033,7 +2045,7 @@ error::Error GLES2DecoderImpl::HandleUniform2fv(
 }
 
 error::Error GLES2DecoderImpl::HandleUniform2fvImmediate(
-    uint32 immediate_data_size, const gles2::Uniform2fvImmediate& c) {
+    uint32 immediate_data_size, const gles2::cmds::Uniform2fvImmediate& c) {
   GLint location = static_cast<GLint>(c.location);
   GLsizei count = static_cast<GLsizei>(c.count);
   uint32 data_size;
@@ -2053,7 +2065,7 @@ error::Error GLES2DecoderImpl::HandleUniform2fvImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleUniform2i(
-    uint32 immediate_data_size, const gles2::Uniform2i& c) {
+    uint32 immediate_data_size, const gles2::cmds::Uniform2i& c) {
   GLint location = static_cast<GLint>(c.location);
   GLint x = static_cast<GLint>(c.x);
   GLint y = static_cast<GLint>(c.y);
@@ -2063,7 +2075,7 @@ error::Error GLES2DecoderImpl::HandleUniform2i(
 }
 
 error::Error GLES2DecoderImpl::HandleUniform2iv(
-    uint32 immediate_data_size, const gles2::Uniform2iv& c) {
+    uint32 immediate_data_size, const gles2::cmds::Uniform2iv& c) {
   GLint location = static_cast<GLint>(c.location);
   GLsizei count = static_cast<GLsizei>(c.count);
   uint32 data_size;
@@ -2080,7 +2092,7 @@ error::Error GLES2DecoderImpl::HandleUniform2iv(
 }
 
 error::Error GLES2DecoderImpl::HandleUniform2ivImmediate(
-    uint32 immediate_data_size, const gles2::Uniform2ivImmediate& c) {
+    uint32 immediate_data_size, const gles2::cmds::Uniform2ivImmediate& c) {
   GLint location = static_cast<GLint>(c.location);
   GLsizei count = static_cast<GLsizei>(c.count);
   uint32 data_size;
@@ -2100,7 +2112,7 @@ error::Error GLES2DecoderImpl::HandleUniform2ivImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleUniform3f(
-    uint32 immediate_data_size, const gles2::Uniform3f& c) {
+    uint32 immediate_data_size, const gles2::cmds::Uniform3f& c) {
   GLint location = static_cast<GLint>(c.location);
   GLfloat x = static_cast<GLfloat>(c.x);
   GLfloat y = static_cast<GLfloat>(c.y);
@@ -2111,7 +2123,7 @@ error::Error GLES2DecoderImpl::HandleUniform3f(
 }
 
 error::Error GLES2DecoderImpl::HandleUniform3fv(
-    uint32 immediate_data_size, const gles2::Uniform3fv& c) {
+    uint32 immediate_data_size, const gles2::cmds::Uniform3fv& c) {
   GLint location = static_cast<GLint>(c.location);
   GLsizei count = static_cast<GLsizei>(c.count);
   uint32 data_size;
@@ -2128,7 +2140,7 @@ error::Error GLES2DecoderImpl::HandleUniform3fv(
 }
 
 error::Error GLES2DecoderImpl::HandleUniform3fvImmediate(
-    uint32 immediate_data_size, const gles2::Uniform3fvImmediate& c) {
+    uint32 immediate_data_size, const gles2::cmds::Uniform3fvImmediate& c) {
   GLint location = static_cast<GLint>(c.location);
   GLsizei count = static_cast<GLsizei>(c.count);
   uint32 data_size;
@@ -2148,7 +2160,7 @@ error::Error GLES2DecoderImpl::HandleUniform3fvImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleUniform3i(
-    uint32 immediate_data_size, const gles2::Uniform3i& c) {
+    uint32 immediate_data_size, const gles2::cmds::Uniform3i& c) {
   GLint location = static_cast<GLint>(c.location);
   GLint x = static_cast<GLint>(c.x);
   GLint y = static_cast<GLint>(c.y);
@@ -2159,7 +2171,7 @@ error::Error GLES2DecoderImpl::HandleUniform3i(
 }
 
 error::Error GLES2DecoderImpl::HandleUniform3iv(
-    uint32 immediate_data_size, const gles2::Uniform3iv& c) {
+    uint32 immediate_data_size, const gles2::cmds::Uniform3iv& c) {
   GLint location = static_cast<GLint>(c.location);
   GLsizei count = static_cast<GLsizei>(c.count);
   uint32 data_size;
@@ -2176,7 +2188,7 @@ error::Error GLES2DecoderImpl::HandleUniform3iv(
 }
 
 error::Error GLES2DecoderImpl::HandleUniform3ivImmediate(
-    uint32 immediate_data_size, const gles2::Uniform3ivImmediate& c) {
+    uint32 immediate_data_size, const gles2::cmds::Uniform3ivImmediate& c) {
   GLint location = static_cast<GLint>(c.location);
   GLsizei count = static_cast<GLsizei>(c.count);
   uint32 data_size;
@@ -2196,7 +2208,7 @@ error::Error GLES2DecoderImpl::HandleUniform3ivImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleUniform4f(
-    uint32 immediate_data_size, const gles2::Uniform4f& c) {
+    uint32 immediate_data_size, const gles2::cmds::Uniform4f& c) {
   GLint location = static_cast<GLint>(c.location);
   GLfloat x = static_cast<GLfloat>(c.x);
   GLfloat y = static_cast<GLfloat>(c.y);
@@ -2208,7 +2220,7 @@ error::Error GLES2DecoderImpl::HandleUniform4f(
 }
 
 error::Error GLES2DecoderImpl::HandleUniform4fv(
-    uint32 immediate_data_size, const gles2::Uniform4fv& c) {
+    uint32 immediate_data_size, const gles2::cmds::Uniform4fv& c) {
   GLint location = static_cast<GLint>(c.location);
   GLsizei count = static_cast<GLsizei>(c.count);
   uint32 data_size;
@@ -2225,7 +2237,7 @@ error::Error GLES2DecoderImpl::HandleUniform4fv(
 }
 
 error::Error GLES2DecoderImpl::HandleUniform4fvImmediate(
-    uint32 immediate_data_size, const gles2::Uniform4fvImmediate& c) {
+    uint32 immediate_data_size, const gles2::cmds::Uniform4fvImmediate& c) {
   GLint location = static_cast<GLint>(c.location);
   GLsizei count = static_cast<GLsizei>(c.count);
   uint32 data_size;
@@ -2245,7 +2257,7 @@ error::Error GLES2DecoderImpl::HandleUniform4fvImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleUniform4i(
-    uint32 immediate_data_size, const gles2::Uniform4i& c) {
+    uint32 immediate_data_size, const gles2::cmds::Uniform4i& c) {
   GLint location = static_cast<GLint>(c.location);
   GLint x = static_cast<GLint>(c.x);
   GLint y = static_cast<GLint>(c.y);
@@ -2257,7 +2269,7 @@ error::Error GLES2DecoderImpl::HandleUniform4i(
 }
 
 error::Error GLES2DecoderImpl::HandleUniform4iv(
-    uint32 immediate_data_size, const gles2::Uniform4iv& c) {
+    uint32 immediate_data_size, const gles2::cmds::Uniform4iv& c) {
   GLint location = static_cast<GLint>(c.location);
   GLsizei count = static_cast<GLsizei>(c.count);
   uint32 data_size;
@@ -2274,7 +2286,7 @@ error::Error GLES2DecoderImpl::HandleUniform4iv(
 }
 
 error::Error GLES2DecoderImpl::HandleUniform4ivImmediate(
-    uint32 immediate_data_size, const gles2::Uniform4ivImmediate& c) {
+    uint32 immediate_data_size, const gles2::cmds::Uniform4ivImmediate& c) {
   GLint location = static_cast<GLint>(c.location);
   GLsizei count = static_cast<GLsizei>(c.count);
   uint32 data_size;
@@ -2294,7 +2306,7 @@ error::Error GLES2DecoderImpl::HandleUniform4ivImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleUniformMatrix2fv(
-    uint32 immediate_data_size, const gles2::UniformMatrix2fv& c) {
+    uint32 immediate_data_size, const gles2::cmds::UniformMatrix2fv& c) {
   GLint location = static_cast<GLint>(c.location);
   GLsizei count = static_cast<GLsizei>(c.count);
   GLboolean transpose = static_cast<GLboolean>(c.transpose);
@@ -2317,7 +2329,8 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix2fv(
 }
 
 error::Error GLES2DecoderImpl::HandleUniformMatrix2fvImmediate(
-    uint32 immediate_data_size, const gles2::UniformMatrix2fvImmediate& c) {
+    uint32 immediate_data_size,
+    const gles2::cmds::UniformMatrix2fvImmediate& c) {
   GLint location = static_cast<GLint>(c.location);
   GLsizei count = static_cast<GLsizei>(c.count);
   GLboolean transpose = static_cast<GLboolean>(c.transpose);
@@ -2343,7 +2356,7 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix2fvImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleUniformMatrix3fv(
-    uint32 immediate_data_size, const gles2::UniformMatrix3fv& c) {
+    uint32 immediate_data_size, const gles2::cmds::UniformMatrix3fv& c) {
   GLint location = static_cast<GLint>(c.location);
   GLsizei count = static_cast<GLsizei>(c.count);
   GLboolean transpose = static_cast<GLboolean>(c.transpose);
@@ -2366,7 +2379,8 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix3fv(
 }
 
 error::Error GLES2DecoderImpl::HandleUniformMatrix3fvImmediate(
-    uint32 immediate_data_size, const gles2::UniformMatrix3fvImmediate& c) {
+    uint32 immediate_data_size,
+    const gles2::cmds::UniformMatrix3fvImmediate& c) {
   GLint location = static_cast<GLint>(c.location);
   GLsizei count = static_cast<GLsizei>(c.count);
   GLboolean transpose = static_cast<GLboolean>(c.transpose);
@@ -2392,7 +2406,7 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix3fvImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleUniformMatrix4fv(
-    uint32 immediate_data_size, const gles2::UniformMatrix4fv& c) {
+    uint32 immediate_data_size, const gles2::cmds::UniformMatrix4fv& c) {
   GLint location = static_cast<GLint>(c.location);
   GLsizei count = static_cast<GLsizei>(c.count);
   GLboolean transpose = static_cast<GLboolean>(c.transpose);
@@ -2415,7 +2429,8 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix4fv(
 }
 
 error::Error GLES2DecoderImpl::HandleUniformMatrix4fvImmediate(
-    uint32 immediate_data_size, const gles2::UniformMatrix4fvImmediate& c) {
+    uint32 immediate_data_size,
+    const gles2::cmds::UniformMatrix4fvImmediate& c) {
   GLint location = static_cast<GLint>(c.location);
   GLsizei count = static_cast<GLsizei>(c.count);
   GLboolean transpose = static_cast<GLboolean>(c.transpose);
@@ -2441,21 +2456,21 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix4fvImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleUseProgram(
-    uint32 immediate_data_size, const gles2::UseProgram& c) {
+    uint32 immediate_data_size, const gles2::cmds::UseProgram& c) {
   GLuint program = c.program;
   DoUseProgram(program);
   return error::kNoError;
 }
 
 error::Error GLES2DecoderImpl::HandleValidateProgram(
-    uint32 immediate_data_size, const gles2::ValidateProgram& c) {
+    uint32 immediate_data_size, const gles2::cmds::ValidateProgram& c) {
   GLuint program = c.program;
   DoValidateProgram(program);
   return error::kNoError;
 }
 
 error::Error GLES2DecoderImpl::HandleVertexAttrib1f(
-    uint32 immediate_data_size, const gles2::VertexAttrib1f& c) {
+    uint32 immediate_data_size, const gles2::cmds::VertexAttrib1f& c) {
   GLuint indx = static_cast<GLuint>(c.indx);
   GLfloat x = static_cast<GLfloat>(c.x);
   DoVertexAttrib1f(indx, x);
@@ -2463,7 +2478,7 @@ error::Error GLES2DecoderImpl::HandleVertexAttrib1f(
 }
 
 error::Error GLES2DecoderImpl::HandleVertexAttrib1fv(
-    uint32 immediate_data_size, const gles2::VertexAttrib1fv& c) {
+    uint32 immediate_data_size, const gles2::cmds::VertexAttrib1fv& c) {
   GLuint indx = static_cast<GLuint>(c.indx);
   uint32 data_size;
   if (!ComputeDataSize(1, sizeof(GLfloat), 1, &data_size)) {
@@ -2479,7 +2494,8 @@ error::Error GLES2DecoderImpl::HandleVertexAttrib1fv(
 }
 
 error::Error GLES2DecoderImpl::HandleVertexAttrib1fvImmediate(
-    uint32 immediate_data_size, const gles2::VertexAttrib1fvImmediate& c) {
+    uint32 immediate_data_size,
+    const gles2::cmds::VertexAttrib1fvImmediate& c) {
   GLuint indx = static_cast<GLuint>(c.indx);
   uint32 data_size;
   if (!ComputeDataSize(1, sizeof(GLfloat), 1, &data_size)) {
@@ -2498,7 +2514,7 @@ error::Error GLES2DecoderImpl::HandleVertexAttrib1fvImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleVertexAttrib2f(
-    uint32 immediate_data_size, const gles2::VertexAttrib2f& c) {
+    uint32 immediate_data_size, const gles2::cmds::VertexAttrib2f& c) {
   GLuint indx = static_cast<GLuint>(c.indx);
   GLfloat x = static_cast<GLfloat>(c.x);
   GLfloat y = static_cast<GLfloat>(c.y);
@@ -2507,7 +2523,7 @@ error::Error GLES2DecoderImpl::HandleVertexAttrib2f(
 }
 
 error::Error GLES2DecoderImpl::HandleVertexAttrib2fv(
-    uint32 immediate_data_size, const gles2::VertexAttrib2fv& c) {
+    uint32 immediate_data_size, const gles2::cmds::VertexAttrib2fv& c) {
   GLuint indx = static_cast<GLuint>(c.indx);
   uint32 data_size;
   if (!ComputeDataSize(1, sizeof(GLfloat), 2, &data_size)) {
@@ -2523,7 +2539,8 @@ error::Error GLES2DecoderImpl::HandleVertexAttrib2fv(
 }
 
 error::Error GLES2DecoderImpl::HandleVertexAttrib2fvImmediate(
-    uint32 immediate_data_size, const gles2::VertexAttrib2fvImmediate& c) {
+    uint32 immediate_data_size,
+    const gles2::cmds::VertexAttrib2fvImmediate& c) {
   GLuint indx = static_cast<GLuint>(c.indx);
   uint32 data_size;
   if (!ComputeDataSize(1, sizeof(GLfloat), 2, &data_size)) {
@@ -2542,7 +2559,7 @@ error::Error GLES2DecoderImpl::HandleVertexAttrib2fvImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleVertexAttrib3f(
-    uint32 immediate_data_size, const gles2::VertexAttrib3f& c) {
+    uint32 immediate_data_size, const gles2::cmds::VertexAttrib3f& c) {
   GLuint indx = static_cast<GLuint>(c.indx);
   GLfloat x = static_cast<GLfloat>(c.x);
   GLfloat y = static_cast<GLfloat>(c.y);
@@ -2552,7 +2569,7 @@ error::Error GLES2DecoderImpl::HandleVertexAttrib3f(
 }
 
 error::Error GLES2DecoderImpl::HandleVertexAttrib3fv(
-    uint32 immediate_data_size, const gles2::VertexAttrib3fv& c) {
+    uint32 immediate_data_size, const gles2::cmds::VertexAttrib3fv& c) {
   GLuint indx = static_cast<GLuint>(c.indx);
   uint32 data_size;
   if (!ComputeDataSize(1, sizeof(GLfloat), 3, &data_size)) {
@@ -2568,7 +2585,8 @@ error::Error GLES2DecoderImpl::HandleVertexAttrib3fv(
 }
 
 error::Error GLES2DecoderImpl::HandleVertexAttrib3fvImmediate(
-    uint32 immediate_data_size, const gles2::VertexAttrib3fvImmediate& c) {
+    uint32 immediate_data_size,
+    const gles2::cmds::VertexAttrib3fvImmediate& c) {
   GLuint indx = static_cast<GLuint>(c.indx);
   uint32 data_size;
   if (!ComputeDataSize(1, sizeof(GLfloat), 3, &data_size)) {
@@ -2587,7 +2605,7 @@ error::Error GLES2DecoderImpl::HandleVertexAttrib3fvImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleVertexAttrib4f(
-    uint32 immediate_data_size, const gles2::VertexAttrib4f& c) {
+    uint32 immediate_data_size, const gles2::cmds::VertexAttrib4f& c) {
   GLuint indx = static_cast<GLuint>(c.indx);
   GLfloat x = static_cast<GLfloat>(c.x);
   GLfloat y = static_cast<GLfloat>(c.y);
@@ -2598,7 +2616,7 @@ error::Error GLES2DecoderImpl::HandleVertexAttrib4f(
 }
 
 error::Error GLES2DecoderImpl::HandleVertexAttrib4fv(
-    uint32 immediate_data_size, const gles2::VertexAttrib4fv& c) {
+    uint32 immediate_data_size, const gles2::cmds::VertexAttrib4fv& c) {
   GLuint indx = static_cast<GLuint>(c.indx);
   uint32 data_size;
   if (!ComputeDataSize(1, sizeof(GLfloat), 4, &data_size)) {
@@ -2614,7 +2632,8 @@ error::Error GLES2DecoderImpl::HandleVertexAttrib4fv(
 }
 
 error::Error GLES2DecoderImpl::HandleVertexAttrib4fvImmediate(
-    uint32 immediate_data_size, const gles2::VertexAttrib4fvImmediate& c) {
+    uint32 immediate_data_size,
+    const gles2::cmds::VertexAttrib4fvImmediate& c) {
   GLuint indx = static_cast<GLuint>(c.indx);
   uint32 data_size;
   if (!ComputeDataSize(1, sizeof(GLfloat), 4, &data_size)) {
@@ -2633,7 +2652,7 @@ error::Error GLES2DecoderImpl::HandleVertexAttrib4fvImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleViewport(
-    uint32 immediate_data_size, const gles2::Viewport& c) {
+    uint32 immediate_data_size, const gles2::cmds::Viewport& c) {
   GLint x = static_cast<GLint>(c.x);
   GLint y = static_cast<GLint>(c.y);
   GLsizei width = static_cast<GLsizei>(c.width);
@@ -2651,7 +2670,7 @@ error::Error GLES2DecoderImpl::HandleViewport(
 }
 
 error::Error GLES2DecoderImpl::HandleBlitFramebufferEXT(
-    uint32 immediate_data_size, const gles2::BlitFramebufferEXT& c) {
+    uint32 immediate_data_size, const gles2::cmds::BlitFramebufferEXT& c) {
   if (ShouldDeferDraws() || ShouldDeferReads())
     return error::kDeferCommandUntilLater;
   GLint srcX0 = static_cast<GLint>(c.srcX0);
@@ -2675,7 +2694,7 @@ error::Error GLES2DecoderImpl::HandleBlitFramebufferEXT(
 
 error::Error GLES2DecoderImpl::HandleRenderbufferStorageMultisampleEXT(
     uint32 immediate_data_size,
-    const gles2::RenderbufferStorageMultisampleEXT& c) {
+    const gles2::cmds::RenderbufferStorageMultisampleEXT& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLsizei samples = static_cast<GLsizei>(c.samples);
   GLenum internalformat = static_cast<GLenum>(c.internalformat);
@@ -2712,7 +2731,7 @@ error::Error GLES2DecoderImpl::HandleRenderbufferStorageMultisampleEXT(
 }
 
 error::Error GLES2DecoderImpl::HandleTexStorage2DEXT(
-    uint32 immediate_data_size, const gles2::TexStorage2DEXT& c) {
+    uint32 immediate_data_size, const gles2::cmds::TexStorage2DEXT& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLsizei levels = static_cast<GLsizei>(c.levels);
   GLenum internalFormat = static_cast<GLenum>(c.internalFormat);
@@ -2744,7 +2763,7 @@ error::Error GLES2DecoderImpl::HandleTexStorage2DEXT(
 }
 
 error::Error GLES2DecoderImpl::HandleGenQueriesEXT(
-    uint32 immediate_data_size, const gles2::GenQueriesEXT& c) {
+    uint32 immediate_data_size, const gles2::cmds::GenQueriesEXT& c) {
   GLsizei n = static_cast<GLsizei>(c.n);
   uint32 data_size;
   if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
@@ -2762,7 +2781,7 @@ error::Error GLES2DecoderImpl::HandleGenQueriesEXT(
 }
 
 error::Error GLES2DecoderImpl::HandleGenQueriesEXTImmediate(
-    uint32 immediate_data_size, const gles2::GenQueriesEXTImmediate& c) {
+    uint32 immediate_data_size, const gles2::cmds::GenQueriesEXTImmediate& c) {
   GLsizei n = static_cast<GLsizei>(c.n);
   uint32 data_size;
   if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
@@ -2780,7 +2799,7 @@ error::Error GLES2DecoderImpl::HandleGenQueriesEXTImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleDeleteQueriesEXT(
-    uint32 immediate_data_size, const gles2::DeleteQueriesEXT& c) {
+    uint32 immediate_data_size, const gles2::cmds::DeleteQueriesEXT& c) {
   GLsizei n = static_cast<GLsizei>(c.n);
   uint32 data_size;
   if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
@@ -2796,7 +2815,8 @@ error::Error GLES2DecoderImpl::HandleDeleteQueriesEXT(
 }
 
 error::Error GLES2DecoderImpl::HandleDeleteQueriesEXTImmediate(
-    uint32 immediate_data_size, const gles2::DeleteQueriesEXTImmediate& c) {
+    uint32 immediate_data_size,
+    const gles2::cmds::DeleteQueriesEXTImmediate& c) {
   GLsizei n = static_cast<GLsizei>(c.n);
   uint32 data_size;
   if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
@@ -2812,7 +2832,7 @@ error::Error GLES2DecoderImpl::HandleDeleteQueriesEXTImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleInsertEventMarkerEXT(
-  uint32 immediate_data_size, const gles2::InsertEventMarkerEXT& c) {
+  uint32 immediate_data_size, const gles2::cmds::InsertEventMarkerEXT& c) {
   GLuint bucket_id = static_cast<GLuint>(c.bucket_id);
   Bucket* bucket = GetBucket(bucket_id);
   if (!bucket || bucket->size() == 0) {
@@ -2827,7 +2847,7 @@ error::Error GLES2DecoderImpl::HandleInsertEventMarkerEXT(
 }
 
 error::Error GLES2DecoderImpl::HandlePushGroupMarkerEXT(
-  uint32 immediate_data_size, const gles2::PushGroupMarkerEXT& c) {
+  uint32 immediate_data_size, const gles2::cmds::PushGroupMarkerEXT& c) {
   GLuint bucket_id = static_cast<GLuint>(c.bucket_id);
   Bucket* bucket = GetBucket(bucket_id);
   if (!bucket || bucket->size() == 0) {
@@ -2842,13 +2862,13 @@ error::Error GLES2DecoderImpl::HandlePushGroupMarkerEXT(
 }
 
 error::Error GLES2DecoderImpl::HandlePopGroupMarkerEXT(
-    uint32 immediate_data_size, const gles2::PopGroupMarkerEXT& c) {
+    uint32 immediate_data_size, const gles2::cmds::PopGroupMarkerEXT& c) {
   DoPopGroupMarkerEXT();
   return error::kNoError;
 }
 
 error::Error GLES2DecoderImpl::HandleGenVertexArraysOES(
-    uint32 immediate_data_size, const gles2::GenVertexArraysOES& c) {
+    uint32 immediate_data_size, const gles2::cmds::GenVertexArraysOES& c) {
   GLsizei n = static_cast<GLsizei>(c.n);
   uint32 data_size;
   if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
@@ -2866,7 +2886,8 @@ error::Error GLES2DecoderImpl::HandleGenVertexArraysOES(
 }
 
 error::Error GLES2DecoderImpl::HandleGenVertexArraysOESImmediate(
-    uint32 immediate_data_size, const gles2::GenVertexArraysOESImmediate& c) {
+    uint32 immediate_data_size,
+    const gles2::cmds::GenVertexArraysOESImmediate& c) {
   GLsizei n = static_cast<GLsizei>(c.n);
   uint32 data_size;
   if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
@@ -2884,7 +2905,7 @@ error::Error GLES2DecoderImpl::HandleGenVertexArraysOESImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleDeleteVertexArraysOES(
-    uint32 immediate_data_size, const gles2::DeleteVertexArraysOES& c) {
+    uint32 immediate_data_size, const gles2::cmds::DeleteVertexArraysOES& c) {
   GLsizei n = static_cast<GLsizei>(c.n);
   uint32 data_size;
   if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
@@ -2901,7 +2922,7 @@ error::Error GLES2DecoderImpl::HandleDeleteVertexArraysOES(
 
 error::Error GLES2DecoderImpl::HandleDeleteVertexArraysOESImmediate(
     uint32 immediate_data_size,
-    const gles2::DeleteVertexArraysOESImmediate& c) {
+    const gles2::cmds::DeleteVertexArraysOESImmediate& c) {
   GLsizei n = static_cast<GLsizei>(c.n);
   uint32 data_size;
   if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
@@ -2917,9 +2938,9 @@ error::Error GLES2DecoderImpl::HandleDeleteVertexArraysOESImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleIsVertexArrayOES(
-    uint32 immediate_data_size, const gles2::IsVertexArrayOES& c) {
+    uint32 immediate_data_size, const gles2::cmds::IsVertexArrayOES& c) {
   GLuint array = c.array;
-  typedef IsVertexArrayOES::Result Result;
+  typedef cmds::IsVertexArrayOES::Result Result;
   Result* result_dst = GetSharedMemoryAs<Result*>(
       c.result_shm_id, c.result_shm_offset, sizeof(*result_dst));
   if (!result_dst) {
@@ -2930,19 +2951,20 @@ error::Error GLES2DecoderImpl::HandleIsVertexArrayOES(
 }
 
 error::Error GLES2DecoderImpl::HandleBindVertexArrayOES(
-    uint32 immediate_data_size, const gles2::BindVertexArrayOES& c) {
+    uint32 immediate_data_size, const gles2::cmds::BindVertexArrayOES& c) {
   GLuint array = c.array;
   DoBindVertexArrayOES(array);
   return error::kNoError;
 }
 
 error::Error GLES2DecoderImpl::HandleGetMaxValueInBufferCHROMIUM(
-    uint32 immediate_data_size, const gles2::GetMaxValueInBufferCHROMIUM& c) {
+    uint32 immediate_data_size,
+    const gles2::cmds::GetMaxValueInBufferCHROMIUM& c) {
   GLuint buffer_id = c.buffer_id;
   GLsizei count = static_cast<GLsizei>(c.count);
   GLenum type = static_cast<GLenum>(c.type);
   GLuint offset = static_cast<GLuint>(c.offset);
-  typedef GetMaxValueInBufferCHROMIUM::Result Result;
+  typedef cmds::GetMaxValueInBufferCHROMIUM::Result Result;
   Result* result_dst = GetSharedMemoryAs<Result*>(
       c.result_shm_id, c.result_shm_offset, sizeof(*result_dst));
   if (!result_dst) {
@@ -2961,7 +2983,8 @@ error::Error GLES2DecoderImpl::HandleGetMaxValueInBufferCHROMIUM(
 }
 
 error::Error GLES2DecoderImpl::HandleTexImageIOSurface2DCHROMIUM(
-    uint32 immediate_data_size, const gles2::TexImageIOSurface2DCHROMIUM& c) {
+    uint32 immediate_data_size,
+    const gles2::cmds::TexImageIOSurface2DCHROMIUM& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLsizei width = static_cast<GLsizei>(c.width);
   GLsizei height = static_cast<GLsizei>(c.height);
@@ -2985,7 +3008,7 @@ error::Error GLES2DecoderImpl::HandleTexImageIOSurface2DCHROMIUM(
 }
 
 error::Error GLES2DecoderImpl::HandleCopyTextureCHROMIUM(
-    uint32 immediate_data_size, const gles2::CopyTextureCHROMIUM& c) {
+    uint32 immediate_data_size, const gles2::cmds::CopyTextureCHROMIUM& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLenum source_id = static_cast<GLenum>(c.source_id);
   GLenum dest_id = static_cast<GLenum>(c.dest_id);
@@ -3001,7 +3024,7 @@ error::Error GLES2DecoderImpl::HandleCopyTextureCHROMIUM(
 }
 
 error::Error GLES2DecoderImpl::HandleProduceTextureCHROMIUM(
-    uint32 immediate_data_size, const gles2::ProduceTextureCHROMIUM& c) {
+    uint32 immediate_data_size, const gles2::cmds::ProduceTextureCHROMIUM& c) {
   GLenum target = static_cast<GLenum>(c.target);
   uint32 data_size;
   if (!ComputeDataSize(1, sizeof(GLbyte), 64, &data_size)) {
@@ -3022,7 +3045,7 @@ error::Error GLES2DecoderImpl::HandleProduceTextureCHROMIUM(
 
 error::Error GLES2DecoderImpl::HandleProduceTextureCHROMIUMImmediate(
     uint32 immediate_data_size,
-    const gles2::ProduceTextureCHROMIUMImmediate& c) {
+    const gles2::cmds::ProduceTextureCHROMIUMImmediate& c) {
   GLenum target = static_cast<GLenum>(c.target);
   uint32 data_size;
   if (!ComputeDataSize(1, sizeof(GLbyte), 64, &data_size)) {
@@ -3045,7 +3068,7 @@ error::Error GLES2DecoderImpl::HandleProduceTextureCHROMIUMImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleConsumeTextureCHROMIUM(
-    uint32 immediate_data_size, const gles2::ConsumeTextureCHROMIUM& c) {
+    uint32 immediate_data_size, const gles2::cmds::ConsumeTextureCHROMIUM& c) {
   GLenum target = static_cast<GLenum>(c.target);
   uint32 data_size;
   if (!ComputeDataSize(1, sizeof(GLbyte), 64, &data_size)) {
@@ -3066,7 +3089,7 @@ error::Error GLES2DecoderImpl::HandleConsumeTextureCHROMIUM(
 
 error::Error GLES2DecoderImpl::HandleConsumeTextureCHROMIUMImmediate(
     uint32 immediate_data_size,
-    const gles2::ConsumeTextureCHROMIUMImmediate& c) {
+    const gles2::cmds::ConsumeTextureCHROMIUMImmediate& c) {
   GLenum target = static_cast<GLenum>(c.target);
   uint32 data_size;
   if (!ComputeDataSize(1, sizeof(GLbyte), 64, &data_size)) {
@@ -3089,7 +3112,7 @@ error::Error GLES2DecoderImpl::HandleConsumeTextureCHROMIUMImmediate(
 }
 
 error::Error GLES2DecoderImpl::HandleBindTexImage2DCHROMIUM(
-    uint32 immediate_data_size, const gles2::BindTexImage2DCHROMIUM& c) {
+    uint32 immediate_data_size, const gles2::cmds::BindTexImage2DCHROMIUM& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLint imageId = static_cast<GLint>(c.imageId);
   if (!validators_->texture_bind_target.IsValid(target)) {
@@ -3101,7 +3124,8 @@ error::Error GLES2DecoderImpl::HandleBindTexImage2DCHROMIUM(
 }
 
 error::Error GLES2DecoderImpl::HandleReleaseTexImage2DCHROMIUM(
-    uint32 immediate_data_size, const gles2::ReleaseTexImage2DCHROMIUM& c) {
+    uint32 immediate_data_size,
+    const gles2::cmds::ReleaseTexImage2DCHROMIUM& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLint imageId = static_cast<GLint>(c.imageId);
   if (!validators_->texture_bind_target.IsValid(target)) {
@@ -3113,13 +3137,13 @@ error::Error GLES2DecoderImpl::HandleReleaseTexImage2DCHROMIUM(
 }
 
 error::Error GLES2DecoderImpl::HandleTraceEndCHROMIUM(
-    uint32 immediate_data_size, const gles2::TraceEndCHROMIUM& c) {
+    uint32 immediate_data_size, const gles2::cmds::TraceEndCHROMIUM& c) {
   DoTraceEndCHROMIUM();
   return error::kNoError;
 }
 
 error::Error GLES2DecoderImpl::HandleDiscardFramebufferEXT(
-    uint32 immediate_data_size, const gles2::DiscardFramebufferEXT& c) {
+    uint32 immediate_data_size, const gles2::cmds::DiscardFramebufferEXT& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLsizei count = static_cast<GLsizei>(c.count);
   uint32 data_size;
@@ -3141,7 +3165,7 @@ error::Error GLES2DecoderImpl::HandleDiscardFramebufferEXT(
 
 error::Error GLES2DecoderImpl::HandleDiscardFramebufferEXTImmediate(
     uint32 immediate_data_size,
-    const gles2::DiscardFramebufferEXTImmediate& c) {
+    const gles2::cmds::DiscardFramebufferEXTImmediate& c) {
   GLenum target = static_cast<GLenum>(c.target);
   GLsizei count = static_cast<GLsizei>(c.count);
   uint32 data_size;