Updated Khronos GLES2 headers. (Take 2, Original: https://codereview.chromium.org/99053007/)

There was a type conflict between the previous, out of date headers and the more
recent ones included in ANGLE that was causing failures on 64-bit Windows.

BUG=326382
TBR=kbr@chromium.org, piman@chromium.org, raymes@chromium.org, robertphillips@google.com

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242740 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 267 insertions, 129 deletions

diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py
index 4f2ab88..639b98b 100755
--- a/gpu/command_buffer/build_gles2_cmd_buffer.py
+++ b/gpu/command_buffer/build_gles2_cmd_buffer.py
@@ -53,9 +53,17 @@ _GL_TYPES = {
   'GLclampf': 'float',
   'GLvoid': 'void',
   'GLfixed': 'int',
-  'GLclampx': 'int',
+  'GLclampx': 'int'
+}
+
+_GL_TYPES_32 = {
   'GLintptr': 'long int',
-  'GLsizeiptr': 'long int',
+  'GLsizeiptr': 'long int'
+}
+
+_GL_TYPES_64 = {
+  'GLintptr': 'long long int',
+  'GLsizeiptr': 'long long int'
 }
 
 # Capabilites selected with glEnable
@@ -7600,6 +7608,13 @@ const size_t GLES2Util::enum_to_string_table_len_ =
       file.Write("\n#ifndef __gl2_h_\n")
       for (k, v) in _GL_TYPES.iteritems():
         file.Write("typedef %s %s;\n" % (v, k))
+      file.Write("#ifdef _WIN64\n")
+      for (k, v) in _GL_TYPES_64.iteritems():
+        file.Write("typedef %s %s;\n" % (v, k))
+      file.Write("#else\n")
+      for (k, v) in _GL_TYPES_32.iteritems():
+        file.Write("typedef %s %s;\n" % (v, k))
+      file.Write("#endif  // _WIN64\n")
       file.Write("#endif  // __gl2_h_\n\n")
 
     for interface in self.pepper_interfaces:
diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc
index b0efc37..f1d3392 100644
--- a/gpu/command_buffer/client/gles2_implementation.cc
+++ b/gpu/command_buffer/client/gles2_implementation.cc
@@ -1228,13 +1228,13 @@ void GLES2Implementation::PixelStorei(GLenum pname, GLint param) {
     case GL_UNPACK_ALIGNMENT:
         unpack_alignment_ = param;
         break;
-    case GL_UNPACK_ROW_LENGTH:
+    case GL_UNPACK_ROW_LENGTH_EXT:
         unpack_row_length_ = param;
         return;
-    case GL_UNPACK_SKIP_ROWS:
+    case GL_UNPACK_SKIP_ROWS_EXT:
         unpack_skip_rows_ = param;
         return;
-    case GL_UNPACK_SKIP_PIXELS:
+    case GL_UNPACK_SKIP_PIXELS_EXT:
         unpack_skip_pixels_ = param;
         return;
     case GL_UNPACK_FLIP_Y_CHROMIUM:
diff --git a/gpu/command_buffer/client/gles2_implementation_unittest.cc b/gpu/command_buffer/client/gles2_implementation_unittest.cc
index e6e0861..dbb9b21 100644
--- a/gpu/command_buffer/client/gles2_implementation_unittest.cc
+++ b/gpu/command_buffer/client/gles2_implementation_unittest.cc
@@ -2355,9 +2355,9 @@ TEST_F(GLES2ImplementationTest, SubImageUnpack) {
 
         const void* commands = GetPut();
         gl_->PixelStorei(GL_UNPACK_ALIGNMENT, alignment);
-        gl_->PixelStorei(GL_UNPACK_ROW_LENGTH, kSrcWidth);
-        gl_->PixelStorei(GL_UNPACK_SKIP_PIXELS, kSrcSubImageX0);
-        gl_->PixelStorei(GL_UNPACK_SKIP_ROWS, kSrcSubImageY0);
+        gl_->PixelStorei(GL_UNPACK_ROW_LENGTH_EXT, kSrcWidth);
+        gl_->PixelStorei(GL_UNPACK_SKIP_PIXELS_EXT, kSrcSubImageX0);
+        gl_->PixelStorei(GL_UNPACK_SKIP_ROWS_EXT, kSrcSubImageY0);
         gl_->PixelStorei(GL_UNPACK_FLIP_Y_CHROMIUM, flip_y);
         if (sub) {
           gl_->TexImage2D(
diff --git a/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h b/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h
index f1a8777..1d66ed5 100644
--- a/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h
@@ -11,25 +11,23 @@
 
 static const GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x78EC, "GL_PIXEL_UNPACK_TRANSFER_BUFFER_CHROMIUM", },
-  { 0x8825, "GL_DRAW_BUFFER0_NV", },
+  { 0x8825, "GL_DRAW_BUFFER0_EXT", },
   { 0x0BC1, "GL_ALPHA_TEST_FUNC_QCOM", },
   { 0x884C, "GL_TEXTURE_COMPARE_MODE_EXT", },
   { 0x0BC2, "GL_ALPHA_TEST_REF_QCOM", },
-  { 0x78EF, "GL_PIXEL_UNPACK_TRANSFER_BUFFER_BINDING_CHROMIUM", },
   { 0x884D, "GL_TEXTURE_COMPARE_FUNC_EXT", },
   { 0x884E, "GL_COMPARE_REF_TO_TEXTURE_EXT", },
   { 0x93A1, "GL_BGRA8_EXT", },
-  { 0x8826, "GL_DRAW_BUFFER1_NV", },
-  { 0x1E01, "GL_REPLACE", },
   { 0, "GL_FALSE", },
   { 0x00400000, "GL_STENCIL_BUFFER_BIT6_QCOM", },
-  { 0x82E6, "GL_SAMPLER", },
-  { 0x1E02, "GL_INCR", },
+  { 0x9138, "GL_COMPRESSED_RGBA_PVRTC_4BPPV2_IMG", },
+  { 0x8FC4, "GL_SHADER_BINARY_VIV", },
   { 0x9130, "GL_SGX_PROGRAM_BINARY_IMG", },
   { 0x9133, "GL_RENDERBUFFER_SAMPLES_IMG", },
-  { 0x82E0, "GL_BUFFER", },
+  { 0x82E0, "GL_BUFFER_KHR", },
   { 0x9135, "GL_MAX_SAMPLES_IMG", },
   { 0x9134, "GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_IMG", },
+  { 0x9137, "GL_COMPRESSED_RGBA_PVRTC_2BPPV2_IMG", },
   { 0x9136, "GL_TEXTURE_SAMPLES_IMG", },
   { 0x00000020, "GL_COLOR_BUFFER_BIT5_QCOM", },
   { 0x0008, "GL_MAP_INVALIDATE_BUFFER_BIT_EXT", },
@@ -49,28 +47,34 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x8741, "GL_PROGRAM_BINARY_LENGTH_OES", },
   { 0x8740, "GL_Z400_BINARY_AMD", },
   { 0x8192, "GL_GENERATE_MIPMAP_HINT", },
+  { 0x8A54, "GL_COMPRESSED_SRGB_PVRTC_2BPPV1_EXT", },
+  { 0x8A55, "GL_COMPRESSED_SRGB_PVRTC_4BPPV1_EXT", },
+  { 0x8A56, "GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV1_EXT", },
+  { 0x8A57, "GL_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV1_EXT", },
+  { 0x8A51, "GL_RGB_RAW_422_APPLE", },
   { 0x87F9, "GL_3DC_X_AMD", },
   { 0x8A53, "GL_SYNC_OBJECT_APPLE", },
   { 0x8DF8, "GL_SHADER_BINARY_FORMATS", },
   { 0x8DF9, "GL_NUM_SHADER_BINARY_FORMATS", },
-  { 0x826D, "GL_DEBUG_GROUP_STACK_DEPTH", },
-  { 0x826B, "GL_DEBUG_SEVERITY_NOTIFICATION", },
-  { 0x826C, "GL_MAX_DEBUG_GROUP_STACK_DEPTH", },
+  { 0x826D, "GL_DEBUG_GROUP_STACK_DEPTH_KHR", },
+  { 0x826B, "GL_DEBUG_SEVERITY_NOTIFICATION_KHR", },
+  { 0x826C, "GL_MAX_DEBUG_GROUP_STACK_DEPTH_KHR", },
   { 0x8B59, "GL_BOOL_VEC4", },
-  { 0x8B58, "GL_BOOL_VEC3", },
+  { 0x826A, "GL_DEBUG_TYPE_POP_GROUP_KHR", },
   { 0x8B57, "GL_BOOL_VEC2", },
   { 0x8DF1, "GL_MEDIUM_FLOAT", },
   { 0x8B55, "GL_INT_VEC4", },
   { 0x8B54, "GL_INT_VEC3", },
   { 0x8DF4, "GL_MEDIUM_INT", },
   { 0x8DF5, "GL_HIGH_INT", },
-  { 0x8DF6, "GL_UNSIGNED_INT_10_10_10_2_OES", },
+  { 0x8B51, "GL_FLOAT_VEC3", },
   { 0x8B50, "GL_FLOAT_VEC2", },
   { 0x806F, "GL_TEXTURE_3D_OES", },
-  { 0x92E0, "GL_DEBUG_OUTPUT", },
+  { 0x92E0, "GL_DEBUG_OUTPUT_KHR", },
   { 0x806A, "GL_TEXTURE_BINDING_3D_OES", },
-  { 0x93D9, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR", },
-  { 0x8CE3, "GL_COLOR_ATTACHMENT3_NV", },
+  { 0x8CE3, "GL_COLOR_ATTACHMENT3_EXT", },
+  { 0x1904, "GL_GREEN_NV", },
+  { 0x928D, "GL_DST_OUT_NV", },
   { 0x8069, "GL_TEXTURE_BINDING_2D", },
   { 0x8261, "GL_NO_RESET_NOTIFICATION_EXT", },
   { 0x8DFA, "GL_SHADER_COMPILER", },
@@ -78,8 +82,9 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x8DFC, "GL_MAX_VARYING_VECTORS", },
   { 0x8B5C, "GL_FLOAT_MAT4", },
   { 0x8B5B, "GL_FLOAT_MAT3", },
-  { 0x8B5A, "GL_FLOAT_MAT2", },
-  { 0x0D05, "GL_PACK_ALIGNMENT", },
+  { 0x8268, "GL_DEBUG_TYPE_MARKER_KHR", },
+  { 0x8269, "GL_DEBUG_TYPE_PUSH_GROUP_KHR", },
+  { 0x1905, "GL_BLUE_NV", },
   { 0x87FF, "GL_PROGRAM_BINARY_FORMATS_OES", },
   { 0x87FE, "GL_NUM_PROGRAM_BINARY_FORMATS_OES", },
   { 0x2600, "GL_NEAREST", },
@@ -90,9 +95,12 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x88BB, "GL_BUFFER_ACCESS_OES", },
   { 0x88BC, "GL_BUFFER_MAPPED_OES", },
   { 0x88BD, "GL_BUFFER_MAP_POINTER_OES", },
+  { 0x88BF, "GL_TIME_ELAPSED_EXT", },
   { 0x0C10, "GL_SCISSOR_BOX", },
   { 0x0C11, "GL_SCISSOR_TEST", },
   { 0x80000000, "GL_MULTISAMPLE_BUFFER_BIT7_QCOM", },
+  { 0x8A48, "GL_TEXTURE_SRGB_DECODE_EXT", },
+  { 0x300E, "GL_CONTEXT_LOST", },
   { 0x02000000, "GL_MULTISAMPLE_BUFFER_BIT1_QCOM", },
   { 0x8C2F, "GL_ANY_SAMPLES_PASSED_EXT", },
   { 0x8BD2, "GL_TEXTURE_WIDTH_QCOM", },
@@ -103,6 +111,7 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x8BD7, "GL_TEXTURE_TYPE_QCOM", },
   { 0x8B8D, "GL_CURRENT_PROGRAM", },
   { 0x8BD9, "GL_TEXTURE_NUM_LEVELS_QCOM", },
+  { 0x00200000, "GL_STENCIL_BUFFER_BIT5_QCOM", },
   { 0x8B8A, "GL_ACTIVE_ATTRIBUTE_MAX_LENGTH", },
   { 0x8B8B, "GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES", },
   { 0x8B8C, "GL_SHADING_LANGUAGE_VERSION", },
@@ -111,6 +120,8 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x8BDC, "GL_STATE_RESTORE", },
   { 0x8B88, "GL_SHADER_SOURCE_LENGTH", },
   { 0x8B89, "GL_ACTIVE_ATTRIBUTES", },
