Update Chrome's GLES2 Headers

BUG=none


Review URL: https://chromiumcodereview.appspot.com/11316046

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

3 files changed, 355 insertions, 244 deletions

diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py
index 5c424aa..b310c45 100755
--- a/gpu/command_buffer/build_gles2_cmd_buffer.py
+++ b/gpu/command_buffer/build_gles2_cmd_buffer.py
@@ -2721,6 +2721,10 @@ TEST_F(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) {
                 func.MakeOriginalArgString("")))
     file.Write("}\n")
 
+  def WriteGLES2Header(self, func, file):
+    """Writes a re-write macro for GLES"""
+    file.Write("#define gl%s GLES2_GET_FUN(%s)\n" %(func.name, func.name))
+
   def WriteClientGLCallLog(self, func, file):
     """Writes a logging macro for the client side code."""
     comma = ""
@@ -6127,6 +6131,10 @@ class Function(object):
     """Writes the GLES2 Implemention definition."""
     self.type_handler.WriteGLES2Implementation(self, file)
 
+  def WriteGLES2Header(self, file):
+    """Writes the GLES2 Implemention unit test."""
+    self.type_handler.WriteGLES2Header(self, file)
+
   def WriteGLES2ImplementationUnitTest(self, file):
     """Writes the GLES2 Implemention unit test."""
     self.type_handler.WriteGLES2ImplementationUnitTest(self, file)
