Added support for Time Elapsed queries through the command buffer.

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 69cf3c4c7f1c485397d4e4e8eedc1a807fc5e9e2..40eb4c3c48b7683bfcb16e672310bd06517fa160 100644
--- a/gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h
+++ b/gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h
@@ -12,9 +12,7 @@
 #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_attachment_table_es3[] = {
@@ -22,60 +20,42 @@ static const GLenum valid_attachment_table_es3[] = {
 };
 
 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_mode_table[] = {
-    GL_INTERLEAVED_ATTRIBS,
-    GL_SEPARATE_ATTRIBS,
+    GL_INTERLEAVED_ATTRIBS, GL_SEPARATE_ATTRIBS,
 };
 
 static const GLenum valid_buffer_parameter_table[] = {
-    GL_BUFFER_SIZE,
-    GL_BUFFER_USAGE,
+    GL_BUFFER_SIZE, GL_BUFFER_USAGE,
 };
 
 static const GLenum valid_buffer_parameter_table_es3[] = {
-    GL_BUFFER_ACCESS_FLAGS,
-    GL_BUFFER_MAPPED,
-    GL_BUFFER_MAP_LENGTH,
+    GL_BUFFER_ACCESS_FLAGS, GL_BUFFER_MAPPED, GL_BUFFER_MAP_LENGTH,
     GL_BUFFER_MAP_OFFSET,
 };
 
 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_target_table_es3[] = {
-    GL_COPY_READ_BUFFER,
-    GL_COPY_WRITE_BUFFER,
-    GL_PIXEL_PACK_BUFFER,
-    GL_PIXEL_UNPACK_BUFFER,
-    GL_TRANSFORM_FEEDBACK_BUFFER,
-    GL_UNIFORM_BUFFER,
+    GL_COPY_READ_BUFFER,    GL_COPY_WRITE_BUFFER,         GL_PIXEL_PACK_BUFFER,
+    GL_PIXEL_UNPACK_BUFFER, GL_TRANSFORM_FEEDBACK_BUFFER, GL_UNIFORM_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_buffer_usage_table_es3[] = {
-    GL_STREAM_READ,
-    GL_STREAM_COPY,
-    GL_STATIC_READ,
-    GL_STATIC_COPY,
-    GL_DYNAMIC_READ,
-    GL_DYNAMIC_COPY,
+    GL_STREAM_READ, GL_STREAM_COPY,  GL_STATIC_READ,
+    GL_STATIC_COPY, GL_DYNAMIC_READ, GL_DYNAMIC_COPY,
 };
 
 static const GLenum valid_bufferfi_table[] = {
@@ -83,13 +63,11 @@ static const GLenum valid_bufferfi_table[] = {
 };
 
 static const GLenum valid_bufferfv_table[] = {
-    GL_COLOR,
-    GL_DEPTH,
+    GL_COLOR, GL_DEPTH,
 };
 
 static const GLenum valid_bufferiv_table[] = {
-    GL_COLOR,
-    GL_STENCIL,
+    GL_COLOR, GL_STENCIL,
 };
 
 static const GLenum valid_bufferuiv_table[] = {
@@ -97,31 +75,18 @@ static const GLenum valid_bufferuiv_table[] = {
 };
 
 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_capability_table_es3[] = {
-    GL_RASTERIZER_DISCARD,
-    GL_PRIMITIVE_RESTART_FIXED_INDEX,
+    GL_RASTERIZER_DISCARD, GL_PRIMITIVE_RESTART_FIXED_INDEX,
 };
 
 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_compressed_texture_format_table_es3[] = {
@@ -138,52 +103,34 @@ static const GLenum valid_compressed_texture_format_table_es3[] = {
 };
 
 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_equation_table_es3[] = {
-    GL_MIN,
-    GL_MAX,
+    GL_MIN, GL_MAX,
 };
 
 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 GLenum valid_frame_buffer_parameter_table[] = {
@@ -210,8 +157,7 @@ static const GLenum valid_frame_buffer_target_table[] = {
 };
 
 static const GLenum valid_frame_buffer_target_table_es3[] = {
-    GL_DRAW_FRAMEBUFFER,
-    GL_READ_FRAMEBUFFER,
+    GL_DRAW_FRAMEBUFFER, GL_READ_FRAMEBUFFER,
 };
 
 static const GLenum valid_g_l_state_table[] = {
@@ -391,25 +337,19 @@ static const GLenum valid_g_l_state_table_es3[] = {
 };
 
 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_get_tex_param_target_table_es3[] = {
-    GL_TEXTURE_2D_ARRAY,
-    GL_TEXTURE_3D,
+    GL_TEXTURE_2D_ARRAY, GL_TEXTURE_3D,
 };
 
 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[] = {
@@ -421,19 +361,15 @@ static const GLenum valid_hint_target_table_es3[] = {
 };
 
 static const GLenum valid_image_internal_format_table[] = {
-    GL_RGB,
-    GL_RGB_YUV_420_CHROMIUM,
-    GL_RGBA,
+    GL_RGB, GL_RGB_YUV_420_CHROMIUM, GL_RGBA,
 };
 
 static const GLenum valid_image_usage_table[] = {
-    GL_MAP_CHROMIUM,
-    GL_SCANOUT_CHROMIUM,
+    GL_MAP_CHROMIUM, GL_SCANOUT_CHROMIUM,
 };
 
 static const GLenum valid_index_type_table[] = {
-    GL_UNSIGNED_BYTE,
-    GL_UNSIGNED_SHORT,
+    GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT,
 };
 
 static const GLenum valid_index_type_table_es3[] = {
@@ -441,8 +377,7 @@ static const GLenum valid_index_type_table_es3[] = {
 };
 
 static const GLenum valid_indexed_buffer_target_table[] = {
-    GL_TRANSFORM_FEEDBACK_BUFFER,
-    GL_UNIFORM_BUFFER,
+    GL_TRANSFORM_FEEDBACK_BUFFER, GL_UNIFORM_BUFFER,
 };
 
 static const GLenum valid_indexed_g_l_state_table[] = {
@@ -455,8 +390,7 @@ static const GLenum valid_indexed_g_l_state_table[] = {
 };
 
 static const GLenum valid_internal_format_parameter_table[] = {
-    GL_NUM_SAMPLE_COUNTS,
-    GL_SAMPLES,
+    GL_NUM_SAMPLE_COUNTS, GL_SAMPLES,
 };
 
 static const GLenum valid_invalidate_frame_buffer_target_table[] = {
@@ -473,8 +407,7 @@ static const GLenum valid_map_buffer_access_table[] = {
 };
 
 static const GLenum valid_matrix_mode_table[] = {
-    GL_PATH_PROJECTION_CHROMIUM,
-    GL_PATH_MODELVIEW_CHROMIUM,
+    GL_PATH_PROJECTION_CHROMIUM, GL_PATH_MODELVIEW_CHROMIUM,
 };
 
 static const GLenum valid_pixel_store_table[] = {
@@ -486,27 +419,17 @@ static const GLenum valid_pixel_store_table[] = {
 };
 
 static const GLenum valid_pixel_store_table_es3[] = {
-    GL_PACK_ROW_LENGTH,
-    GL_PACK_SKIP_PIXELS,
-    GL_PACK_SKIP_ROWS,
-    GL_UNPACK_ROW_LENGTH,
-    GL_UNPACK_IMAGE_HEIGHT,
-    GL_UNPACK_SKIP_PIXELS,
-    GL_UNPACK_SKIP_ROWS,
-    GL_UNPACK_SKIP_IMAGES,
+    GL_PACK_ROW_LENGTH,   GL_PACK_SKIP_PIXELS,    GL_PACK_SKIP_ROWS,
+    GL_UNPACK_ROW_LENGTH, GL_UNPACK_IMAGE_HEIGHT, GL_UNPACK_SKIP_PIXELS,
+    GL_UNPACK_SKIP_ROWS,  GL_UNPACK_SKIP_IMAGES,
 };
 
 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,
 };
 
@@ -546,8 +469,7 @@ static const GLenum valid_program_parameter_table_es3[] = {
 };
 
 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[] = {
@@ -565,9 +487,7 @@ 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_format_table_es3[] = {
@@ -575,35 +495,25 @@ static const GLenum valid_read_pixel_format_table_es3[] = {
 };
 
 static const GLenum deprecated_read_pixel_format_table_es3[] = {
-    GL_ALPHA,
-    GL_RGB,
+    GL_ALPHA, GL_RGB,
 };
 
 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_read_pixel_type_table_es3[] = {
-    GL_UNSIGNED_INT,
-    GL_INT,
-    GL_FLOAT,
+    GL_UNSIGNED_INT, GL_INT, GL_FLOAT,
 };
 
 static const GLenum deprecated_read_pixel_type_table_es3[] = {
-    GL_UNSIGNED_SHORT_5_6_5,
-    GL_UNSIGNED_SHORT_4_4_4_4,
+    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_format_table_es3[] = {
@@ -639,14 +549,10 @@ static const GLenum valid_render_buffer_format_table_es3[] = {
 };
 
 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,
 };
 
@@ -659,44 +565,29 @@ 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_sampler_parameter_table[] = {
-    GL_TEXTURE_MAG_FILTER,
-    GL_TEXTURE_MIN_FILTER,
-    GL_TEXTURE_MIN_LOD,
-    GL_TEXTURE_MAX_LOD,
-    GL_TEXTURE_WRAP_S,
-    GL_TEXTURE_WRAP_T,
-    GL_TEXTURE_WRAP_R,
-    GL_TEXTURE_COMPARE_MODE,
-    GL_TEXTURE_COMPARE_FUNC,
+    GL_TEXTURE_MAG_FILTER, GL_TEXTURE_MIN_FILTER,   GL_TEXTURE_MIN_LOD,
+    GL_TEXTURE_MAX_LOD,    GL_TEXTURE_WRAP_S,       GL_TEXTURE_WRAP_T,
+    GL_TEXTURE_WRAP_R,     GL_TEXTURE_COMPARE_MODE, GL_TEXTURE_COMPARE_FUNC,
 };
 
 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[] = {
@@ -718,21 +609,12 @@ static const GLenum valid_src_blend_factor_table[] = {
 };
 
 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_VENDOR,     GL_RENDERER, GL_VERSION, GL_SHADING_LANGUAGE_VERSION,
     GL_EXTENSIONS,
 };
 
@@ -741,54 +623,36 @@ static const GLenum valid_subscription_target_table[] = {
 };
 
 static const GLbitfield valid_sync_flush_flags_table[] = {
-    GL_SYNC_FLUSH_COMMANDS_BIT,
-    0,
+    GL_SYNC_FLUSH_COMMANDS_BIT, 0,
 };
 
 static const GLenum valid_sync_parameter_table[] = {
-    GL_SYNC_STATUS,
-    GL_OBJECT_TYPE,
-    GL_SYNC_CONDITION,
-    GL_SYNC_FLAGS,
+    GL_SYNC_STATUS, GL_OBJECT_TYPE, GL_SYNC_CONDITION, GL_SYNC_FLAGS,
 };
 
 static const GLenum valid_texture_3_d_target_table[] = {
-    GL_TEXTURE_3D,
-    GL_TEXTURE_2D_ARRAY,
+    GL_TEXTURE_3D, GL_TEXTURE_2D_ARRAY,
 };
 
 static const GLenum valid_texture_bind_target_table[] = {
-    GL_TEXTURE_2D,
-    GL_TEXTURE_CUBE_MAP,
+    GL_TEXTURE_2D, GL_TEXTURE_CUBE_MAP,
 };
 
 static const GLenum valid_texture_bind_target_table_es3[] = {
-    GL_TEXTURE_3D,
-    GL_TEXTURE_2D_ARRAY,
+    GL_TEXTURE_3D, GL_TEXTURE_2D_ARRAY,
 };
 
 static const GLenum valid_texture_compare_func_table[] = {
-    GL_LEQUAL,
-    GL_GEQUAL,
-    GL_LESS,
-    GL_GREATER,
-    GL_EQUAL,
-    GL_NOTEQUAL,
-    GL_ALWAYS,
-    GL_NEVER,
+    GL_LEQUAL, GL_GEQUAL,   GL_LESS,   GL_GREATER,
+    GL_EQUAL,  GL_NOTEQUAL, GL_ALWAYS, GL_NEVER,
 };
 
 static const GLenum valid_texture_compare_mode_table[] = {
-    GL_NONE,
-    GL_COMPARE_REF_TO_TEXTURE,
+    GL_NONE, GL_COMPARE_REF_TO_TEXTURE,
 };
 
 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_format_table_es3[] = {
@@ -803,11 +667,7 @@ static const GLenum valid_texture_format_table_es3[] = {
 };
 
 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_table_es3[] = {
@@ -868,14 +728,9 @@ static const GLenum valid_texture_internal_format_table_es3[] = {
 };
 
 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_internal_format_storage_table_es3[] = {
@@ -941,20 +796,13 @@ static const GLenum valid_texture_internal_format_storage_table_es3[] = {
 };
 
 static const GLenum deprecated_texture_internal_format_storage_table_es3[] = {
-    GL_ALPHA8_EXT,
-    GL_LUMINANCE8_EXT,
-    GL_LUMINANCE8_ALPHA8_EXT,
-    GL_ALPHA16F_EXT,
-    GL_LUMINANCE16F_EXT,
-    GL_LUMINANCE_ALPHA16F_EXT,
-    GL_ALPHA32F_EXT,
-    GL_LUMINANCE32F_EXT,
-    GL_LUMINANCE_ALPHA32F_EXT,
+    GL_ALPHA8_EXT,   GL_LUMINANCE8_EXT,   GL_LUMINANCE8_ALPHA8_EXT,
+    GL_ALPHA16F_EXT, GL_LUMINANCE16F_EXT, GL_LUMINANCE_ALPHA16F_EXT,
+    GL_ALPHA32F_EXT, GL_LUMINANCE32F_EXT, GL_LUMINANCE_ALPHA32F_EXT,
 };
 
 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[] = {
@@ -967,28 +815,20 @@ static const GLenum valid_texture_min_filter_mode_table[] = {
 };
 
 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_parameter_table_es3[] = {
-    GL_TEXTURE_BASE_LEVEL,
-    GL_TEXTURE_COMPARE_FUNC,
-    GL_TEXTURE_COMPARE_MODE,
-    GL_TEXTURE_IMMUTABLE_FORMAT,
-    GL_TEXTURE_IMMUTABLE_LEVELS,
-    GL_TEXTURE_MAX_LEVEL,
-    GL_TEXTURE_MAX_LOD,
-    GL_TEXTURE_MIN_LOD,
+    GL_TEXTURE_BASE_LEVEL,       GL_TEXTURE_COMPARE_FUNC,
+    GL_TEXTURE_COMPARE_MODE,     GL_TEXTURE_IMMUTABLE_FORMAT,
+    GL_TEXTURE_IMMUTABLE_LEVELS, GL_TEXTURE_MAX_LEVEL,
+    GL_TEXTURE_MAX_LOD,          GL_TEXTURE_MIN_LOD,
     GL_TEXTURE_WRAP_R,
 };
 
 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[] = {
@@ -1002,14 +842,11 @@ static const GLenum valid_texture_target_table[] = {
 };
 
 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 GLenum valid_transform_feedback_bind_target_table[] = {
@@ -1017,9 +854,7 @@ static const GLenum valid_transform_feedback_bind_target_table[] = {
 };
 
 static const GLenum valid_transform_feedback_primitive_mode_table[] = {
-    GL_POINTS,
-    GL_LINES,
-    GL_TRIANGLES,
+    GL_POINTS, GL_LINES, GL_TRIANGLES,
 };
 
 static const GLenum valid_uniform_block_parameter_table[] = {
@@ -1033,14 +868,9 @@ static const GLenum valid_uniform_block_parameter_table[] = {
 };
 
 static const GLenum valid_uniform_parameter_table[] = {
-    GL_UNIFORM_SIZE,
-    GL_UNIFORM_TYPE,
-    GL_UNIFORM_NAME_LENGTH,
-    GL_UNIFORM_BLOCK_INDEX,
-    GL_UNIFORM_OFFSET,
-    GL_UNIFORM_ARRAY_STRIDE,
-    GL_UNIFORM_MATRIX_STRIDE,
-    GL_UNIFORM_IS_ROW_MAJOR,
+    GL_UNIFORM_SIZE,          GL_UNIFORM_TYPE,         GL_UNIFORM_NAME_LENGTH,
+    GL_UNIFORM_BLOCK_INDEX,   GL_UNIFORM_OFFSET,       GL_UNIFORM_ARRAY_STRIDE,
+    GL_UNIFORM_MATRIX_STRIDE, GL_UNIFORM_IS_ROW_MAJOR,
 };
 
 static const GLenum valid_value_buffer_target_table[] = {
@@ -1048,27 +878,16 @@ static const GLenum valid_value_buffer_target_table[] = {
 };
 
 static const GLenum valid_vertex_attrib_i_type_table[] = {
-    GL_BYTE,
-    GL_UNSIGNED_BYTE,
-    GL_SHORT,
-    GL_UNSIGNED_SHORT,
-    GL_INT,
-    GL_UNSIGNED_INT,
+    GL_BYTE,           GL_UNSIGNED_BYTE, GL_SHORT,
+    GL_UNSIGNED_SHORT, GL_INT,           GL_UNSIGNED_INT,
 };
 
 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_attrib_type_table_es3[] = {
@@ -1080,18 +899,14 @@ static const GLenum valid_vertex_attrib_type_table_es3[] = {
 };
 
 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,
 };
 
 static const GLenum valid_vertex_attribute_table_es3[] = {
-    GL_VERTEX_ATTRIB_ARRAY_INTEGER,
-    GL_VERTEX_ATTRIB_ARRAY_DIVISOR,
+    GL_VERTEX_ATTRIB_ARRAY_INTEGER, GL_VERTEX_ATTRIB_ARRAY_DIVISOR,
 };
 
 static const GLenum valid_vertex_pointer_table[] = {
@@ -1244,8 +1059,7 @@ Validators::Validators()
       vertex_attribute(valid_vertex_attribute_table,
                        arraysize(valid_vertex_attribute_table)),
       vertex_pointer(valid_vertex_pointer_table,
-                     arraysize(valid_vertex_pointer_table)) {
-}
+                     arraysize(valid_vertex_pointer_table)) {}
 
 void Validators::UpdateValuesES3() {
   attachment.AddValues(valid_attachment_table_es3,