+  { 0x93C9, "GL_COMPRESSED_RGBA_ASTC_6x6x6_OES", },
+  { 0x93C8, "GL_COMPRESSED_RGBA_ASTC_6x6x5_OES", },
   { 0x8B84, "GL_INFO_LOG_LENGTH", },
   { 0x8B85, "GL_ATTACHED_SHADERS", },
   { 0x8B86, "GL_ACTIVE_UNIFORMS", },
@@ -119,7 +130,6 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x8B81, "GL_COMPILE_STATUS", },
   { 0x8B82, "GL_LINK_STATUS", },
   { 0x8B83, "GL_VALIDATE_STATUS", },
-  { 0x93D2, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR", },
   { 0x8D48, "GL_STENCIL_INDEX8", },
   { 0x8D46, "GL_STENCIL_INDEX1_OES", },
   { 0x8D47, "GL_STENCIL_INDEX4_OES", },
@@ -131,7 +141,6 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x8D41, "GL_RENDERBUFFER", },
   { 0x0BD0, "GL_DITHER", },
   { 0x93D3, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR", },
-  { 0x9144, "GL_MAX_DEBUG_LOGGED_MESSAGES", },
   { 0x1801, "GL_DEPTH_EXT", },
   { 0x1800, "GL_COLOR_EXT", },
   { 0x1802, "GL_STENCIL_EXT", },
@@ -140,18 +149,20 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x81A6, "GL_DEPTH_COMPONENT24_OES", },
   { 0x81A7, "GL_DEPTH_COMPONENT32_OES", },
   { 0x88FE, "GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE", },