@@ -6895,6 +6903,27 @@ void GLES2DecoderTestBase::SetupInitStateExpectations() {
 """)
     file.Close()
 
+  def WriteGLES2Header(self, filename):
+    """Writes the GLES2 header."""
+    file = CHeaderWriter(
+        filename,
+        "// Because we are using both the real system GL and our own.\n"
+        "// emulated GL we need to use different names to avoid conflicts.\n"
+        "\n")
+
+    file.Write("""#if defined(GLES2_USE_CPP_BINDINGS)
+#define GLES2_GET_FUN(name) gles2::GetGLContext()->name
+#else
+#define GLES2_GET_FUN(name) GLES2 ## name
+#endif
+
+""")
+
+    for func in self.original_functions:
+      func.WriteGLES2Header(file)
+
+    file.Write("\n")
+    file.Close()
 
   def WriteGLES2CLibImplementation(self, filename):
     """Writes the GLES2 c lib implementation."""
@@ -6912,7 +6941,7 @@ NameToFunc g_gles2_function_table[] = {
 """)
     for func in self.original_functions:
       file.Write(
-          '  { "gl%s", reinterpret_cast<GLES2FunctionPointer>(GLES2%s), },\n' %
+          '  { "gl%s", reinterpret_cast<GLES2FunctionPointer>(gl%s), },\n' %
           (func.name, func.name))
     file.Write("""  { NULL, NULL, },
 };
@@ -7044,7 +7073,7 @@ NameToFunc g_gles2_function_table[] = {
         if m:
           name = m.group(1)
           value = m.group(2)
-          if not value in dict:
+          if len(value) <= 10 and not value in dict:
             dict[value] = name
 
     file = CHeaderWriter(filename)
@@ -7374,6 +7403,7 @@ def main(argv):
         "service/gles2_cmd_validation_implementation_autogen.h")
     gen.WriteCommonUtilsHeader("common/gles2_cmd_utils_autogen.h")
     gen.WriteCommonUtilsImpl("common/gles2_cmd_utils_implementation_autogen.h")
+    gen.WriteGLES2Header("../../third_party/khronos/GLES2/gl2chromium.h")
 
   if gen.errors > 0:
     print "%d errors" % gen.errors
diff --git a/gpu/command_buffer/client/gles2_c_lib_autogen.h b/gpu/command_buffer/client/gles2_c_lib_autogen.h
index 0cb04ad..bcc2f6a 100644
--- a/gpu/command_buffer/client/gles2_c_lib_autogen.h
+++ b/gpu/command_buffer/client/gles2_c_lib_autogen.h
@@ -696,333 +696,324 @@ namespace gles2 {
 
 NameToFunc g_gles2_function_table[] = {
   { "glActiveTexture", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2ActiveTexture), },
+      glActiveTexture), },
   { "glAttachShader", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2AttachShader), },
+      glAttachShader), },
   { "glBindAttribLocation", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2BindAttribLocation), },
-  { "glBindBuffer", reinterpret_cast<GLES2FunctionPointer>(GLES2BindBuffer), },
+      glBindAttribLocation), },
+  { "glBindBuffer", reinterpret_cast<GLES2FunctionPointer>(glBindBuffer), },
   { "glBindFramebuffer", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2BindFramebuffer), },
+      glBindFramebuffer), },
   { "glBindRenderbuffer", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2BindRenderbuffer), },
-  { "glBindTexture", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2BindTexture), },
-  { "glBlendColor", reinterpret_cast<GLES2FunctionPointer>(GLES2BlendColor), },
+      glBindRenderbuffer), },
+  { "glBindTexture", reinterpret_cast<GLES2FunctionPointer>(glBindTexture), },
+  { "glBlendColor", reinterpret_cast<GLES2FunctionPointer>(glBlendColor), },
   { "glBlendEquation", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2BlendEquation), },
+      glBlendEquation), },
   { "glBlendEquationSeparate", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2BlendEquationSeparate), },
-  { "glBlendFunc", reinterpret_cast<GLES2FunctionPointer>(GLES2BlendFunc), },
+      glBlendEquationSeparate), },
+  { "glBlendFunc", reinterpret_cast<GLES2FunctionPointer>(glBlendFunc), },
   { "glBlendFuncSeparate", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2BlendFuncSeparate), },
-  { "glBufferData", reinterpret_cast<GLES2FunctionPointer>(GLES2BufferData), },
+      glBlendFuncSeparate), },
+  { "glBufferData", reinterpret_cast<GLES2FunctionPointer>(glBufferData), },
   { "glBufferSubData", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2BufferSubData), },
+      glBufferSubData), },
   { "glCheckFramebufferStatus", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2CheckFramebufferStatus), },
-  { "glClear", reinterpret_cast<GLES2FunctionPointer>(GLES2Clear), },
-  { "glClearColor", reinterpret_cast<GLES2FunctionPointer>(GLES2ClearColor), },
-  { "glClearDepthf", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2ClearDepthf), },
+      glCheckFramebufferStatus), },
+  { "glClear", reinterpret_cast<GLES2FunctionPointer>(glClear), },
+  { "glClearColor", reinterpret_cast<GLES2FunctionPointer>(glClearColor), },
+  { "glClearDepthf", reinterpret_cast<GLES2FunctionPointer>(glClearDepthf), },
   { "glClearStencil", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2ClearStencil), },
-  { "glColorMask", reinterpret_cast<GLES2FunctionPointer>(GLES2ColorMask), },
+      glClearStencil), },
+  { "glColorMask", reinterpret_cast<GLES2FunctionPointer>(glColorMask), },
   { "glCompileShader", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2CompileShader), },
+      glCompileShader), },
   { "glCompressedTexImage2D", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2CompressedTexImage2D), },
+      glCompressedTexImage2D), },
   { "glCompressedTexSubImage2D", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2CompressedTexSubImage2D), },
+      glCompressedTexSubImage2D), },
   { "glCopyTexImage2D", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2CopyTexImage2D), },
+      glCopyTexImage2D), },
   { "glCopyTexSubImage2D", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2CopyTexSubImage2D), },
+      glCopyTexSubImage2D), },
   { "glCreateProgram", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2CreateProgram), },
+      glCreateProgram), },
   { "glCreateShader", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2CreateShader), },
-  { "glCullFace", reinterpret_cast<GLES2FunctionPointer>(GLES2CullFace), },
+      glCreateShader), },
+  { "glCullFace", reinterpret_cast<GLES2FunctionPointer>(glCullFace), },
   { "glDeleteBuffers", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2DeleteBuffers), },
+      glDeleteBuffers), },
   { "glDeleteFramebuffers", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2DeleteFramebuffers), },
+      glDeleteFramebuffers), },
   { "glDeleteProgram", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2DeleteProgram), },
+      glDeleteProgram), },
   { "glDeleteRenderbuffers", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2DeleteRenderbuffers), },
+      glDeleteRenderbuffers), },
   { "glDeleteShader", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2DeleteShader), },
+      glDeleteShader), },
   { "glDeleteTextures", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2DeleteTextures), },
-  { "glDepthFunc", reinterpret_cast<GLES2FunctionPointer>(GLES2DepthFunc), },
-  { "glDepthMask", reinterpret_cast<GLES2FunctionPointer>(GLES2DepthMask), },
-  { "glDepthRangef", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2DepthRangef), },
+      glDeleteTextures), },
+  { "glDepthFunc", reinterpret_cast<GLES2FunctionPointer>(glDepthFunc), },
+  { "glDepthMask", reinterpret_cast<GLES2FunctionPointer>(glDepthMask), },
+  { "glDepthRangef", reinterpret_cast<GLES2FunctionPointer>(glDepthRangef), },
   { "glDetachShader", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2DetachShader), },
-  { "glDisable", reinterpret_cast<GLES2FunctionPointer>(GLES2Disable), },
+      glDetachShader), },
+  { "glDisable", reinterpret_cast<GLES2FunctionPointer>(glDisable), },
   { "glDisableVertexAttribArray", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2DisableVertexAttribArray), },
-  { "glDrawArrays", reinterpret_cast<GLES2FunctionPointer>(GLES2DrawArrays), },
+      glDisableVertexAttribArray), },
+  { "glDrawArrays", reinterpret_cast<GLES2FunctionPointer>(glDrawArrays), },
   { "glDrawElements", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2DrawElements), },
-  { "glEnable", reinterpret_cast<GLES2FunctionPointer>(GLES2Enable), },
+      glDrawElements), },
+  { "glEnable", reinterpret_cast<GLES2FunctionPointer>(glEnable), },
   { "glEnableVertexAttribArray", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2EnableVertexAttribArray), },
-  { "glFinish", reinterpret_cast<GLES2FunctionPointer>(GLES2Finish), },
-  { "glFlush", reinterpret_cast<GLES2FunctionPointer>(GLES2Flush), },
+      glEnableVertexAttribArray), },
+  { "glFinish", reinterpret_cast<GLES2FunctionPointer>(glFinish), },
+  { "glFlush", reinterpret_cast<GLES2FunctionPointer>(glFlush), },
   { "glShallowFlushCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2ShallowFlushCHROMIUM), },
+      glShallowFlushCHROMIUM), },
   { "glFramebufferRenderbuffer", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2FramebufferRenderbuffer), },
+      glFramebufferRenderbuffer), },
   { "glFramebufferTexture2D", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2FramebufferTexture2D), },
-  { "glFrontFace", reinterpret_cast<GLES2FunctionPointer>(GLES2FrontFace), },
-  { "glGenBuffers", reinterpret_cast<GLES2FunctionPointer>(GLES2GenBuffers), },
+      glFramebufferTexture2D), },
+  { "glFrontFace", reinterpret_cast<GLES2FunctionPointer>(glFrontFace), },
+  { "glGenBuffers", reinterpret_cast<GLES2FunctionPointer>(glGenBuffers), },
   { "glGenerateMipmap", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GenerateMipmap), },
+      glGenerateMipmap), },
   { "glGenFramebuffers", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GenFramebuffers), },
+      glGenFramebuffers), },
   { "glGenRenderbuffers", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GenRenderbuffers), },
-  { "glGenTextures", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GenTextures), },
+      glGenRenderbuffers), },
+  { "glGenTextures", reinterpret_cast<GLES2FunctionPointer>(glGenTextures), },
   { "glGetActiveAttrib", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GetActiveAttrib), },
+      glGetActiveAttrib), },
   { "glGetActiveUniform", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GetActiveUniform), },
+      glGetActiveUniform), },
   { "glGetAttachedShaders", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GetAttachedShaders), },
+      glGetAttachedShaders), },
   { "glGetAttribLocation", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GetAttribLocation), },
-  { "glGetBooleanv", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GetBooleanv), },
+      glGetAttribLocation), },
+  { "glGetBooleanv", reinterpret_cast<GLES2FunctionPointer>(glGetBooleanv), },
   { "glGetBufferParameteriv", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GetBufferParameteriv), },
-  { "glGetError", reinterpret_cast<GLES2FunctionPointer>(GLES2GetError), },
-  { "glGetFloatv", reinterpret_cast<GLES2FunctionPointer>(GLES2GetFloatv), },
-  { "glGetFramebufferAttachmentParameteriv", reinterpret_cast<GLES2FunctionPointer>(GLES2GetFramebufferAttachmentParameteriv), },  // NOLINT
-  { "glGetIntegerv", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GetIntegerv), },
+      glGetBufferParameteriv), },
+  { "glGetError", reinterpret_cast<GLES2FunctionPointer>(glGetError), },
+  { "glGetFloatv", reinterpret_cast<GLES2FunctionPointer>(glGetFloatv), },
+  { "glGetFramebufferAttachmentParameteriv", reinterpret_cast<GLES2FunctionPointer>(glGetFramebufferAttachmentParameteriv), },  // NOLINT
+  { "glGetIntegerv", reinterpret_cast<GLES2FunctionPointer>(glGetIntegerv), },
   { "glGetProgramiv", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GetProgramiv), },
+      glGetProgramiv), },
   { "glGetProgramInfoLog", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GetProgramInfoLog), },
+      glGetProgramInfoLog), },
   { "glGetRenderbufferParameteriv", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GetRenderbufferParameteriv), },
-  { "glGetShaderiv", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GetShaderiv), },
+      glGetRenderbufferParameteriv), },
+  { "glGetShaderiv", reinterpret_cast<GLES2FunctionPointer>(glGetShaderiv), },
   { "glGetShaderInfoLog", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GetShaderInfoLog), },
+      glGetShaderInfoLog), },
   { "glGetShaderPrecisionFormat", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GetShaderPrecisionFormat), },
+      glGetShaderPrecisionFormat), },
   { "glGetShaderSource", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GetShaderSource), },
-  { "glGetString", reinterpret_cast<GLES2FunctionPointer>(GLES2GetString), },
+      glGetShaderSource), },
+  { "glGetString", reinterpret_cast<GLES2FunctionPointer>(glGetString), },
   { "glGetTexParameterfv", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GetTexParameterfv), },
+      glGetTexParameterfv), },
   { "glGetTexParameteriv", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GetTexParameteriv), },
+      glGetTexParameteriv), },
   { "glGetUniformfv", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GetUniformfv), },
+      glGetUniformfv), },
   { "glGetUniformiv", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GetUniformiv), },
+      glGetUniformiv), },
   { "glGetUniformLocation", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GetUniformLocation), },
+      glGetUniformLocation), },
   { "glGetVertexAttribfv", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GetVertexAttribfv), },
+      glGetVertexAttribfv), },
   { "glGetVertexAttribiv", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GetVertexAttribiv), },
+      glGetVertexAttribiv), },
   { "glGetVertexAttribPointerv", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GetVertexAttribPointerv), },
-  { "glHint", reinterpret_cast<GLES2FunctionPointer>(GLES2Hint), },
-  { "glIsBuffer", reinterpret_cast<GLES2FunctionPointer>(GLES2IsBuffer), },
-  { "glIsEnabled", reinterpret_cast<GLES2FunctionPointer>(GLES2IsEnabled), },
+      glGetVertexAttribPointerv), },
+  { "glHint", reinterpret_cast<GLES2FunctionPointer>(glHint), },
+  { "glIsBuffer", reinterpret_cast<GLES2FunctionPointer>(glIsBuffer), },
+  { "glIsEnabled", reinterpret_cast<GLES2FunctionPointer>(glIsEnabled), },
   { "glIsFramebuffer", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2IsFramebuffer), },
-  { "glIsProgram", reinterpret_cast<GLES2FunctionPointer>(GLES2IsProgram), },
+      glIsFramebuffer), },
+  { "glIsProgram", reinterpret_cast<GLES2FunctionPointer>(glIsProgram), },
   { "glIsRenderbuffer", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2IsRenderbuffer), },
-  { "glIsShader", reinterpret_cast<GLES2FunctionPointer>(GLES2IsShader), },
-  { "glIsTexture", reinterpret_cast<GLES2FunctionPointer>(GLES2IsTexture), },
-  { "glLineWidth", reinterpret_cast<GLES2FunctionPointer>(GLES2LineWidth), },
-  { "glLinkProgram", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2LinkProgram), },
-  { "glPixelStorei", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2PixelStorei), },
+      glIsRenderbuffer), },
+  { "glIsShader", reinterpret_cast<GLES2FunctionPointer>(glIsShader), },
+  { "glIsTexture", reinterpret_cast<GLES2FunctionPointer>(glIsTexture), },
+  { "glLineWidth", reinterpret_cast<GLES2FunctionPointer>(glLineWidth), },
+  { "glLinkProgram", reinterpret_cast<GLES2FunctionPointer>(glLinkProgram), },
+  { "glPixelStorei", reinterpret_cast<GLES2FunctionPointer>(glPixelStorei), },
   { "glPolygonOffset", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2PolygonOffset), },
-  { "glReadPixels", reinterpret_cast<GLES2FunctionPointer>(GLES2ReadPixels), },
+      glPolygonOffset), },
+  { "glReadPixels", reinterpret_cast<GLES2FunctionPointer>(glReadPixels), },
   { "glReleaseShaderCompiler", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2ReleaseShaderCompiler), },
+      glReleaseShaderCompiler), },
   { "glRenderbufferStorage", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2RenderbufferStorage), },
+      glRenderbufferStorage), },
   { "glSampleCoverage", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2SampleCoverage), },
-  { "glScissor", reinterpret_cast<GLES2FunctionPointer>(GLES2Scissor), },
+      glSampleCoverage), },
+  { "glScissor", reinterpret_cast<GLES2FunctionPointer>(glScissor), },
   { "glShaderBinary", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2ShaderBinary), },
+      glShaderBinary), },
   { "glShaderSource", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2ShaderSource), },
-  { "glStencilFunc", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2StencilFunc), },
+      glShaderSource), },
+  { "glStencilFunc", reinterpret_cast<GLES2FunctionPointer>(glStencilFunc), },
   { "glStencilFuncSeparate", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2StencilFuncSeparate), },
-  { "glStencilMask", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2StencilMask), },
+      glStencilFuncSeparate), },
+  { "glStencilMask", reinterpret_cast<GLES2FunctionPointer>(glStencilMask), },
   { "glStencilMaskSeparate", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2StencilMaskSeparate), },
-  { "glStencilOp", reinterpret_cast<GLES2FunctionPointer>(GLES2StencilOp), },
+      glStencilMaskSeparate), },
+  { "glStencilOp", reinterpret_cast<GLES2FunctionPointer>(glStencilOp), },
   { "glStencilOpSeparate", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2StencilOpSeparate), },
-  { "glTexImage2D", reinterpret_cast<GLES2FunctionPointer>(GLES2TexImage2D), },
+      glStencilOpSeparate), },
+  { "glTexImage2D", reinterpret_cast<GLES2FunctionPointer>(glTexImage2D), },
   { "glTexParameterf", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2TexParameterf), },
+      glTexParameterf), },
   { "glTexParameterfv", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2TexParameterfv), },
+      glTexParameterfv), },
   { "glTexParameteri", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2TexParameteri), },
+      glTexParameteri), },
   { "glTexParameteriv", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2TexParameteriv), },
+      glTexParameteriv), },
   { "glTexSubImage2D", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2TexSubImage2D), },
-  { "glUniform1f", reinterpret_cast<GLES2FunctionPointer>(GLES2Uniform1f), },
-  { "glUniform1fv", reinterpret_cast<GLES2FunctionPointer>(GLES2Uniform1fv), },
-  { "glUniform1i", reinterpret_cast<GLES2FunctionPointer>(GLES2Uniform1i), },
-  { "glUniform1iv", reinterpret_cast<GLES2FunctionPointer>(GLES2Uniform1iv), },
-  { "glUniform2f", reinterpret_cast<GLES2FunctionPointer>(GLES2Uniform2f), },
-  { "glUniform2fv", reinterpret_cast<GLES2FunctionPointer>(GLES2Uniform2fv), },
-  { "glUniform2i", reinterpret_cast<GLES2FunctionPointer>(GLES2Uniform2i), },
-  { "glUniform2iv", reinterpret_cast<GLES2FunctionPointer>(GLES2Uniform2iv), },
-  { "glUniform3f", reinterpret_cast<GLES2FunctionPointer>(GLES2Uniform3f), },
-  { "glUniform3fv", reinterpret_cast<GLES2FunctionPointer>(GLES2Uniform3fv), },
-  { "glUniform3i", reinterpret_cast<GLES2FunctionPointer>(GLES2Uniform3i), },
-  { "glUniform3iv", reinterpret_cast<GLES2FunctionPointer>(GLES2Uniform3iv), },
-  { "glUniform4f", reinterpret_cast<GLES2FunctionPointer>(GLES2Uniform4f), },
-  { "glUniform4fv", reinterpret_cast<GLES2FunctionPointer>(GLES2Uniform4fv), },
-  { "glUniform4i", reinterpret_cast<GLES2FunctionPointer>(GLES2Uniform4i), },
-  { "glUniform4iv", reinterpret_cast<GLES2FunctionPointer>(GLES2Uniform4iv), },
+      glTexSubImage2D), },
+  { "glUniform1f", reinterpret_cast<GLES2FunctionPointer>(glUniform1f), },
+  { "glUniform1fv", reinterpret_cast<GLES2FunctionPointer>(glUniform1fv), },
+  { "glUniform1i", reinterpret_cast<GLES2FunctionPointer>(glUniform1i), },
+  { "glUniform1iv", reinterpret_cast<GLES2FunctionPointer>(glUniform1iv), },
+  { "glUniform2f", reinterpret_cast<GLES2FunctionPointer>(glUniform2f), },
+  { "glUniform2fv", reinterpret_cast<GLES2FunctionPointer>(glUniform2fv), },
+  { "glUniform2i", reinterpret_cast<GLES2FunctionPointer>(glUniform2i), },
+  { "glUniform2iv", reinterpret_cast<GLES2FunctionPointer>(glUniform2iv), },
+  { "glUniform3f", reinterpret_cast<GLES2FunctionPointer>(glUniform3f), },
+  { "glUniform3fv", reinterpret_cast<GLES2FunctionPointer>(glUniform3fv), },
+  { "glUniform3i", reinterpret_cast<GLES2FunctionPointer>(glUniform3i), },
+  { "glUniform3iv", reinterpret_cast<GLES2FunctionPointer>(glUniform3iv), },
+  { "glUniform4f", reinterpret_cast<GLES2FunctionPointer>(glUniform4f), },
+  { "glUniform4fv", reinterpret_cast<GLES2FunctionPointer>(glUniform4fv), },
+  { "glUniform4i", reinterpret_cast<GLES2FunctionPointer>(glUniform4i), },
+  { "glUniform4iv", reinterpret_cast<GLES2FunctionPointer>(glUniform4iv), },
   { "glUniformMatrix2fv", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2UniformMatrix2fv), },
+      glUniformMatrix2fv), },
   { "glUniformMatrix3fv", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2UniformMatrix3fv), },
+      glUniformMatrix3fv), },
   { "glUniformMatrix4fv", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2UniformMatrix4fv), },
-  { "glUseProgram", reinterpret_cast<GLES2FunctionPointer>(GLES2UseProgram), },
+      glUniformMatrix4fv), },
+  { "glUseProgram", reinterpret_cast<GLES2FunctionPointer>(glUseProgram), },
   { "glValidateProgram", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2ValidateProgram), },
+      glValidateProgram), },
   { "glVertexAttrib1f", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2VertexAttrib1f), },
+      glVertexAttrib1f), },
   { "glVertexAttrib1fv", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2VertexAttrib1fv), },
+      glVertexAttrib1fv), },
   { "glVertexAttrib2f", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2VertexAttrib2f), },
+      glVertexAttrib2f), },
   { "glVertexAttrib2fv", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2VertexAttrib2fv), },
+      glVertexAttrib2fv), },
   { "glVertexAttrib3f", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2VertexAttrib3f), },
+      glVertexAttrib3f), },
   { "glVertexAttrib3fv", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2VertexAttrib3fv), },
+      glVertexAttrib3fv), },
   { "glVertexAttrib4f", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2VertexAttrib4f), },
+      glVertexAttrib4f), },
   { "glVertexAttrib4fv", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2VertexAttrib4fv), },
+      glVertexAttrib4fv), },
   { "glVertexAttribPointer", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2VertexAttribPointer), },
-  { "glViewport", reinterpret_cast<GLES2FunctionPointer>(GLES2Viewport), },
+      glVertexAttribPointer), },
+  { "glViewport", reinterpret_cast<GLES2FunctionPointer>(glViewport), },
   { "glBlitFramebufferEXT", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2BlitFramebufferEXT), },
-  { "glRenderbufferStorageMultisampleEXT", reinterpret_cast<GLES2FunctionPointer>(GLES2RenderbufferStorageMultisampleEXT), },  // NOLINT
+      glBlitFramebufferEXT), },
+  { "glRenderbufferStorageMultisampleEXT", reinterpret_cast<GLES2FunctionPointer>(glRenderbufferStorageMultisampleEXT), },  // NOLINT
   { "glTexStorage2DEXT", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2TexStorage2DEXT), },
+      glTexStorage2DEXT), },
   { "glGenQueriesEXT", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GenQueriesEXT), },
+      glGenQueriesEXT), },
   { "glDeleteQueriesEXT", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2DeleteQueriesEXT), },
-  { "glIsQueryEXT", reinterpret_cast<GLES2FunctionPointer>(GLES2IsQueryEXT), },
+      glDeleteQueriesEXT), },
+  { "glIsQueryEXT", reinterpret_cast<GLES2FunctionPointer>(glIsQueryEXT), },
   { "glBeginQueryEXT", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2BeginQueryEXT), },
-  { "glEndQueryEXT", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2EndQueryEXT), },
+      glBeginQueryEXT), },
+  { "glEndQueryEXT", reinterpret_cast<GLES2FunctionPointer>(glEndQueryEXT), },
   { "glGetQueryivEXT", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GetQueryivEXT), },
+      glGetQueryivEXT), },
   { "glGetQueryObjectuivEXT", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GetQueryObjectuivEXT), },
+      glGetQueryObjectuivEXT), },
   { "glInsertEventMarkerEXT", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2InsertEventMarkerEXT), },
+      glInsertEventMarkerEXT), },
   { "glPushGroupMarkerEXT", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2PushGroupMarkerEXT), },
+      glPushGroupMarkerEXT), },
   { "glPopGroupMarkerEXT", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2PopGroupMarkerEXT), },
+      glPopGroupMarkerEXT), },
   { "glGenVertexArraysOES", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GenVertexArraysOES), },
+      glGenVertexArraysOES), },
   { "glDeleteVertexArraysOES", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2DeleteVertexArraysOES), },
+      glDeleteVertexArraysOES), },
   { "glIsVertexArrayOES", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2IsVertexArrayOES), },
+      glIsVertexArrayOES), },
   { "glBindVertexArrayOES", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2BindVertexArrayOES), },
-  { "glSwapBuffers", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2SwapBuffers), },
+      glBindVertexArrayOES), },
+  { "glSwapBuffers", reinterpret_cast<GLES2FunctionPointer>(glSwapBuffers), },
   { "glGetMaxValueInBufferCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GetMaxValueInBufferCHROMIUM), },
+      glGetMaxValueInBufferCHROMIUM), },
   { "glGenSharedIdsCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GenSharedIdsCHROMIUM), },
+      glGenSharedIdsCHROMIUM), },
   { "glDeleteSharedIdsCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2DeleteSharedIdsCHROMIUM), },
+      glDeleteSharedIdsCHROMIUM), },
   { "glRegisterSharedIdsCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2RegisterSharedIdsCHROMIUM), },
+      glRegisterSharedIdsCHROMIUM), },
   { "glEnableFeatureCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2EnableFeatureCHROMIUM), },
+      glEnableFeatureCHROMIUM), },
   { "glMapBufferSubDataCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2MapBufferSubDataCHROMIUM), },
+      glMapBufferSubDataCHROMIUM), },
   { "glUnmapBufferSubDataCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2UnmapBufferSubDataCHROMIUM), },
+      glUnmapBufferSubDataCHROMIUM), },
   { "glMapTexSubImage2DCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2MapTexSubImage2DCHROMIUM), },
+      glMapTexSubImage2DCHROMIUM), },
   { "glUnmapTexSubImage2DCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2UnmapTexSubImage2DCHROMIUM), },
+      glUnmapTexSubImage2DCHROMIUM), },
   { "glResizeCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2ResizeCHROMIUM), },
-  { "glGetRequestableExtensionsCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(GLES2GetRequestableExtensionsCHROMIUM), },  // NOLINT
+      glResizeCHROMIUM), },
+  { "glGetRequestableExtensionsCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(glGetRequestableExtensionsCHROMIUM), },  // NOLINT
   { "glRequestExtensionCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2RequestExtensionCHROMIUM), },
-  { "glRateLimitOffscreenContextCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(GLES2RateLimitOffscreenContextCHROMIUM), },  // NOLINT
+      glRequestExtensionCHROMIUM), },
+  { "glRateLimitOffscreenContextCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(glRateLimitOffscreenContextCHROMIUM), },  // NOLINT
   { "glGetMultipleIntegervCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GetMultipleIntegervCHROMIUM), },
+      glGetMultipleIntegervCHROMIUM), },
   { "glGetProgramInfoCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GetProgramInfoCHROMIUM), },
+      glGetProgramInfoCHROMIUM), },
   { "glCreateStreamTextureCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2CreateStreamTextureCHROMIUM), },
+      glCreateStreamTextureCHROMIUM), },
   { "glDestroyStreamTextureCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2DestroyStreamTextureCHROMIUM), },
+      glDestroyStreamTextureCHROMIUM), },
   { "glGetTranslatedShaderSourceANGLE", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GetTranslatedShaderSourceANGLE), },
+      glGetTranslatedShaderSourceANGLE), },
   { "glPostSubBufferCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2PostSubBufferCHROMIUM), },
+      glPostSubBufferCHROMIUM), },
   { "glTexImageIOSurface2DCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2TexImageIOSurface2DCHROMIUM), },
+      glTexImageIOSurface2DCHROMIUM), },
   { "glCopyTextureCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2CopyTextureCHROMIUM), },
+      glCopyTextureCHROMIUM), },
   { "glDrawArraysInstancedANGLE", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2DrawArraysInstancedANGLE), },
+      glDrawArraysInstancedANGLE), },
   { "glDrawElementsInstancedANGLE", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2DrawElementsInstancedANGLE), },
+      glDrawElementsInstancedANGLE), },
   { "glVertexAttribDivisorANGLE", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2VertexAttribDivisorANGLE), },
+      glVertexAttribDivisorANGLE), },
   { "glGenMailboxCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2GenMailboxCHROMIUM), },
+      glGenMailboxCHROMIUM), },
   { "glProduceTextureCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2ProduceTextureCHROMIUM), },
+      glProduceTextureCHROMIUM), },
   { "glConsumeTextureCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2ConsumeTextureCHROMIUM), },
+      glConsumeTextureCHROMIUM), },
   { "glBindUniformLocationCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2BindUniformLocationCHROMIUM), },
+      glBindUniformLocationCHROMIUM), },
   { "glBindTexImage2DCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2BindTexImage2DCHROMIUM), },
+      glBindTexImage2DCHROMIUM), },
   { "glReleaseTexImage2DCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(
-      GLES2ReleaseTexImage2DCHROMIUM), },
+      glReleaseTexImage2DCHROMIUM), },
+  { "glTraceBeginCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(
+      glTraceBeginCHROMIUM), },
+  { "glTraceEndCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(
+      glTraceEndCHROMIUM), },
   { NULL, NULL, },
 };
 
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 e006a77..901f52a 100644
--- a/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h
@@ -16,15 +16,20 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x0BC2, "GL_ALPHA_TEST_REF_QCOM", },
   { 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", },
   { 0x9130, "GL_SGX_PROGRAM_BINARY_IMG", },
-  { 0x9133, "GL_RENDERBUFFER_SAMPLES_EXT", },
-  { 0x9135, "GL_MAX_SAMPLES_EXT", },
-  { 0x9134, "GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT", },
+  { 0x9133, "GL_RENDERBUFFER_SAMPLES_IMG", },
+  { 0x82E0, "GL_BUFFER", },
+  { 0x9135, "GL_MAX_SAMPLES_IMG", },
+  { 0x9134, "GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_IMG", },
   { 0x9136, "GL_TEXTURE_SAMPLES_IMG", },
   { 0x00000020, "GL_COLOR_BUFFER_BIT5_QCOM", },
+  { 0x0008, "GL_MAP_INVALIDATE_BUFFER_BIT_EXT", },
   { 0x0BC0, "GL_ALPHA_TEST_QCOM", },
   { 0x0006, "GL_TRIANGLE_FAN", },
   { 0x0004, "GL_TRIANGLES", },
@@ -41,10 +46,12 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x8740, "GL_Z400_BINARY_AMD", },
   { 0x8192, "GL_GENERATE_MIPMAP_HINT", },
   { 0x87F9, "GL_3DC_X_AMD", },
+  { 0x8A53, "GL_SYNC_OBJECT_APPLE", },
   { 0x8DF8, "GL_SHADER_BINARY_FORMATS", },
   { 0x8DF9, "GL_NUM_SHADER_BINARY_FORMATS", },
-  { 0x8C92, "GL_ATC_RGB_AMD", },
-  { 0x8C93, "GL_ATC_RGBA_EXPLICIT_ALPHA_AMD", },
+  { 0x826D, "GL_DEBUG_GROUP_STACK_DEPTH", },
+  { 0x826B, "GL_DEBUG_SEVERITY_NOTIFICATION", },
+  { 0x826C, "GL_MAX_DEBUG_GROUP_STACK_DEPTH", },
   { 0x8B59, "GL_BOOL_VEC4", },
   { 0x8B58, "GL_BOOL_VEC3", },
   { 0x8B57, "GL_BOOL_VEC2", },
@@ -53,10 +60,12 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x8B54, "GL_INT_VEC3", },
   { 0x8DF4, "GL_MEDIUM_INT", },
   { 0x8DF5, "GL_HIGH_INT", },
-  { 0x8DF6, "GL_UNSIGNED_INT_10_10_10_2_OES", },
-  { 0x8DF7, "GL_INT_10_10_10_2_OES", },
+  { 0x8B51, "GL_FLOAT_VEC3", },
+  { 0x8B50, "GL_FLOAT_VEC2", },
   { 0x806F, "GL_TEXTURE_3D_OES", },
+  { 0x92E0, "GL_DEBUG_OUTPUT", },
   { 0x806A, "GL_TEXTURE_BINDING_3D_OES", },
+  { 0x93D9, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR", },
   { 0x8CE3, "GL_COLOR_ATTACHMENT3_NV", },
   { 0x8069, "GL_TEXTURE_BINDING_2D", },
   { 0x8261, "GL_NO_RESET_NOTIFICATION_EXT", },
@@ -69,13 +78,13 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x0D05, "GL_PACK_ALIGNMENT", },
   { 0x87FF, "GL_PROGRAM_BINARY_FORMATS_OES", },
   { 0x87FE, "GL_NUM_PROGRAM_BINARY_FORMATS_OES", },
-  { 0x87FA, "GL_3DC_XY_AMD", },
+  { 0x2600, "GL_NEAREST", },
   { 0x2601, "GL_LINEAR", },
+  { 0x8C03, "GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG", },
+  { 0x9242, "GL_UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM", },
   { 0x88BB, "GL_BUFFER_ACCESS_OES", },
   { 0x88BC, "GL_BUFFER_MAPPED_OES", },
   { 0x88BD, "GL_BUFFER_MAP_POINTER_OES", },
-  { 0x904A, "GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX", },
-  { 0x904B, "GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX", },
   { 0x0C10, "GL_SCISSOR_BOX", },
   { 0x0C11, "GL_SCISSOR_TEST", },
   { 0x80000000, "GL_MULTISAMPLE_BUFFER_BIT7_QCOM", },
@@ -105,6 +114,7 @@ static 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", },
@@ -115,9 +125,8 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x8D40, "GL_FRAMEBUFFER", },
   { 0x8D41, "GL_RENDERBUFFER", },
   { 0x0BD0, "GL_DITHER", },
-  { 0x9047, "GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX", },
-  { 0x9049, "GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX", },
-  { 0x9048, "GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX", },
+  { 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", },
@@ -126,12 +135,20 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x81A6, "GL_DEPTH_COMPONENT24_OES", },
   { 0x81A7, "GL_DEPTH_COMPONENT32_OES", },
   { 0x88FE, "GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE", },
+  { 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", },
   { 0x8F60, "GL_MALI_SHADER_BINARY_ARM", },
+  { 0x8F61, "GL_MALI_PROGRAM_BINARY_ARM", },
   { 0x87EE, "GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD", },
   { 0x822B, "GL_RG8_EXT", },
-  { 0x822F, "GL_RG16F_EXT", },
+  { 0x93D1, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR", },
   { 0x822D, "GL_R16F_EXT", },
+  { 0x822E, "GL_R32F_EXT", },
   { 1, "GL_ES_VERSION_2_0", },
   { 0x84F9, "GL_DEPTH_STENCIL_OES", },
   { 0x8368, "GL_UNSIGNED_INT_2_10_10_10_REV_EXT", },
@@ -156,10 +173,14 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
   { 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", },
+  { 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", },
   { 0x80A9, "GL_SAMPLES", },
   { 0x80A8, "GL_SAMPLE_BUFFERS", },
   { 0x0D55, "GL_ALPHA_BITS", },
@@ -194,7 +215,10 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x8CDD, "GL_FRAMEBUFFER_UNSUPPORTED", },
   { 0x8CDF, "GL_MAX_COLOR_ATTACHMENTS_NV", },
   { 0x90F3, "GL_CONTEXT_ROBUST_ACCESS_EXT", },
-  { 0x803C, "GL_ALPHA8_EXT", },
+  { 0x90F2, "GL_MAX_MULTIVIEW_BUFFERS_EXT", },
+  { 0x90F1, "GL_MULTIVIEW_EXT", },
+  { 0x90F0, "GL_COLOR_ATTACHMENT_EXT", },
+  { 0x803C, "GL_ALPHA8_OES", },
   { 0x84F5, "GL_TEXTURE_RECTANGLE_ARB", },
   { 0x882A, "GL_DRAW_BUFFER5_NV", },
   { 0x80AA, "GL_SAMPLE_COVERAGE_VALUE", },
@@ -205,6 +229,8 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x8C17, "GL_UNSIGNED_NORMALIZED_EXT", },
   { 0x8A4F, "GL_PROGRAM_PIPELINE_OBJECT_EXT", },
   { 0x882C, "GL_DRAW_BUFFER7_NV", },
+  { 0x0010, "GL_MAP_FLUSH_EXPLICIT_BIT_EXT", },
+  { 0x882D, "GL_DRAW_BUFFER8_NV", },
   { 0x84FF, "GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT", },
   { 0x0B74, "GL_DEPTH_FUNC", },
   { 0x881B, "GL_RGB16F_EXT", },
@@ -216,6 +242,7 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x882E, "GL_DRAW_BUFFER9_NV", },
   { 0x8073, "GL_MAX_3D_TEXTURE_SIZE_OES", },
   { 0x8072, "GL_TEXTURE_WRAP_R_OES", },
+  { 0x882F, "GL_DRAW_BUFFER10_NV", },
   { 0x80E1, "GL_BGRA_EXT", },
   { 0x8ED7, "GL_COVERAGE_AUTOMATIC_NV", },
   { 0x8ED6, "GL_COVERAGE_EDGE_FRAGMENTS_NV", },
@@ -230,6 +257,7 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x800A, "GL_FUNC_SUBTRACT", },
   { 0x8E2C, "GL_DEPTH_COMPONENT16_NONLINEAR_NV", },
   { 0x889F, "GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING", },
+  { 0x8219, "GL_FRAMEBUFFER_UNDEFINED_OES", },
   { 0x8006, "GL_FUNC_ADD", },
   { 0x8007, "GL_MIN_EXT", },
   { 0x8004, "GL_ONE_MINUS_CONSTANT_ALPHA", },
@@ -249,7 +277,10 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x2901, "GL_REPEAT", },
   { 0x8B99, "GL_PALETTE8_RGB5_A1_OES", },
   { 0x8B98, "GL_PALETTE8_RGBA4_OES", },
+  { 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", },
   { 0x1E02, "GL_INCR", },
@@ -270,40 +301,47 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x8D52, "GL_RENDERBUFFER_BLUE_SIZE", },
   { 0x00080000, "GL_STENCIL_BUFFER_BIT3_QCOM", },
   { 0x886A, "GL_VERTEX_ATTRIB_ARRAY_NORMALIZED", },
+  { 0x0C01, "GL_DRAW_BUFFER_EXT", },
   { 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", },
   { 0x9151, "GL_BUFFER_OBJECT_EXT", },
-  { 0x00000002, "GL_FRAGMENT_SHADER_BIT_EXT", },
-  { 0x00000001, "GL_VERTEX_SHADER_BIT_EXT", },
+  { 0x8C93, "GL_ATC_RGBA_EXPLICIT_ALPHA_AMD", },
+  { 0x00000002, "GL_CONTEXT_FLAG_DEBUG_BIT", },
+  { 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", },
   { 0x8DF0, "GL_LOW_FLOAT", },
   { 0x1906, "GL_ALPHA", },
   { 0x1907, "GL_RGB", },
-  { 0x1901, "GL_STENCIL_INDEX", },
   { 0x1902, "GL_DEPTH_COMPONENT", },
   { 0x8B56, "GL_BOOL", },
+  { 0x93DB, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR", },
   { 0x8B9B, "GL_IMPLEMENTATION_COLOR_READ_FORMAT", },
   { 0x8B9A, "GL_IMPLEMENTATION_COLOR_READ_TYPE", },
-  { 0x8823, "GL_WRITEONLY_RENDERING_QCOM", },
+  { 0x93DA, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR", },
   { 0x1908, "GL_RGBA", },
   { 0x8DF2, "GL_HIGH_FLOAT", },
-  { 0x8826, "GL_DRAW_BUFFER1_NV", },
+  { 0x93DD, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR", },
   { 0x8827, "GL_DRAW_BUFFER2_NV", },
   { 0x9243, "GL_UNPACK_COLORSPACE_CONVERSION_CHROMIUM", },
   { 0x8DF3, "GL_LOW_INT", },
-  { 0x9242, "GL_UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM", },
+  { 0x82E8, "GL_MAX_LABEL_LENGTH", },
   { 0x8B53, "GL_INT_VEC2", },
-  { 0x0C02, "GL_READ_BUFFER_NV", },
-  { 0x9241, "GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM", },
+  { 0x0C02, "GL_READ_BUFFER_EXT", },
+  { 0x82E3, "GL_QUERY", },
+  { 0x82E2, "GL_PROGRAM", },
+  { 0x82E1, "GL_SHADER", },
   { 0x8B52, "GL_FLOAT_VEC4", },
   { 0x9240, "GL_UNPACK_FLIP_Y_CHROMIUM", },
-  { 0x8B51, "GL_FLOAT_VEC3", },
-  { 0x8B50, "GL_FLOAT_VEC2", },
+  { 0x8DF6, "GL_UNSIGNED_INT_10_10_10_2_OES", },
+  { 0x8230, "GL_RG32F_EXT", },
+  { 0x8DF7, "GL_INT_10_10_10_2_OES", },
   { 0x812F, "GL_CLAMP_TO_EDGE", },
   { 0x86A3, "GL_COMPRESSED_TEXTURE_FORMATS", },
   { 0x86A2, "GL_NUM_COMPRESSED_TEXTURE_FORMATS", },
@@ -321,11 +359,13 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x1405, "GL_UNSIGNED_INT", },
   { 0x1404, "GL_INT", },
   { 0x1406, "GL_FLOAT", },
-  { 0x8040, "GL_LUMINANCE8_EXT", },
-  { 0x8045, "GL_LUMINANCE8_ALPHA8_EXT", },
+  { 0x8043, "GL_LUMINANCE4_ALPHA4_OES", },
+  { 0x8040, "GL_LUMINANCE8_OES", },
+  { 0x8045, "GL_LUMINANCE8_ALPHA8_OES", },
   { 0x8CD1, "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME", },
   { 0x00040000, "GL_STENCIL_BUFFER_BIT2_QCOM", },
   { 0x8CD0, "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE", },
+  { 0x8CE4, "GL_COLOR_ATTACHMENT4_NV", },
   { 0x8CD3, "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE", },
   { 0x0B90, "GL_STENCIL_TEST", },
   { 0x8CD2, "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL", },
@@ -333,6 +373,7 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x8CD4, "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES", },
   { 0x8CD7, "GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT", },
   { 0x08000000, "GL_MULTISAMPLE_BUFFER_BIT3_QCOM", },
+  { 0x9112, "GL_OBJECT_TYPE_APPLE", },
   { 0x8038, "GL_POLYGON_OFFSET_FACTOR", },
   { 0x851A, "GL_TEXTURE_CUBE_MAP_NEGATIVE_Z", },
   { 0x851C, "GL_MAX_CUBE_MAP_TEXTURE_SIZE", },
@@ -343,22 +384,31 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x84CF, "GL_TEXTURE15", },
   { 0x84CE, "GL_TEXTURE14", },
   { 0x84CD, "GL_TEXTURE13", },
-  { 0x83F3, "GL_COMPRESSED_RGBA_S3TC_DXT5_EXT", },
-  { 0x83F2, "GL_COMPRESSED_RGBA_S3TC_DXT3_EXT", },
+  { 0x9115, "GL_SYNC_FLAGS_APPLE", },
+  { 0x83F3, "GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE", },
+  { 0x83F2, "GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE", },
   { 0x83F1, "GL_COMPRESSED_RGBA_S3TC_DXT1_EXT", },
-  { 0x83F0, "GL_COMPRESSED_RGB_S3TC_DXT1_EXT", },
+  { 0x9114, "GL_SYNC_STATUS_APPLE", },
   { 0x8C0A, "GL_SGX_BINARY_IMG", },
+  { 0x911C, "GL_CONDITION_SATISFIED_APPLE", },
+  { 0x911B, "GL_TIMEOUT_EXPIRED_APPLE", },
+  { 0x911A, "GL_ALREADY_SIGNALED_APPLE", },
+  { 0x911D, "GL_WAIT_FAILED_APPLE", },
   { 0x846D, "GL_ALIASED_POINT_SIZE_RANGE", },
   { 0x846E, "GL_ALIASED_LINE_WIDTH_RANGE", },
+  { 0x9113, "GL_SYNC_CONDITION_APPLE", },
   { 0x93A4, "GL_PACK_REVERSE_ROW_ORDER_ANGLE", },
-  { 0x93A1, "GL_BGRA8_EXT", },
+  { 0x9111, "GL_MAX_SERVER_WAIT_TIMEOUT_APPLE", },
+  { 0x9117, "GL_SYNC_GPU_COMMANDS_COMPLETE_APPLE", },
   { 0x93A0, "GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE", },
   { 0x93A3, "GL_FRAMEBUFFER_ATTACHMENT_ANGLE", },
   { 0x93A2, "GL_TEXTURE_USAGE_ANGLE", },
   { 0x8802, "GL_STENCIL_BACK_PASS_DEPTH_FAIL", },
+  { 0x9119, "GL_SIGNALED_APPLE", },
+  { 0x9118, "GL_UNSIGNALED_APPLE", },
   { 0x8C01, "GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG", },
   { 0x8C00, "GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG", },
-  { 0x8C03, "GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG", },
+  { 0x8A52, "GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT", },
   { 0x8C02, "GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG", },
   { 0x84C9, "GL_TEXTURE9", },
   { 0x84C8, "GL_TEXTURE8", },
@@ -381,6 +431,8 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x8626, "GL_CURRENT_VERTEX_ATTRIB", },
   { 0x8765, "GL_BUFFER_USAGE", },
   { 0x8764, "GL_BUFFER_SIZE", },
+  { 0x93D8, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR", },
+  { 0x0503, "GL_STACK_OVERFLOW", },
   { 0x0502, "GL_INVALID_OPERATION", },
   { 0x0501, "GL_INVALID_VALUE", },
   { 0x0500, "GL_INVALID_ENUM", },
@@ -391,10 +443,17 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
   { 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", },
   { 0x8B31, "GL_VERTEX_SHADER", },
   { 0x8B30, "GL_FRAGMENT_SHADER", },
   { 0x1E00, "GL_KEEP", },
-  { 0x00000040, "GL_COLOR_BUFFER_BIT6_QCOM", },
+  { 0x8268, "GL_DEBUG_TYPE_MARKER", },
   { 0x84D8, "GL_TEXTURE24", },
   { 0x84D9, "GL_TEXTURE25", },
   { 0x84D6, "GL_TEXTURE22", },
@@ -407,24 +466,34 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x84D1, "GL_TEXTURE17", },
   { 0x1E03, "GL_DECR", },
   { 0x84DF, "GL_TEXTURE31", },
-  { 0x882D, "GL_DRAW_BUFFER8_NV", },
+  { 0x93D6, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR", },
   { 0x84DD, "GL_TEXTURE29", },
   { 0x84DE, "GL_TEXTURE30", },
   { 0x84DB, "GL_TEXTURE27", },
   { 0x84DC, "GL_TEXTURE28", },
   { 0x84DA, "GL_TEXTURE26", },
-  { 0x882F, "GL_DRAW_BUFFER10_NV", },
+  { 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", },
+  { 0x00000040, "GL_COLOR_BUFFER_BIT6_QCOM", },
   { 0x8645, "GL_VERTEX_ATTRIB_ARRAY_POINTER", },
   { 0x8865, "GL_CURRENT_QUERY_EXT", },
   { 0x8866, "GL_QUERY_RESULT_EXT", },
   { 0x8867, "GL_QUERY_RESULT_AVAILABLE_EXT", },
   { 0x300E, "GL_CONTEXT_LOST", },
-  { 0x2600, "GL_NEAREST", },
+  { 0x87FA, "GL_3DC_XY_AMD", },
   { 0x84C4, "GL_TEXTURE4", },
   { 0x85B5, "GL_VERTEX_ARRAY_BINDING_OES", },
   { 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", },
   { 0x8C43, "GL_SRGB8_ALPHA8_EXT", },
   { 0x8C42, "GL_SRGB_ALPHA_EXT", },
@@ -461,6 +530,8 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x8832, "GL_DRAW_BUFFER13_NV", },
   { 0x8831, "GL_DRAW_BUFFER12_NV", },
   { 0x8830, "GL_DRAW_BUFFER11_NV", },
+  { 0x93B8, "GL_COMPRESSED_RGBA_ASTC_10x5_KHR", },
+  { 0x9241, "GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM", },
   { 0x00010000, "GL_STENCIL_BUFFER_BIT0_QCOM", },
   { 0x0B93, "GL_STENCIL_VALUE_MASK", },
   { 0x0B92, "GL_STENCIL_FUNC", },
@@ -478,6 +549,7 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
   { 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", },
   { 0x00002000, "GL_DEPTH_BUFFER_BIT5_QCOM", },
@@ -488,6 +560,7 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x8056, "GL_RGBA4", },
   { 0x150A, "GL_INVERT", },
   { 0x01000000, "GL_MULTISAMPLE_BUFFER_BIT0_QCOM", },
+  { 0x8269, "GL_DEBUG_TYPE_PUSH_GROUP", },
   { 0x0B45, "GL_CULL_FACE_MODE", },
   { 0x00100000, "GL_STENCIL_BUFFER_BIT4_QCOM", },
   { 0x8D20, "GL_STENCIL_ATTACHMENT", },
@@ -502,9 +575,18 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x8CA3, "GL_STENCIL_BACK_REF", },
   { 0x80CB, "GL_BLEND_SRC_ALPHA", },
   { 0x80CA, "GL_BLEND_DST_ALPHA", },
-  { 0x8CE4, "GL_COLOR_ATTACHMENT4_NV", },
+  { 0x93B0, "GL_COMPRESSED_RGBA_ASTC_4x4_KHR", },
+  { 0x93B1, "GL_COMPRESSED_RGBA_ASTC_5x4_KHR", },
+  { 0x93B2, "GL_COMPRESSED_RGBA_ASTC_5x5_KHR", },
+  { 0x93B3, "GL_COMPRESSED_RGBA_ASTC_6x5_KHR", },
+  { 0x93B4, "GL_COMPRESSED_RGBA_ASTC_6x6_KHR", },
+  { 0x93B5, "GL_COMPRESSED_RGBA_ASTC_8x5_KHR", },
+  { 0x93B6, "GL_COMPRESSED_RGBA_ASTC_8x6_KHR", },
+  { 0x93B7, "GL_COMPRESSED_RGBA_ASTC_8x8_KHR", },
   { 0x8CD6, "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT", },
+  { 0x93B9, "GL_COMPRESSED_RGBA_ASTC_10x6_KHR", },
   { 0x8253, "GL_GUILTY_CONTEXT_RESET_EXT", },
+  { 0x8CE5, "GL_COLOR_ATTACHMENT5_NV", },
   { 0x8872, "GL_MAX_TEXTURE_IMAGE_UNITS", },
   { 0x8508, "GL_DECR_WRAP", },
   { 0x8507, "GL_INCR_WRAP", },
@@ -514,6 +596,10 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x8892, "GL_ARRAY_BUFFER", },
   { 0x8BD8, "GL_TEXTURE_IMAGE_VALID_QCOM", },
   { 0x84D3, "GL_TEXTURE19", },
+  { 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", },
   { 0x8370, "GL_MIRRORED_REPEAT", },
   { 0x84E0, "GL_ACTIVE_TEXTURE", },
@@ -532,6 +618,7 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
   { 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", },
   { 0x0408, "GL_FRONT_AND_BACK", },
@@ -546,6 +633,7 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x88E8, "GL_DYNAMIC_DRAW", },
   { 0x8CAA, "GL_READ_FRAMEBUFFER_BINDING_ANGLE", },
   { 0x40000000, "GL_MULTISAMPLE_BUFFER_BIT6_QCOM", },
+  { 0x9116, "GL_SYNC_FENCE_APPLE", },
   { 0x00000800, "GL_DEPTH_BUFFER_BIT3_QCOM", },
   { 0x1903, "GL_RED_EXT", },
   { 0x8CE2, "GL_COLOR_ATTACHMENT2_NV", },
@@ -555,15 +643,17 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
   { 0x8CE6, "GL_COLOR_ATTACHMENT6_NV", },
   { 0x8CE7, "GL_COLOR_ATTACHMENT7_NV", },
   { 0x8A1F, "GL_RGB_422_APPLE", },
-  { 0x8CE5, "GL_COLOR_ATTACHMENT5_NV", },
+  { 0x93DC, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR", },
   { 0x8CE8, "GL_COLOR_ATTACHMENT8_NV", },
   { 0x8CE9, "GL_COLOR_ATTACHMENT9_NV", },
   { 0x0C23, "GL_COLOR_WRITEMASK", },
   { 0x0C22, "GL_COLOR_CLEAR_VALUE", },
+  { 0x8823, "GL_WRITEONLY_RENDERING_QCOM", },
   { 0x8824, "GL_MAX_DRAW_BUFFERS_NV", },
   { 0x825A, "GL_PROGRAM_PIPELINE_BINDING_EXT", },
   { 0x1909, "GL_LUMINANCE", },
   { 0x0D3A, "GL_MAX_VIEWPORT_DIMS", },
+  { 0x0020, "GL_MAP_UNSYNCHRONIZED_BIT_EXT", },
   { 0x809E, "GL_SAMPLE_ALPHA_TO_COVERAGE", },
   { 0x8BC0, "GL_COUNTER_TYPE_AMD", },
   { 0x8BC3, "GL_PERCENTAGE_AMD", },