Change glimage to accept a type.

gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h

Index: gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h
diff --git a/gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h b/gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h
index b54aa799179ebde7db84f69bcb5c694da2f16e94..a2971125845b146802548fffa7baca7e16534a3b 100644
--- a/gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h
+++ b/gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h
@@ -12,103 +12,65 @@
 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_VALIDATION_IMPLEMENTATION_AUTOGEN_H_
 
 static const GLenum valid_attachment_table[] = {
-    GL_COLOR_ATTACHMENT0,
-    GL_DEPTH_ATTACHMENT,
-    GL_STENCIL_ATTACHMENT,
+    GL_COLOR_ATTACHMENT0, GL_DEPTH_ATTACHMENT, GL_STENCIL_ATTACHMENT,
 };
 
 static const GLenum valid_backbuffer_attachment_table[] = {
-    GL_COLOR_EXT,
-    GL_DEPTH_EXT,
-    GL_STENCIL_EXT,
+    GL_COLOR_EXT, GL_DEPTH_EXT, GL_STENCIL_EXT,
 };
 
 static const GLenum valid_blit_filter_table[] = {
-    GL_NEAREST,
-    GL_LINEAR,
+    GL_NEAREST, GL_LINEAR,
 };
 
 static const GLenum valid_buffer_parameter_table[] = {
-    GL_BUFFER_SIZE,
-    GL_BUFFER_USAGE,
+    GL_BUFFER_SIZE, GL_BUFFER_USAGE,
 };
 
 static const GLenum valid_buffer_target_table[] = {
-    GL_ARRAY_BUFFER,
-    GL_ELEMENT_ARRAY_BUFFER,
+    GL_ARRAY_BUFFER, GL_ELEMENT_ARRAY_BUFFER,
 };
 
 static const GLenum valid_buffer_usage_table[] = {
-    GL_STREAM_DRAW,
-    GL_STATIC_DRAW,
-    GL_DYNAMIC_DRAW,
+    GL_STREAM_DRAW, GL_STATIC_DRAW, GL_DYNAMIC_DRAW,
 };
 
 static const GLenum valid_capability_table[] = {
-    GL_BLEND,
-    GL_CULL_FACE,
-    GL_DEPTH_TEST,
-    GL_DITHER,
-    GL_POLYGON_OFFSET_FILL,
-    GL_SAMPLE_ALPHA_TO_COVERAGE,
-    GL_SAMPLE_COVERAGE,
-    GL_SCISSOR_TEST,
-    GL_STENCIL_TEST,
+    GL_BLEND,           GL_CULL_FACE,           GL_DEPTH_TEST,
+    GL_DITHER,          GL_POLYGON_OFFSET_FILL, GL_SAMPLE_ALPHA_TO_COVERAGE,
+    GL_SAMPLE_COVERAGE, GL_SCISSOR_TEST,        GL_STENCIL_TEST,
 };
 
 static const GLenum valid_cmp_function_table[] = {
-    GL_NEVER,
-    GL_LESS,
-    GL_EQUAL,
-    GL_LEQUAL,
-    GL_GREATER,
-    GL_NOTEQUAL,
-    GL_GEQUAL,
-    GL_ALWAYS,
+    GL_NEVER,   GL_LESS,     GL_EQUAL,  GL_LEQUAL,
+    GL_GREATER, GL_NOTEQUAL, GL_GEQUAL, GL_ALWAYS,
 };
 
 static const GLenum valid_draw_mode_table[] = {
-    GL_POINTS,
-    GL_LINE_STRIP,
-    GL_LINE_LOOP,
-    GL_LINES,
-    GL_TRIANGLE_STRIP,
-    GL_TRIANGLE_FAN,
-    GL_TRIANGLES,
+    GL_POINTS,         GL_LINE_STRIP,   GL_LINE_LOOP, GL_LINES,
+    GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES,
 };
 
 static const GLenum valid_dst_blend_factor_table[] = {
-    GL_ZERO,
-    GL_ONE,
-    GL_SRC_COLOR,
-    GL_ONE_MINUS_SRC_COLOR,
-    GL_DST_COLOR,
-    GL_ONE_MINUS_DST_COLOR,
-    GL_SRC_ALPHA,
-    GL_ONE_MINUS_SRC_ALPHA,
-    GL_DST_ALPHA,
-    GL_ONE_MINUS_DST_ALPHA,
-    GL_CONSTANT_COLOR,
-    GL_ONE_MINUS_CONSTANT_COLOR,
-    GL_CONSTANT_ALPHA,
-    GL_ONE_MINUS_CONSTANT_ALPHA,
+    GL_ZERO,           GL_ONE,
+    GL_SRC_COLOR,      GL_ONE_MINUS_SRC_COLOR,
+    GL_DST_COLOR,      GL_ONE_MINUS_DST_COLOR,
+    GL_SRC_ALPHA,      GL_ONE_MINUS_SRC_ALPHA,
+    GL_DST_ALPHA,      GL_ONE_MINUS_DST_ALPHA,
+    GL_CONSTANT_COLOR, GL_ONE_MINUS_CONSTANT_COLOR,
+    GL_CONSTANT_ALPHA, GL_ONE_MINUS_CONSTANT_ALPHA,
 };
 
 static const GLenum valid_equation_table[] = {
-    GL_FUNC_ADD,
-    GL_FUNC_SUBTRACT,
-    GL_FUNC_REVERSE_SUBTRACT,
+    GL_FUNC_ADD, GL_FUNC_SUBTRACT, GL_FUNC_REVERSE_SUBTRACT,
 };
 
 static const GLenum valid_face_mode_table[] = {
-    GL_CW,
-    GL_CCW,
+    GL_CW, GL_CCW,
 };
 
 static const GLenum valid_face_type_table[] = {
-    GL_FRONT,
-    GL_BACK,
-    GL_FRONT_AND_BACK,
+    GL_FRONT, GL_BACK, GL_FRONT_AND_BACK,
 };
 
 static const GLboolean valid_false_only_table[] = {
@@ -229,20 +191,15 @@ static const GLenum valid_g_l_state_table[] = {
 };
 
 static const GLenum valid_get_max_index_type_table[] = {
-    GL_UNSIGNED_BYTE,
-    GL_UNSIGNED_SHORT,
-    GL_UNSIGNED_INT,
+    GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, GL_UNSIGNED_INT,
 };
 
 static const GLenum valid_get_tex_param_target_table[] = {
-    GL_TEXTURE_2D,
-    GL_TEXTURE_CUBE_MAP,
+    GL_TEXTURE_2D, GL_TEXTURE_CUBE_MAP,
 };
 
 static const GLenum valid_hint_mode_table[] = {
-    GL_FASTEST,
-    GL_NICEST,
-    GL_DONT_CARE,
+    GL_FASTEST, GL_NICEST, GL_DONT_CARE,
 };
 
 static const GLenum valid_hint_target_table[] = {
@@ -250,8 +207,7 @@ static const GLenum valid_hint_target_table[] = {
 };
 
 static const GLenum valid_index_type_table[] = {
-    GL_UNSIGNED_BYTE,
-    GL_UNSIGNED_SHORT,
+    GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT,
 };
 
 static const GLenum valid_pixel_store_table[] = {
@@ -263,34 +219,24 @@ static const GLenum valid_pixel_store_table[] = {
 };
 
 static const GLint valid_pixel_store_alignment_table[] = {
-    1,
-    2,
-    4,
-    8,
+    1, 2, 4, 8,
 };
 
 static const GLenum valid_pixel_type_table[] = {
-    GL_UNSIGNED_BYTE,
-    GL_UNSIGNED_SHORT_5_6_5,
-    GL_UNSIGNED_SHORT_4_4_4_4,
+    GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_4_4_4_4,
     GL_UNSIGNED_SHORT_5_5_5_1,
 };
 
 static const GLenum valid_program_parameter_table[] = {
-    GL_DELETE_STATUS,
-    GL_LINK_STATUS,
-    GL_VALIDATE_STATUS,
-    GL_INFO_LOG_LENGTH,
-    GL_ATTACHED_SHADERS,
-    GL_ACTIVE_ATTRIBUTES,
-    GL_ACTIVE_ATTRIBUTE_MAX_LENGTH,
-    GL_ACTIVE_UNIFORMS,
+    GL_DELETE_STATUS,               GL_LINK_STATUS,
+    GL_VALIDATE_STATUS,             GL_INFO_LOG_LENGTH,
+    GL_ATTACHED_SHADERS,            GL_ACTIVE_ATTRIBUTES,
+    GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, GL_ACTIVE_UNIFORMS,
     GL_ACTIVE_UNIFORM_MAX_LENGTH,
 };
 
 static const GLenum valid_query_object_parameter_table[] = {
-    GL_QUERY_RESULT_EXT,
-    GL_QUERY_RESULT_AVAILABLE_EXT,
+    GL_QUERY_RESULT_EXT, GL_QUERY_RESULT_AVAILABLE_EXT,
 };
 
 static const GLenum valid_query_parameter_table[] = {
@@ -308,35 +254,23 @@ static const GLenum valid_query_target_table[] = {
 };
 
 static const GLenum valid_read_pixel_format_table[] = {
-    GL_ALPHA,
-    GL_RGB,
-    GL_RGBA,
+    GL_ALPHA, GL_RGB, GL_RGBA,
 };
 
 static const GLenum valid_read_pixel_type_table[] = {
-    GL_UNSIGNED_BYTE,
-    GL_UNSIGNED_SHORT_5_6_5,
-    GL_UNSIGNED_SHORT_4_4_4_4,
+    GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_4_4_4_4,
     GL_UNSIGNED_SHORT_5_5_5_1,
 };
 
 static const GLenum valid_render_buffer_format_table[] = {
-    GL_RGBA4,
-    GL_RGB565,
-    GL_RGB5_A1,
-    GL_DEPTH_COMPONENT16,
-    GL_STENCIL_INDEX8,
+    GL_RGBA4, GL_RGB565, GL_RGB5_A1, GL_DEPTH_COMPONENT16, GL_STENCIL_INDEX8,
 };
 
 static const GLenum valid_render_buffer_parameter_table[] = {
-    GL_RENDERBUFFER_RED_SIZE,
-    GL_RENDERBUFFER_GREEN_SIZE,
-    GL_RENDERBUFFER_BLUE_SIZE,
-    GL_RENDERBUFFER_ALPHA_SIZE,
-    GL_RENDERBUFFER_DEPTH_SIZE,
-    GL_RENDERBUFFER_STENCIL_SIZE,
-    GL_RENDERBUFFER_WIDTH,
-    GL_RENDERBUFFER_HEIGHT,
+    GL_RENDERBUFFER_RED_SIZE,        GL_RENDERBUFFER_GREEN_SIZE,
+    GL_RENDERBUFFER_BLUE_SIZE,       GL_RENDERBUFFER_ALPHA_SIZE,
+    GL_RENDERBUFFER_DEPTH_SIZE,      GL_RENDERBUFFER_STENCIL_SIZE,
+    GL_RENDERBUFFER_WIDTH,           GL_RENDERBUFFER_HEIGHT,
     GL_RENDERBUFFER_INTERNAL_FORMAT,
 };
 
@@ -345,74 +279,48 @@ static const GLenum valid_render_buffer_target_table[] = {
 };
 
 static const GLenum valid_reset_status_table[] = {
-    GL_GUILTY_CONTEXT_RESET_ARB,
-    GL_INNOCENT_CONTEXT_RESET_ARB,
+    GL_GUILTY_CONTEXT_RESET_ARB, GL_INNOCENT_CONTEXT_RESET_ARB,
     GL_UNKNOWN_CONTEXT_RESET_ARB,
 };
 
 static const GLenum valid_shader_parameter_table[] = {
-    GL_SHADER_TYPE,
-    GL_DELETE_STATUS,
-    GL_COMPILE_STATUS,
-    GL_INFO_LOG_LENGTH,
-    GL_SHADER_SOURCE_LENGTH,
-    GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE,
+    GL_SHADER_TYPE,          GL_DELETE_STATUS,
+    GL_COMPILE_STATUS,       GL_INFO_LOG_LENGTH,
+    GL_SHADER_SOURCE_LENGTH, GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE,
 };
 
 static const GLenum valid_shader_precision_table[] = {
-    GL_LOW_FLOAT,
-    GL_MEDIUM_FLOAT,
-    GL_HIGH_FLOAT,
-    GL_LOW_INT,
-    GL_MEDIUM_INT,
-    GL_HIGH_INT,
+    GL_LOW_FLOAT, GL_MEDIUM_FLOAT, GL_HIGH_FLOAT,
+    GL_LOW_INT,   GL_MEDIUM_INT,   GL_HIGH_INT,
 };
 
 static const GLenum valid_shader_type_table[] = {
-    GL_VERTEX_SHADER,
-    GL_FRAGMENT_SHADER,
+    GL_VERTEX_SHADER, GL_FRAGMENT_SHADER,
 };
 
 static const GLenum valid_src_blend_factor_table[] = {
-    GL_ZERO,
-    GL_ONE,
-    GL_SRC_COLOR,
-    GL_ONE_MINUS_SRC_COLOR,
-    GL_DST_COLOR,
-    GL_ONE_MINUS_DST_COLOR,
-    GL_SRC_ALPHA,
-    GL_ONE_MINUS_SRC_ALPHA,
-    GL_DST_ALPHA,
-    GL_ONE_MINUS_DST_ALPHA,
-    GL_CONSTANT_COLOR,
-    GL_ONE_MINUS_CONSTANT_COLOR,
-    GL_CONSTANT_ALPHA,
-    GL_ONE_MINUS_CONSTANT_ALPHA,
+    GL_ZERO,               GL_ONE,
+    GL_SRC_COLOR,          GL_ONE_MINUS_SRC_COLOR,
+    GL_DST_COLOR,          GL_ONE_MINUS_DST_COLOR,
+    GL_SRC_ALPHA,          GL_ONE_MINUS_SRC_ALPHA,
+    GL_DST_ALPHA,          GL_ONE_MINUS_DST_ALPHA,
+    GL_CONSTANT_COLOR,     GL_ONE_MINUS_CONSTANT_COLOR,
+    GL_CONSTANT_ALPHA,     GL_ONE_MINUS_CONSTANT_ALPHA,
     GL_SRC_ALPHA_SATURATE,
 };
 
 static const GLenum valid_stencil_op_table[] = {
-    GL_KEEP,
-    GL_ZERO,
-    GL_REPLACE,
-    GL_INCR,
-    GL_INCR_WRAP,
-    GL_DECR,
-    GL_DECR_WRAP,
-    GL_INVERT,
+    GL_KEEP,      GL_ZERO, GL_REPLACE,   GL_INCR,
+    GL_INCR_WRAP, GL_DECR, GL_DECR_WRAP, GL_INVERT,
 };
 
 static const GLenum valid_string_type_table[] = {
-    GL_VENDOR,
-    GL_RENDERER,
-    GL_VERSION,
-    GL_SHADING_LANGUAGE_VERSION,
-    GL_EXTENSIONS,
+    GL_VENDOR,                   GL_RENDERER,   GL_VERSION,
+    GL_SHADING_LANGUAGE_VERSION, GL_EXTENSIONS,
 };
 
 static const GLenum valid_texture_bind_target_table[] = {
-    GL_TEXTURE_2D,
-    GL_TEXTURE_CUBE_MAP,
+    GL_TEXTURE_2D, GL_TEXTURE_CUBE_MAP,
 };
 
 static const GLint valid_texture_border_table[] = {
@@ -420,102 +328,64 @@ static const GLint valid_texture_border_table[] = {
 };
 
 static const GLenum valid_texture_format_table[] = {
-    GL_ALPHA,
-    GL_LUMINANCE,
-    GL_LUMINANCE_ALPHA,
-    GL_RGB,
-    GL_RGBA,
+    GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_RGB, GL_RGBA,
 };
 
 static const GLenum valid_texture_internal_format_table[] = {
-    GL_ALPHA,
-    GL_LUMINANCE,
-    GL_LUMINANCE_ALPHA,
-    GL_RGB,
-    GL_RGBA,
+    GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_RGB, GL_RGBA,
 };
 
 static const GLenum valid_texture_internal_format_storage_table[] = {
-    GL_RGB565,
-    GL_RGBA4,
-    GL_RGB5_A1,
-    GL_ALPHA8_EXT,
-    GL_LUMINANCE8_EXT,
-    GL_LUMINANCE8_ALPHA8_EXT,
-    GL_RGB8_OES,
-    GL_RGBA8_OES,
+    GL_RGB565,         GL_RGBA4,                 GL_RGB5_A1,  GL_ALPHA8_EXT,
+    GL_LUMINANCE8_EXT, GL_LUMINANCE8_ALPHA8_EXT, GL_RGB8_OES, GL_RGBA8_OES,
 };
 
 static const GLenum valid_texture_mag_filter_mode_table[] = {
-    GL_NEAREST,
-    GL_LINEAR,
+    GL_NEAREST, GL_LINEAR,
 };
 
 static const GLenum valid_texture_min_filter_mode_table[] = {
-    GL_NEAREST,
-    GL_LINEAR,
-    GL_NEAREST_MIPMAP_NEAREST,
-    GL_LINEAR_MIPMAP_NEAREST,
-    GL_NEAREST_MIPMAP_LINEAR,
-    GL_LINEAR_MIPMAP_LINEAR,
+    GL_NEAREST,                GL_LINEAR,
+    GL_NEAREST_MIPMAP_NEAREST, GL_LINEAR_MIPMAP_NEAREST,
+    GL_NEAREST_MIPMAP_LINEAR,  GL_LINEAR_MIPMAP_LINEAR,
 };
 
 static const GLenum valid_texture_parameter_table[] = {
-    GL_TEXTURE_MAG_FILTER,
-    GL_TEXTURE_MIN_FILTER,
-    GL_TEXTURE_POOL_CHROMIUM,
-    GL_TEXTURE_WRAP_S,
-    GL_TEXTURE_WRAP_T,
+    GL_TEXTURE_MAG_FILTER, GL_TEXTURE_MIN_FILTER, GL_TEXTURE_POOL_CHROMIUM,
+    GL_TEXTURE_WRAP_S,     GL_TEXTURE_WRAP_T,
 };
 
 static const GLenum valid_texture_pool_table[] = {
-    GL_TEXTURE_POOL_MANAGED_CHROMIUM,
-    GL_TEXTURE_POOL_UNMANAGED_CHROMIUM,
+    GL_TEXTURE_POOL_MANAGED_CHROMIUM, GL_TEXTURE_POOL_UNMANAGED_CHROMIUM,
 };
 
 static const GLenum valid_texture_target_table[] = {
-    GL_TEXTURE_2D,
-    GL_TEXTURE_CUBE_MAP_POSITIVE_X,
-    GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
-    GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
-    GL_TEXTURE_CUBE_MAP_NEGATIVE_Y,
-    GL_TEXTURE_CUBE_MAP_POSITIVE_Z,
+    GL_TEXTURE_2D,                  GL_TEXTURE_CUBE_MAP_POSITIVE_X,
+    GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
+    GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z,
     GL_TEXTURE_CUBE_MAP_NEGATIVE_Z,
 };
 
 static const GLenum valid_texture_usage_table[] = {
-    GL_NONE,
-    GL_FRAMEBUFFER_ATTACHMENT_ANGLE,
+    GL_NONE, GL_FRAMEBUFFER_ATTACHMENT_ANGLE,
 };
 
 static const GLenum valid_texture_wrap_mode_table[] = {
-    GL_CLAMP_TO_EDGE,
-    GL_MIRRORED_REPEAT,
-    GL_REPEAT,
+    GL_CLAMP_TO_EDGE, GL_MIRRORED_REPEAT, GL_REPEAT,
 };
 
 static const GLint valid_vertex_attrib_size_table[] = {
-    1,
-    2,
-    3,
-    4,
+    1, 2, 3, 4,
 };
 
 static const GLenum valid_vertex_attrib_type_table[] = {
-    GL_BYTE,
-    GL_UNSIGNED_BYTE,
-    GL_SHORT,
-    GL_UNSIGNED_SHORT,
-    GL_FLOAT,
+    GL_BYTE, GL_UNSIGNED_BYTE, GL_SHORT, GL_UNSIGNED_SHORT, GL_FLOAT,
 };
 
 static const GLenum valid_vertex_attribute_table[] = {
-    GL_VERTEX_ATTRIB_ARRAY_NORMALIZED,
-    GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING,
-    GL_VERTEX_ATTRIB_ARRAY_ENABLED,
-    GL_VERTEX_ATTRIB_ARRAY_SIZE,
-    GL_VERTEX_ATTRIB_ARRAY_STRIDE,
-    GL_VERTEX_ATTRIB_ARRAY_TYPE,
+    GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING,
+    GL_VERTEX_ATTRIB_ARRAY_ENABLED,    GL_VERTEX_ATTRIB_ARRAY_SIZE,
+    GL_VERTEX_ATTRIB_ARRAY_STRIDE,     GL_VERTEX_ATTRIB_ARRAY_TYPE,
     GL_CURRENT_VERTEX_ATTRIB,
 };