+  { 0x8B6A, "GL_FLOAT_MAT4x3_NV", },
   { 0x93D0, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR", },
-  { 0x9143, "GL_MAX_DEBUG_MESSAGE_LENGTH", },
-  { 0x8DFD, "GL_MAX_FRAGMENT_UNIFORM_VECTORS", },
-  { 0x9145, "GL_DEBUG_LOGGED_MESSAGES", },
-  { 0x9146, "GL_DEBUG_SEVERITY_HIGH", },
-  { 0x9147, "GL_DEBUG_SEVERITY_MEDIUM", },
-  { 0x9148, "GL_DEBUG_SEVERITY_LOW", },
+  { 0x9143, "GL_MAX_DEBUG_MESSAGE_LENGTH_KHR", },
+  { 0x9144, "GL_MAX_DEBUG_LOGGED_MESSAGES_KHR", },
+  { 0x9145, "GL_DEBUG_LOGGED_MESSAGES_KHR", },
+  { 0x9146, "GL_DEBUG_SEVERITY_HIGH_KHR", },
+  { 0x9147, "GL_DEBUG_SEVERITY_MEDIUM_KHR", },
+  { 0x9148, "GL_DEBUG_SEVERITY_LOW_KHR", },
+  { 0x9260, "GL_GCCSO_SHADER_BINARY_FJ", },
   { 0x8F60, "GL_MALI_SHADER_BINARY_ARM", },
   { 0x8F61, "GL_MALI_PROGRAM_BINARY_ARM", },
   { 0x87EE, "GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD", },
   { 0x822B, "GL_RG8_EXT", },
-  { 0x93D1, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR", },
+  { 0x822F, "GL_RG16F_EXT", },
   { 0x822D, "GL_R16F_EXT", },
   { 0x822E, "GL_R32F_EXT", },
   { 1, "GL_ES_VERSION_2_0", },
@@ -174,18 +185,21 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x0901, "GL_CCW", },
   { 0x0900, "GL_CW", },
   { 0x8229, "GL_R8_EXT", },
+  { 0x9283, "GL_DISJOINT_NV", },
   { 0x8227, "GL_RG_EXT", },
+  { 0x8B66, "GL_FLOAT_MAT2x4_NV", },
+  { 0x8B67, "GL_FLOAT_MAT3x2_NV", },
+  { 0x8B65, "GL_FLOAT_MAT2x3_NV", },
   { 0x8B62, "GL_SAMPLER_2D_SHADOW_EXT", },
   { 0x8B63, "GL_SAMPLER_2D_RECT_ARB", },
   { 0x8B60, "GL_SAMPLER_CUBE", },
-  { 0x93D7, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR", },
   { 0x00001000, "GL_DEPTH_BUFFER_BIT4_QCOM", },
+  { 0x8B68, "GL_FLOAT_MAT3x4_NV", },
   { 0x83F0, "GL_COMPRESSED_RGB_S3TC_DXT1_EXT", },
   { 0x00000080, "GL_COLOR_BUFFER_BIT7_QCOM", },
   { 0x88F0, "GL_DEPTH24_STENCIL8_OES", },
   { 0x80A0, "GL_SAMPLE_COVERAGE", },
-  { 0x93D4, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR", },
-  { 0x822F, "GL_RG16F_EXT", },
+  { 0x928F, "GL_DST_ATOP_NV", },
   { 0x80A9, "GL_SAMPLES", },
   { 0x80A8, "GL_SAMPLE_BUFFERS", },
   { 0x0D55, "GL_ALPHA_BITS", },
@@ -197,8 +211,10 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x0D53, "GL_GREEN_BITS", },
   { 0x0D52, "GL_RED_BITS", },
   { 0x8037, "GL_POLYGON_OFFSET_FILL", },
+  { 0x928C, "GL_SRC_OUT_NV", },
   { 0x8034, "GL_UNSIGNED_SHORT_5_5_5_1", },
   { 0x8033, "GL_UNSIGNED_SHORT_4_4_4_4", },
+  { 0x928B, "GL_DST_IN_NV", },
   { 0x0305, "GL_ONE_MINUS_DST_ALPHA", },
   { 0x0304, "GL_DST_ALPHA", },
   { 0x0307, "GL_ONE_MINUS_DST_COLOR", },
@@ -211,43 +227,53 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x2A00, "GL_POLYGON_OFFSET_UNITS", },
   { 0xFFFFFFFF, "GL_ALL_SHADER_BITS_EXT", },
   { 0x00800000, "GL_STENCIL_BUFFER_BIT7_QCOM", },
+  { 0x8C4D, "GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_NV", },
   { 0x00020000, "GL_STENCIL_BUFFER_BIT1_QCOM", },
   { 0x8D00, "GL_DEPTH_ATTACHMENT", },
   { 0x8FA0, "GL_PERFMON_GLOBAL_MODE_QCOM", },
   { 0x8815, "GL_RGB32F_EXT", },
   { 0x813D, "GL_TEXTURE_MAX_LEVEL_APPLE", },
-  { 0x84F3, "GL_FENCE_STATUS_NV", },
+  { 0x8DFD, "GL_MAX_FRAGMENT_UNIFORM_VECTORS", },
   { 0x8CDD, "GL_FRAMEBUFFER_UNSUPPORTED", },
-  { 0x8CDF, "GL_MAX_COLOR_ATTACHMENTS_NV", },
+  { 0x8CDF, "GL_MAX_COLOR_ATTACHMENTS_EXT", },
   { 0x90F3, "GL_CONTEXT_ROBUST_ACCESS_EXT", },
   { 0x90F2, "GL_MAX_MULTIVIEW_BUFFERS_EXT", },
   { 0x90F1, "GL_MULTIVIEW_EXT", },
   { 0x90F0, "GL_COLOR_ATTACHMENT_EXT", },
   { 0x803C, "GL_ALPHA8_OES", },
   { 0x84F5, "GL_ASYNC_PIXEL_UNPACK_COMPLETED_CHROMIUM", },
-  { 0x882A, "GL_DRAW_BUFFER5_NV", },
+  { 0x882A, "GL_DRAW_BUFFER5_EXT", },
   { 0x80AA, "GL_SAMPLE_COVERAGE_VALUE", },
   { 0x84F6, "GL_ASYNC_PIXEL_PACK_COMPLETED_CHROMIUM", },
   { 0x80AB, "GL_SAMPLE_COVERAGE_INVERT", },
-  { 0x8FC4, "GL_SHADER_BINARY_VIV", },
-  { 0x882B, "GL_DRAW_BUFFER6_NV", },
+  { 0x8C41, "GL_SRGB8_NV", },
+  { 0x8C40, "GL_SRGB_EXT", },
+  { 0x882B, "GL_DRAW_BUFFER6_EXT", },
   { 0x8C17, "GL_UNSIGNED_NORMALIZED_EXT", },
+  { 0x8A4A, "GL_SKIP_DECODE_EXT", },
   { 0x8A4F, "GL_PROGRAM_PIPELINE_OBJECT_EXT", },
-  { 0x882C, "GL_DRAW_BUFFER7_NV", },
+  { 0x882C, "GL_DRAW_BUFFER7_EXT", },
   { 0x0010, "GL_MAP_FLUSH_EXPLICIT_BIT_EXT", },
-  { 0x882D, "GL_DRAW_BUFFER8_NV", },
+  { 0x882D, "GL_DRAW_BUFFER8_EXT", },
+  { 0x8F37, "GL_COPY_WRITE_BUFFER_NV", },
+  { 0x8F36, "GL_COPY_READ_BUFFER_NV", },
   { 0x84FF, "GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT", },
+  { 0x6000, "GL_TEXTURE_POOL_CHROMIUM", },
   { 0x0B74, "GL_DEPTH_FUNC", },
+  { 0x8A49, "GL_DECODE_EXT", },
   { 0x881B, "GL_RGB16F_EXT", },
   { 0x0B71, "GL_DEPTH_TEST", },
   { 0x0B70, "GL_DEPTH_RANGE", },
   { 0x0B73, "GL_DEPTH_CLEAR_VALUE", },
   { 0x0B72, "GL_DEPTH_WRITEMASK", },
   { 0x85BA, "GL_UNSIGNED_SHORT_8_8_APPLE", },
-  { 0x882E, "GL_DRAW_BUFFER9_NV", },
+  { 0x882E, "GL_DRAW_BUFFER9_EXT", },
+  { 0x6001, "GL_TEXTURE_POOL_MANAGED_CHROMIUM", },
   { 0x8073, "GL_MAX_3D_TEXTURE_SIZE_OES", },
   { 0x8072, "GL_TEXTURE_WRAP_R_OES", },
-  { 0x882F, "GL_DRAW_BUFFER10_NV", },
+  { 0x9289, "GL_DST_OVER_NV", },
+  { 0x882F, "GL_DRAW_BUFFER10_EXT", },
+  { 0x8074, "GL_VERTEX_ARRAY_KHR", },
   { 0x80E1, "GL_BGRA_EXT", },
   { 0x8ED7, "GL_COVERAGE_AUTOMATIC_NV", },
   { 0x8ED6, "GL_COVERAGE_EDGE_FRAGMENTS_NV", },
@@ -257,19 +283,21 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x8ED2, "GL_COVERAGE_ATTACHMENT_NV", },
   { 0x8ED1, "GL_COVERAGE_COMPONENT4_NV", },
   { 0x8ED0, "GL_COVERAGE_COMPONENT_NV", },
+  { 0x9288, "GL_SRC_OVER_NV", },
   { 0x800B, "GL_FUNC_REVERSE_SUBTRACT", },
   { 0x00000400, "GL_STENCIL_BUFFER_BIT", },
   { 0x800A, "GL_FUNC_SUBTRACT", },
   { 0x8E2C, "GL_DEPTH_COMPONENT16_NONLINEAR_NV", },
-  { 0x8508, "GL_DECR_WRAP", },
+  { 0x889F, "GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING", },
   { 0x8219, "GL_FRAMEBUFFER_UNDEFINED_OES", },
+  { 0x8E22, "GL_TRANSFORM_FEEDBACK", },
+  { 0x8E28, "GL_TIMESTAMP_EXT", },
   { 0x8006, "GL_FUNC_ADD", },
   { 0x8007, "GL_MIN_EXT", },
   { 0x8004, "GL_ONE_MINUS_CONSTANT_ALPHA", },
   { 0x8005, "GL_BLEND_COLOR", },
   { 0x8002, "GL_ONE_MINUS_CONSTANT_COLOR", },
   { 0x8003, "GL_CONSTANT_ALPHA", },
-  { 0x8000, "GL_COVERAGE_BUFFER_BIT_NV", },
   { 0x8001, "GL_CONSTANT_COLOR", },
   { 0x0204, "GL_GREATER", },
   { 0x0205, "GL_NOTEQUAL", },
@@ -280,20 +308,21 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x0202, "GL_EQUAL", },
   { 0x0203, "GL_LEQUAL", },
   { 0x2901, "GL_REPEAT", },
-  { 0x8B99, "GL_PALETTE8_RGB5_A1_OES", },
-  { 0x8B98, "GL_PALETTE8_RGBA4_OES", },
+  { 0x92A0, "GL_EXCLUSION_NV", },
+  { 0x93D8, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR", },
+  { 0x93D9, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR", },
   { 0x8FB2, "GL_GPU_OPTIMIZED_QCOM", },
   { 0x190A, "GL_LUMINANCE_ALPHA", },
   { 0x8FB0, "GL_BINNING_CONTROL_HINT_QCOM", },
-  { 0x8FB1, "GL_CPU_OPTIMIZED_QCOM", },
-  { 0x8B93, "GL_PALETTE4_RGBA4_OES", },
-  { 0x8B92, "GL_PALETTE4_R5_G6_B5_OES", },
-  { 0x8B91, "GL_PALETTE4_RGBA8_OES", },
-  { 0x8B90, "GL_PALETTE4_RGB8_OES", },
-  { 0x8B97, "GL_PALETTE8_R5_G6_B5_OES", },
-  { 0x8B96, "GL_PALETTE8_RGBA8_OES", },
-  { 0x8B95, "GL_PALETTE8_RGB8_OES", },
-  { 0x8B94, "GL_PALETTE4_RGB5_A1_OES", },
+  { 0x92A1, "GL_CONTRAST_NV", },
+  { 0x1E00, "GL_KEEP", },
+  { 0x1E01, "GL_REPLACE", },
+  { 0x1E02, "GL_INCR", },
+  { 0x1E03, "GL_DECR", },
+  { 0x93D6, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR", },
+  { 0x93D7, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR", },
+  { 0x93D4, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR", },
+  { 0x93D5, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR", },
   { 0x0BE2, "GL_BLEND", },
   { 0x84CB, "GL_TEXTURE11", },
   { 0x8D55, "GL_RENDERBUFFER_STENCIL_SIZE", },
@@ -304,26 +333,33 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x8D50, "GL_RENDERBUFFER_RED_SIZE", },
   { 0x8D53, "GL_RENDERBUFFER_ALPHA_SIZE", },
   { 0x8D52, "GL_RENDERBUFFER_BLUE_SIZE", },
+  { 0x92A6, "GL_VIVIDLIGHT_NV", },
   { 0x00080000, "GL_STENCIL_BUFFER_BIT3_QCOM", },
+  { 0x92A7, "GL_LINEARLIGHT_NV", },
   { 0x886A, "GL_VERTEX_ATTRIB_ARRAY_NORMALIZED", },
   { 0x0C01, "GL_DRAW_BUFFER_EXT", },
+  { 0x93C7, "GL_COMPRESSED_RGBA_ASTC_6x5x5_OES", },
+  { 0x8B5F, "GL_SAMPLER_3D_OES", },
+  { 0x8B95, "GL_PALETTE8_RGB8_OES", },
   { 0x9250, "GL_SHADER_BINARY_DMP", },
   { 0x10000000, "GL_MULTISAMPLE_BUFFER_BIT4_QCOM", },
   { 0x8C92, "GL_ATC_RGB_AMD", },
   { 0x9154, "GL_VERTEX_ARRAY_OBJECT_EXT", },
   { 0x9153, "GL_QUERY_OBJECT_EXT", },
+  { 0x8864, "GL_QUERY_COUNTER_BITS_EXT", },
   { 0x9151, "GL_BUFFER_OBJECT_EXT", },
   { 0x8C93, "GL_ATC_RGBA_EXPLICIT_ALPHA_AMD", },
-  { 0x00000002, "GL_CONTEXT_FLAG_DEBUG_BIT", },
+  { 0x00000002, "GL_CONTEXT_FLAG_DEBUG_BIT_KHR", },
   { 0x00000001, "GL_SYNC_FLUSH_COMMANDS_BIT_APPLE", },
   { 0x00000004, "GL_COLOR_BUFFER_BIT2_QCOM", },
   { 0x1702, "GL_TEXTURE", },
   { 0x00000008, "GL_COLOR_BUFFER_BIT3_QCOM", },
-  { 0x826A, "GL_DEBUG_TYPE_POP_GROUP", },
-  { 0x8828, "GL_DRAW_BUFFER3_NV", },
+  { 0x8B58, "GL_BOOL_VEC3", },
+  { 0x8828, "GL_DRAW_BUFFER3_EXT", },
   { 0x8DF0, "GL_LOW_FLOAT", },
   { 0x1906, "GL_ALPHA", },
   { 0x1907, "GL_RGB", },
+  { 0x8FBB, "GL_GPU_DISJOINT_EXT", },
   { 0x1902, "GL_DEPTH_COMPONENT", },
   { 0x8B56, "GL_BOOL", },
   { 0x93DB, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR", },
@@ -333,29 +369,31 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x1908, "GL_RGBA", },
   { 0x8DF2, "GL_HIGH_FLOAT", },
   { 0x93DD, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR", },
-  { 0x8827, "GL_DRAW_BUFFER2_NV", },
+  { 0x8827, "GL_DRAW_BUFFER2_EXT", },
   { 0x9243, "GL_UNPACK_COLORSPACE_CONVERSION_CHROMIUM", },
   { 0x8DF3, "GL_LOW_INT", },
-  { 0x82E8, "GL_MAX_LABEL_LENGTH", },
-  { 0x8B53, "GL_INT_VEC2", },
+  { 0x82E8, "GL_MAX_LABEL_LENGTH_KHR", },
+  { 0x82E6, "GL_SAMPLER", },
   { 0x0C02, "GL_READ_BUFFER_EXT", },
-  { 0x82E3, "GL_QUERY", },
-  { 0x82E2, "GL_PROGRAM", },
-  { 0x82E1, "GL_SHADER", },
+  { 0x82E3, "GL_QUERY_KHR", },
+  { 0x82E2, "GL_PROGRAM_KHR", },
+  { 0x82E1, "GL_SHADER_KHR", },
   { 0x8B52, "GL_FLOAT_VEC4", },
   { 0x9240, "GL_UNPACK_FLIP_Y_CHROMIUM", },
-  { 0x8B51, "GL_FLOAT_VEC3", },
+  { 0x8DF6, "GL_UNSIGNED_INT_10_10_10_2_OES", },
   { 0x8230, "GL_RG32F_EXT", },
   { 0x8DF7, "GL_INT_10_10_10_2_OES", },
+  { 0x8B69, "GL_FLOAT_MAT4x2_NV", },
+  { 0x812D, "GL_CLAMP_TO_BORDER_NV", },
   { 0x812F, "GL_CLAMP_TO_EDGE", },
   { 0x86A3, "GL_COMPRESSED_TEXTURE_FORMATS", },
   { 0x86A2, "GL_NUM_COMPRESSED_TEXTURE_FORMATS", },
-  { 0x0CF3, "GL_UNPACK_SKIP_ROWS", },
-  { 0x0CF2, "GL_UNPACK_ROW_LENGTH", },
+  { 0x0CF3, "GL_UNPACK_SKIP_ROWS_EXT", },
+  { 0x0CF2, "GL_UNPACK_ROW_LENGTH_EXT", },
   { 0x140C, "GL_FIXED", },
   { 0x8008, "GL_MAX_EXT", },
   { 0x0CF5, "GL_UNPACK_ALIGNMENT", },
-  { 0x0CF4, "GL_UNPACK_SKIP_PIXELS", },
+  { 0x0CF4, "GL_UNPACK_SKIP_PIXELS_EXT", },
   { 0x8009, "GL_BLEND_EQUATION", },
   { 0x1401, "GL_UNSIGNED_BYTE", },
   { 0x1400, "GL_BYTE", },
@@ -370,12 +408,15 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x8CD1, "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME", },
   { 0x00040000, "GL_STENCIL_BUFFER_BIT2_QCOM", },
   { 0x8CD0, "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE", },
-  { 0x8CE4, "GL_COLOR_ATTACHMENT4_NV", },
+  { 0x8CE4, "GL_COLOR_ATTACHMENT4_EXT", },
   { 0x8CD3, "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE", },
+  { 0x929E, "GL_DIFFERENCE_NV", },
   { 0x0B90, "GL_STENCIL_TEST", },
   { 0x8CD2, "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL", },
   { 0x881C, "GL_ALPHA16F_EXT", },
+  { 0x928E, "GL_SRC_ATOP_NV", },
   { 0x8CD4, "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES", },
+  { 0x9298, "GL_LIGHTEN_NV", },
   { 0x8CD7, "GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT", },
   { 0x9112, "GL_OBJECT_TYPE_APPLE", },
   { 0x8038, "GL_POLYGON_OFFSET_FACTOR", },
@@ -389,20 +430,29 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x84CE, "GL_TEXTURE14", },
   { 0x84CD, "GL_TEXTURE13", },
   { 0x9115, "GL_SYNC_FLAGS_APPLE", },
+  { 0x9286, "GL_SRC_NV", },
   { 0x83F3, "GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE", },
   { 0x83F2, "GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE", },
   { 0x83F1, "GL_COMPRESSED_RGBA_S3TC_DXT1_EXT", },
   { 0x9114, "GL_SYNC_STATUS_APPLE", },
   { 0x8C0A, "GL_SGX_BINARY_IMG", },
+  { 0x9285, "GL_BLEND_ADVANCED_COHERENT_NV", },
   { 0x911C, "GL_CONDITION_SATISFIED_APPLE", },
   { 0x911B, "GL_TIMEOUT_EXPIRED_APPLE", },
   { 0x911A, "GL_ALREADY_SIGNALED_APPLE", },
+  { 0x9284, "GL_CONJOINT_NV", },
   { 0x911D, "GL_WAIT_FAILED_APPLE", },
+  { 0x929A, "GL_COLORBURN_NV", },
+  { 0x929B, "GL_HARDLIGHT_NV", },
+  { 0x929C, "GL_SOFTLIGHT_NV", },
   { 0x846D, "GL_ALIASED_POINT_SIZE_RANGE", },
   { 0x846E, "GL_ALIASED_LINE_WIDTH_RANGE", },
+  { 0x929F, "GL_MINUS_NV", },
+  { 0x9282, "GL_UNCORRELATED_NV", },
   { 0x9113, "GL_SYNC_CONDITION_APPLE", },
   { 0x93A4, "GL_PACK_REVERSE_ROW_ORDER_ANGLE", },
   { 0x9111, "GL_MAX_SERVER_WAIT_TIMEOUT_APPLE", },
+  { 0x93A6, "GL_PROGRAM_BINARY_ANGLE", },
   { 0x9117, "GL_SYNC_GPU_COMMANDS_COMPLETE_APPLE", },
   { 0x93A0, "GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE", },
   { 0x93A3, "GL_FRAMEBUFFER_ATTACHMENT_ANGLE", },
@@ -410,6 +460,11 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x8802, "GL_STENCIL_BACK_PASS_DEPTH_FAIL", },
   { 0x9119, "GL_SIGNALED_APPLE", },
   { 0x9118, "GL_UNSIGNALED_APPLE", },
+  { 0x9294, "GL_MULTIPLY_NV", },
+  { 0x9295, "GL_SCREEN_NV", },
+  { 0x9296, "GL_OVERLAY_NV", },
+  { 0x9297, "GL_DARKEN_NV", },
+  { 0x0020, "GL_MAP_UNSYNCHRONIZED_BIT_EXT", },
   { 0x8C01, "GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG", },
   { 0x8C00, "GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG", },
   { 0x8A52, "GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT", },
@@ -425,6 +480,7 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x84C6, "GL_TEXTURE6", },
   { 0x84C5, "GL_TEXTURE5", },
   { 0x8803, "GL_STENCIL_BACK_PASS_DEPTH_PASS", },
+  { 0x928A, "GL_SRC_IN_NV", },
   { 0x8518, "GL_TEXTURE_CUBE_MAP_NEGATIVE_Y", },
   { 0x8519, "GL_TEXTURE_CUBE_MAP_POSITIVE_Z", },
   { 0x8514, "GL_TEXTURE_BINDING_CUBE_MAP", },
@@ -433,59 +489,64 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x8517, "GL_TEXTURE_CUBE_MAP_POSITIVE_Y", },
   { 0x8513, "GL_TEXTURE_CUBE_MAP", },
   { 0x8626, "GL_CURRENT_VERTEX_ATTRIB", },
+  { 0x92B1, "GL_PLUS_CLAMPED_NV", },
+  { 0x92B0, "GL_HSL_LUMINOSITY_NV", },
+  { 0x92B3, "GL_MINUS_CLAMPED_NV", },
+  { 0x92B2, "GL_PLUS_CLAMPED_ALPHA_NV", },
   { 0x8765, "GL_BUFFER_USAGE", },
   { 0x8764, "GL_BUFFER_SIZE", },
-  { 0x93D8, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR", },
-  { 0x0503, "GL_STACK_OVERFLOW", },
+  { 0x8B99, "GL_PALETTE8_RGB5_A1_OES", },
+  { 0x0503, "GL_STACK_OVERFLOW_KHR", },
   { 0x0502, "GL_INVALID_OPERATION", },
   { 0x0501, "GL_INVALID_VALUE", },
   { 0x0500, "GL_INVALID_ENUM", },
   { 64, "GL_MAILBOX_SIZE_CHROMIUM", },
   { 0x0506, "GL_INVALID_FRAMEBUFFER_OPERATION", },
   { 0x0505, "GL_OUT_OF_MEMORY", },
-  { 0x8B5F, "GL_SAMPLER_3D_OES", },
+  { 0x0504, "GL_STACK_UNDERFLOW_KHR", },
   { 0x0B44, "GL_CULL_FACE", },
   { 0x8B5E, "GL_SAMPLER_2D", },
   { 0x0B46, "GL_FRONT_FACE", },
   { 0x8FB3, "GL_RENDER_DIRECT_TO_FRAMEBUFFER_QCOM", },
-  { 0x824A, "GL_DEBUG_SOURCE_APPLICATION", },
-  { 0x824B, "GL_DEBUG_SOURCE_OTHER", },
-  { 0x824C, "GL_DEBUG_TYPE_ERROR", },
-  { 0x824D, "GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR", },
-  { 0x824E, "GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR", },
-  { 0x824F, "GL_DEBUG_TYPE_PORTABILITY", },
+  { 0x824A, "GL_DEBUG_SOURCE_APPLICATION_KHR", },
+  { 0x824B, "GL_DEBUG_SOURCE_OTHER_KHR", },
+  { 0x824C, "GL_DEBUG_TYPE_ERROR_KHR", },
+  { 0x824D, "GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_KHR", },
+  { 0x824E, "GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_KHR", },
+  { 0x824F, "GL_DEBUG_TYPE_PORTABILITY_KHR", },
   { 0x8B31, "GL_VERTEX_SHADER", },
   { 0x8B30, "GL_FRAGMENT_SHADER", },
-  { 0x1E00, "GL_KEEP", },
-  { 0x8268, "GL_DEBUG_TYPE_MARKER", },
+  { 0x8FB1, "GL_CPU_OPTIMIZED_QCOM", },
+  { 0x93D2, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR", },
+  { 0x8B5A, "GL_FLOAT_MAT2", },
   { 0x84D8, "GL_TEXTURE24", },
   { 0x84D9, "GL_TEXTURE25", },
   { 0x84D6, "GL_TEXTURE22", },
   { 0x84D7, "GL_TEXTURE23", },
   { 0x84D4, "GL_TEXTURE20", },
-  { 0x84D5, "GL_TEXTURE21", },
+  { 0x0D05, "GL_PACK_ALIGNMENT", },
   { 0x84D2, "GL_TEXTURE18", },
   { 0x84D3, "GL_TEXTURE19", },
   { 0x84D0, "GL_TEXTURE16", },
   { 0x84D1, "GL_TEXTURE17", },
-  { 0x1E03, "GL_DECR", },
+  { 0x93D1, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR", },
   { 0x84DF, "GL_TEXTURE31", },
-  { 0x93D6, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR", },
+  { 0x8B97, "GL_PALETTE8_R5_G6_B5_OES", },
   { 0x84DD, "GL_TEXTURE29", },
   { 0x84DE, "GL_TEXTURE30", },
   { 0x84DB, "GL_TEXTURE27", },
   { 0x84DC, "GL_TEXTURE28", },
   { 0x6002, "GL_TEXTURE_POOL_UNMANAGED_CHROMIUM", },
   { 0x84DA, "GL_TEXTURE26", },
-  { 0x8242, "GL_DEBUG_OUTPUT_SYNCHRONOUS", },
-  { 0x8243, "GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH", },
-  { 0x8244, "GL_DEBUG_CALLBACK_FUNCTION", },
-  { 0x8245, "GL_DEBUG_CALLBACK_USER_PARAM", },
-  { 0x8246, "GL_DEBUG_SOURCE_API", },
-  { 0x8247, "GL_DEBUG_SOURCE_WINDOW_SYSTEM", },
-  { 0x8248, "GL_DEBUG_SOURCE_SHADER_COMPILER", },
-  { 0x8249, "GL_DEBUG_SOURCE_THIRD_PARTY", },
-  { 0x93D5, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR", },
+  { 0x8242, "GL_DEBUG_OUTPUT_SYNCHRONOUS_KHR", },
+  { 0x8243, "GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_KHR", },
+  { 0x8244, "GL_DEBUG_CALLBACK_FUNCTION_KHR", },
+  { 0x8245, "GL_DEBUG_CALLBACK_USER_PARAM_KHR", },
+  { 0x8246, "GL_DEBUG_SOURCE_API_KHR", },
+  { 0x8247, "GL_DEBUG_SOURCE_WINDOW_SYSTEM_KHR", },
+  { 0x8248, "GL_DEBUG_SOURCE_SHADER_COMPILER_KHR", },
+  { 0x8249, "GL_DEBUG_SOURCE_THIRD_PARTY_KHR", },
+  { 0x8B94, "GL_PALETTE4_RGB5_A1_OES", },
   { 0x00000040, "GL_COLOR_BUFFER_BIT6_QCOM", },
   { 0x8645, "GL_VERTEX_ATTRIB_ARRAY_POINTER", },
   { 0x8865, "GL_CURRENT_QUERY_EXT", },
@@ -498,11 +559,26 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x8D6A, "GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT", },
   { 0x8D6C, "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT", },
   { 0x8252, "GL_LOSE_CONTEXT_ON_RESET_EXT", },
-  { 0x8251, "GL_DEBUG_TYPE_OTHER", },
-  { 0x8C40, "GL_SRGB_EXT", },
+  { 0x8C4C, "GL_COMPRESSED_SRGB_S3TC_DXT1_NV", },
+  { 0x8C4E, "GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_NV", },
+  { 0x1102, "GL_NICEST", },
+  { 0x8C4F, "GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_NV", },
+  { 0x93E9, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x6_OES", },
+  { 0x93E8, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x5_OES", },
   { 0x8C43, "GL_SRGB8_ALPHA8_EXT", },
   { 0x8C42, "GL_SRGB_ALPHA_EXT", },
-  { 0x00200000, "GL_STENCIL_BUFFER_BIT5_QCOM", },
+  { 0x8C45, "GL_SLUMINANCE8_ALPHA8_NV", },
+  { 0x8C44, "GL_SLUMINANCE_ALPHA_NV", },
+  { 0x8C47, "GL_SLUMINANCE8_NV", },
+  { 0x8C46, "GL_SLUMINANCE_NV", },
+  { 0x93E1, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x3x3_OES", },
+  { 0x93E0, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_3x3x3_OES", },
+  { 0x93E3, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x4_OES", },
+  { 0x93E2, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x3_OES", },
+  { 0x93E5, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x4_OES", },
+  { 0x93E4, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4x4_OES", },
+  { 0x93E7, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5x5_OES", },
+  { 0x93E6, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x5_OES", },
   { 0x8D68, "GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES", },
   { 0x85BB, "GL_UNSIGNED_SHORT_8_8_REV_APPLE", },
   { 0x8D61, "GL_HALF_FLOAT_OES", },
@@ -512,29 +588,33 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x8D66, "GL_SAMPLER_EXTERNAL_OES", },
   { 0x8D67, "GL_TEXTURE_BINDING_EXTERNAL_OES", },
   { 0x04000000, "GL_MULTISAMPLE_BUFFER_BIT2_QCOM", },
-  { 0x8CEE, "GL_COLOR_ATTACHMENT14_NV", },
+  { 0x8CEE, "GL_COLOR_ATTACHMENT14_EXT", },
   { 0x2800, "GL_TEXTURE_MAG_FILTER", },
   { 0x2801, "GL_TEXTURE_MIN_FILTER", },
   { 0x2802, "GL_TEXTURE_WRAP_S", },
   { 0x2803, "GL_TEXTURE_WRAP_T", },
   { 0x2703, "GL_LINEAR_MIPMAP_LINEAR", },
+  { 0x8B98, "GL_PALETTE8_RGBA4_OES", },
+  { 0x84F3, "GL_FENCE_STATUS_NV", },
   { 0x2702, "GL_NEAREST_MIPMAP_LINEAR", },
   { 0x1F03, "GL_EXTENSIONS", },
   { 0x1F02, "GL_VERSION", },
   { 0x1F01, "GL_RENDERER", },
   { 0x1F00, "GL_VENDOR", },
   { 0x2701, "GL_LINEAR_MIPMAP_NEAREST", },
+  { 0x92B4, "GL_INVERT_OVG_NV", },
   { 0x0B94, "GL_STENCIL_FAIL", },
   { 0x8B4C, "GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS", },
   { 0x8B4D, "GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS", },
   { 0x8B4F, "GL_SHADER_TYPE", },
   { 0x00004000, "GL_COLOR_BUFFER_BIT", },
   { 0x00000010, "GL_COLOR_BUFFER_BIT4_QCOM", },
-  { 0x8834, "GL_DRAW_BUFFER15_NV", },
-  { 0x8833, "GL_DRAW_BUFFER14_NV", },
-  { 0x8832, "GL_DRAW_BUFFER13_NV", },
-  { 0x8831, "GL_DRAW_BUFFER12_NV", },
-  { 0x8830, "GL_DRAW_BUFFER11_NV", },
+  { 0x8834, "GL_DRAW_BUFFER15_EXT", },
+  { 0x8833, "GL_DRAW_BUFFER14_EXT", },
+  { 0x8832, "GL_DRAW_BUFFER13_EXT", },
+  { 0x8831, "GL_DRAW_BUFFER12_EXT", },
+  { 0x8830, "GL_DRAW_BUFFER11_EXT", },
+  { 0x8DC5, "GL_SAMPLER_CUBE_SHADOW_NV", },
   { 0x93B8, "GL_COMPRESSED_RGBA_ASTC_10x5_KHR", },
   { 0x9241, "GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM", },
   { 0x00010000, "GL_STENCIL_BUFFER_BIT0_QCOM", },
@@ -548,15 +628,16 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x2700, "GL_NEAREST_MIPMAP_NEAREST", },
   { 0x0B98, "GL_STENCIL_WRITEMASK", },
   { 0x8B40, "GL_PROGRAM_OBJECT_EXT", },
+  { 0x1004, "GL_TEXTURE_BORDER_COLOR_NV", },
   { 0x8B48, "GL_SHADER_OBJECT_EXT", },
   { 0x912F, "GL_TEXTURE_IMMUTABLE_FORMAT_EXT", },
   { 0x20000000, "GL_MULTISAMPLE_BUFFER_BIT5_QCOM", },
   { 0x0DE1, "GL_TEXTURE_2D", },
   { 0x80C9, "GL_BLEND_SRC_RGB", },
   { 0x80C8, "GL_BLEND_DST_RGB", },
-  { 0x0504, "GL_STACK_UNDERFLOW", },
   { 0x8059, "GL_RGB10_A2_EXT", },
   { 0x8058, "GL_RGBA8_OES", },
+  { 0x8B93, "GL_PALETTE4_RGBA4_OES", },
   { 0x00002000, "GL_DEPTH_BUFFER_BIT5_QCOM", },
   { 0x8051, "GL_RGB8_OES", },
   { 0x8052, "GL_RGB10_EXT", },
@@ -567,22 +648,27 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x01000000, "GL_MULTISAMPLE_BUFFER_BIT0_QCOM", },
   { 0x78ED, "GL_PIXEL_PACK_TRANSFER_BUFFER_CHROMIUM", },
   { 0x78EE, "GL_PIXEL_PACK_TRANSFER_BUFFER_BINDING_CHROMIUM", },
-  { 0x8269, "GL_DEBUG_TYPE_PUSH_GROUP", },
+  { 0x78EF, "GL_PIXEL_UNPACK_TRANSFER_BUFFER_BINDING_CHROMIUM", },
   { 0x0B45, "GL_CULL_FACE_MODE", },
+  { 0x8B92, "GL_PALETTE4_R5_G6_B5_OES", },
   { 0x00100000, "GL_STENCIL_BUFFER_BIT4_QCOM", },
-  { 0x300E, "GL_CONTEXT_LOST", },
+  { 0x9299, "GL_COLORDODGE_NV", },
   { 0x8D20, "GL_STENCIL_ATTACHMENT", },
+  { 0x8B91, "GL_PALETTE4_RGBA8_OES", },
   { 0x00000200, "GL_DEPTH_BUFFER_BIT1_QCOM", },
-  { 0x00008000, "GL_DEPTH_BUFFER_BIT7_QCOM", },
+  { 0x00008000, "GL_COVERAGE_BUFFER_BIT_NV", },
+  { 0x1506, "GL_XOR_NV", },
   { 0x8CA8, "GL_READ_FRAMEBUFFER_ANGLE", },
   { 0x8CA9, "GL_DRAW_FRAMEBUFFER_ANGLE", },
   { 0x8CA6, "GL_FRAMEBUFFER_BINDING", },
   { 0x8CA7, "GL_RENDERBUFFER_BINDING", },
   { 0x8CA4, "GL_STENCIL_BACK_VALUE_MASK", },
   { 0x8CA5, "GL_STENCIL_BACK_WRITEMASK", },
+  { 0x8B90, "GL_PALETTE4_RGB8_OES", },
   { 0x8CA3, "GL_STENCIL_BACK_REF", },
   { 0x80CB, "GL_BLEND_SRC_ALPHA", },
   { 0x80CA, "GL_BLEND_DST_ALPHA", },
+  { 0x8CE7, "GL_COLOR_ATTACHMENT7_EXT", },
   { 0x93B0, "GL_COMPRESSED_RGBA_ASTC_4x4_KHR", },
   { 0x93B1, "GL_COMPRESSED_RGBA_ASTC_5x4_KHR", },
   { 0x93B2, "GL_COMPRESSED_RGBA_ASTC_5x5_KHR", },
@@ -594,20 +680,35 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x8CD6, "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT", },
   { 0x93B9, "GL_COMPRESSED_RGBA_ASTC_10x6_KHR", },
   { 0x8253, "GL_GUILTY_CONTEXT_RESET_EXT", },
-  { 0x8CE5, "GL_COLOR_ATTACHMENT5_NV", },
+  { 0x8CE5, "GL_COLOR_ATTACHMENT5_EXT", },
+  { 0x8CE9, "GL_COLOR_ATTACHMENT9_EXT", },
+  { 0x8B96, "GL_PALETTE8_RGBA8_OES", },
   { 0x8872, "GL_MAX_TEXTURE_IMAGE_UNITS", },
-  { 0x889F, "GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING", },
+  { 0x8508, "GL_DECR_WRAP", },
+  { 0x92AD, "GL_HSL_HUE_NV", },
+  { 0x92AE, "GL_HSL_SATURATION_NV", },
+  { 0x92AF, "GL_HSL_COLOR_NV", },
+  { 0x8DC4, "GL_SAMPLER_2D_ARRAY_SHADOW_NV", },
   { 0x8507, "GL_INCR_WRAP", },
   { 0x8895, "GL_ELEMENT_ARRAY_BUFFER_BINDING", },
   { 0x8894, "GL_ARRAY_BUFFER_BINDING", },
+  { 0x92A3, "GL_INVERT_RGB_NV", },
+  { 0x92A4, "GL_LINEARDODGE_NV", },
+  { 0x92A5, "GL_LINEARBURN_NV", },
   { 0x8893, "GL_ELEMENT_ARRAY_BUFFER", },
   { 0x8892, "GL_ARRAY_BUFFER", },
+  { 0x92A8, "GL_PINLIGHT_NV", },
+  { 0x92A9, "GL_HARDMIX_NV", },
   { 0x8BD8, "GL_TEXTURE_IMAGE_VALID_QCOM", },
+  { 0x84D5, "GL_TEXTURE21", },
+  { 0x9287, "GL_DST_NV", },
   { 0x93BA, "GL_COMPRESSED_RGBA_ASTC_10x8_KHR", },
   { 0x93BB, "GL_COMPRESSED_RGBA_ASTC_10x10_KHR", },
   { 0x93BC, "GL_COMPRESSED_RGBA_ASTC_12x10_KHR", },
   { 0x93BD, "GL_COMPRESSED_RGBA_ASTC_12x12_KHR", },
   { 0x84E8, "GL_MAX_RENDERBUFFER_SIZE", },
+  { 0x9281, "GL_BLEND_OVERLAP_NV", },
+  { 0x9280, "GL_BLEND_PREMULTIPLIED_SRC_NV", },
   { 0x8370, "GL_MIRRORED_REPEAT", },
   { 0x84E0, "GL_ACTIVE_TEXTURE", },
   { 0x8800, "GL_STENCIL_BACK_FUNC", },
@@ -617,6 +718,7 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x8625, "GL_VERTEX_ATTRIB_ARRAY_TYPE", },
   { 0x8622, "GL_VERTEX_ATTRIB_ARRAY_ENABLED", },
   { 0x8623, "GL_VERTEX_ATTRIB_ARRAY_SIZE", },
+  { 0x8DB9, "GL_FRAMEBUFFER_SRGB_EXT", },
   { 0x8259, "GL_ACTIVE_PROGRAM_EXT", },
   { 0x8258, "GL_PROGRAM_SEPARABLE_EXT", },
   { 0x8256, "GL_RESET_NOTIFICATION_STRATEGY_EXT", },
@@ -624,46 +726,53 @@ static const GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x8254, "GL_INNOCENT_CONTEXT_RESET_EXT", },
   { 0x1100, "GL_DONT_CARE", },
   { 0x1101, "GL_FASTEST", },
-  { 0x1102, "GL_NICEST", },
-  { 0x8250, "GL_DEBUG_TYPE_PERFORMANCE", },
-  { 0x8CEB, "GL_COLOR_ATTACHMENT11_NV", },
-  { 0x8CEC, "GL_COLOR_ATTACHMENT12_NV", },
+  { 0x8251, "GL_DEBUG_TYPE_OTHER_KHR", },
+  { 0x8250, "GL_DEBUG_TYPE_PERFORMANCE_KHR", },
+  { 0x8CEB, "GL_COLOR_ATTACHMENT11_EXT", },
+  { 0x8CEC, "GL_COLOR_ATTACHMENT12_EXT", },
   { 0x0408, "GL_FRONT_AND_BACK", },
-  { 0x8CEA, "GL_COLOR_ATTACHMENT10_NV", },
-  { 0x8CEF, "GL_COLOR_ATTACHMENT15_NV", },
-  { 0x8CED, "GL_COLOR_ATTACHMENT13_NV", },
-  { 0x8829, "GL_DRAW_BUFFER4_NV", },
+  { 0x8CEA, "GL_COLOR_ATTACHMENT10_EXT", },
+  { 0x8CEF, "GL_COLOR_ATTACHMENT15_EXT", },
+  { 0x8CED, "GL_COLOR_ATTACHMENT13_EXT", },
+  { 0x8829, "GL_DRAW_BUFFER4_EXT", },
   { 0x0404, "GL_FRONT", },
   { 0x0405, "GL_BACK", },
   { 0x88E1, "GL_STREAM_READ", },
   { 0x88E0, "GL_STREAM_DRAW", },
   { 0x88E4, "GL_STATIC_DRAW", },
+  { 0x93C6, "GL_COMPRESSED_RGBA_ASTC_5x5x5_OES", },
   { 0x88E8, "GL_DYNAMIC_DRAW", },
+  { 0x9291, "GL_PLUS_NV", },
   { 0x8CAA, "GL_READ_FRAMEBUFFER_BINDING_ANGLE", },
+  { 0x93C5, "GL_COMPRESSED_RGBA_ASTC_5x5x4_OES", },
   { 0x40000000, "GL_MULTISAMPLE_BUFFER_BIT6_QCOM", },
   { 0x9116, "GL_SYNC_FENCE_APPLE", },
-  { 0x6000, "GL_TEXTURE_POOL_CHROMIUM", },
+  { 0x93C4, "GL_COMPRESSED_RGBA_ASTC_5x4x4_OES", },
+  { 0x88EE, "GL_ETC1_SRGB8_NV", },
+  { 0x93C3, "GL_COMPRESSED_RGBA_ASTC_4x4x4_OES", },
   { 0x00000800, "GL_DEPTH_BUFFER_BIT3_QCOM", },
   { 0x1903, "GL_RED_EXT", },
-  { 0x6001, "GL_TEXTURE_POOL_MANAGED_CHROMIUM", },
-  { 0x8CE2, "GL_COLOR_ATTACHMENT2_NV", },
+  { 0x93C2, "GL_COMPRESSED_RGBA_ASTC_4x4x3_OES", },
+  { 0x8CE2, "GL_COLOR_ATTACHMENT2_EXT", },
   { 0x8BC1, "GL_COUNTER_RANGE_AMD", },
   { 0x8CE0, "GL_COLOR_ATTACHMENT0", },
-  { 0x8CE1, "GL_COLOR_ATTACHMENT1_NV", },
-  { 0x8CE6, "GL_COLOR_ATTACHMENT6_NV", },
-  { 0x8CE7, "GL_COLOR_ATTACHMENT7_NV", },
+  { 0x8CE1, "GL_COLOR_ATTACHMENT1_EXT", },
+  { 0x8CE6, "GL_COLOR_ATTACHMENT6_EXT", },
+  { 0x93C1, "GL_COMPRESSED_RGBA_ASTC_4x3x3_OES", },
   { 0x8A1F, "GL_RGB_422_APPLE", },
   { 0x93DC, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR", },
-  { 0x8CE8, "GL_COLOR_ATTACHMENT8_NV", },
-  { 0x8CE9, "GL_COLOR_ATTACHMENT9_NV", },
+  { 0x9292, "GL_PLUS_DARKER_NV", },
+  { 0x8CE8, "GL_COLOR_ATTACHMENT8_EXT", },
+  { 0x93C0, "GL_COMPRESSED_RGBA_ASTC_3x3x3_OES", },
   { 0x0C23, "GL_COLOR_WRITEMASK", },
   { 0x0C22, "GL_COLOR_CLEAR_VALUE", },
   { 0x8823, "GL_WRITEONLY_RENDERING_QCOM", },
-  { 0x8824, "GL_MAX_DRAW_BUFFERS_NV", },
+  { 0x8824, "GL_MAX_DRAW_BUFFERS_EXT", },
   { 0x825A, "GL_PROGRAM_PIPELINE_BINDING_EXT", },
   { 0x1909, "GL_LUMINANCE", },
   { 0x0D3A, "GL_MAX_VIEWPORT_DIMS", },
-  { 0x0020, "GL_MAP_UNSYNCHRONIZED_BIT_EXT", },
+  { 0x8B53, "GL_INT_VEC2", },
+  { 0x8826, "GL_DRAW_BUFFER1_EXT", },
   { 0x809E, "GL_SAMPLE_ALPHA_TO_COVERAGE", },
   { 0x8BC0, "GL_COUNTER_TYPE_AMD", },
   { 0x8BC3, "GL_PERCENTAGE_AMD", },
diff --git a/gpu/gles2_conform_support/gles2_conform_test.gyp b/gpu/gles2_conform_support/gles2_conform_test.gyp
index 74ede87..71be1f8 100644
--- a/gpu/gles2_conform_support/gles2_conform_test.gyp
+++ b/gpu/gles2_conform_support/gles2_conform_test.gyp
@@ -107,6 +107,20 @@
           'conditions': [
             ['OS=="linux"', {
               'dependencies': ['../../build/linux/system.gyp:gtk'],
+              'conditions': [
+                [ 'clang==1', {
+                  'cflags': [
+                    '-Wno-array-bounds',
+                    '-Wno-implicit-function-declaration',
+                    '-Wno-incompatible-pointer-types',
+                    '-Wno-parentheses-equality',
+                    '-Wno-pointer-sign',
+                    '-Wno-return-type',
+                    '-Wno-sizeof-pointer-memaccess',
+                    '-Wno-tautological-compare'
+                  ]
+                }]
+              ],
             }],
             ['OS=="win"', {
               'dependencies': [