Revert "Enable EVENT trace to print GLenum as string"

scripts/code_generation_hashes/GL_EGL_WGL_loader.json

@@ -6,7 +6,7 @@
   "scripts/generate_loader.py":
     "48c60c668bec42a80378179aae2acc61",
   "scripts/registry_xml.py":
-    "a801192d7b3fc697cf813a57a41031e0",
+    "40cac0341003ce27d09003ada7f367b4",
   "scripts/wgl.xml":
     "aa96419c582af2f6673430e2847693f4",
   "src/libEGL/egl_loader_autogen.cpp":

scripts/code_generation_hashes/GL_EGL_entry_points.json

@@ -6,13 +6,13 @@
   "scripts/entry_point_packed_gl_enums.json":
     "9ef08db737382d62d2190c9096903902",
   "scripts/generate_entry_points.py":
-    "4d8e1090c18839c0bc662e75bd181bb9",
+    "11aa814c8ad837e39cd2184b84a67321",
   "scripts/gl.xml":
     "b470cb06b06cbbe7adb2c8129ec85708",
   "scripts/gl_angle_ext.xml":
     "bed6b56a38621721e689ebc19601a556",
   "scripts/registry_xml.py":
-    "a801192d7b3fc697cf813a57a41031e0",
+    "40cac0341003ce27d09003ada7f367b4",
   "scripts/wgl.xml":
     "aa96419c582af2f6673430e2847693f4",
   "src/libANGLE/Context_gl_1_0_autogen.h":
@@ -140,79 +140,79 @@
   "src/libANGLE/validationGL4_autogen.h":
     "ebbde7f5154a4d1736330d1fc53b3af7",
   "src/libGL/entry_points_gl_1_0_autogen.cpp":
-    "c6f442a800a7e60446591a9f06071e14",
+    "63ee802b42763919798ef12e490460a7",
   "src/libGL/entry_points_gl_1_0_autogen.h":
     "a2372719bd7fbc4a6b070ecae7d9247a",
   "src/libGL/entry_points_gl_1_1_autogen.cpp":
-    "5449af71e5bfa8766285b9b08e511948",
+    "67e84f20faf4dd0d04926008ea0a2e9a",
   "src/libGL/entry_points_gl_1_1_autogen.h":
     "29ff203c0d402f78d020525a5e5ee447",
   "src/libGL/entry_points_gl_1_2_autogen.cpp":
-    "3594a76c8928e43957d9c45d95aaac22",
+    "424ffac8d5e49c625f4eb45dfbd9734e",
   "src/libGL/entry_points_gl_1_2_autogen.h":
     "db041e9b37eaaf1c31a4b4e2e4e987f4",
   "src/libGL/entry_points_gl_1_3_autogen.cpp":
-    "2bbe7cac6820298af2b4d7c7fb8b3f76",
+    "cc2b8fde7794469a5d71d10e18de6146",
   "src/libGL/entry_points_gl_1_3_autogen.h":
     "0c30cbdd3d5b10e9217a049cc2794317",
   "src/libGL/entry_points_gl_1_4_autogen.cpp":
-    "2d1ea222cbd2e5621c1f5493d5422f79",
+    "5aeb14595231e98a9b25cf2dd9605a50",
   "src/libGL/entry_points_gl_1_4_autogen.h":
     "6f3dcfd98c18cd53f32e61ee01eabad6",
   "src/libGL/entry_points_gl_1_5_autogen.cpp":
-    "a5b7ae36c037a3f58c15e678c7fb80b6",
+    "8131f5dbea024ed50fe1ccff0d2326db",
   "src/libGL/entry_points_gl_1_5_autogen.h":
     "8caacff247caecb833b065afaf6e90ef",
   "src/libGL/entry_points_gl_2_0_autogen.cpp":
-    "adbb395b10d289f63ee0df014faeaf9a",
+    "9187c545b6401d45eb7af0a98d035e51",
   "src/libGL/entry_points_gl_2_0_autogen.h":
     "f0f58f83717148d58b735af5c435f2ef",
   "src/libGL/entry_points_gl_2_1_autogen.cpp":
-    "e9920f0b52c8670058610e266d18062f",
+    "4fb669499e04560153871472b61cd99c",
   "src/libGL/entry_points_gl_2_1_autogen.h":
     "87cd6d513a5852c56eed9b58484fbe19",
   "src/libGL/entry_points_gl_3_0_autogen.cpp":
-    "414b18684e8fcf8480005cc6db8442a3",
+    "03da0bab1c9673f3c668e50eae9471bf",
   "src/libGL/entry_points_gl_3_0_autogen.h":
     "47396290a846f808e598acdbca56e9b3",
   "src/libGL/entry_points_gl_3_1_autogen.cpp":
-    "ae6bbb6f793bc0447b8e3ac18dea6be3",
+    "e2c31101151f5a96193eead859e8021b",
   "src/libGL/entry_points_gl_3_1_autogen.h":
     "6ee6613c0206d99c6afdcd3faddb52a3",
   "src/libGL/entry_points_gl_3_2_autogen.cpp":
-    "71ff573b59ee84d712f019e67c76e7c9",
+    "ac9c90e1db85a982329dfd0be26426c1",
   "src/libGL/entry_points_gl_3_2_autogen.h":
     "347e40b5c9fd08a693bf4ffe713c61e6",
   "src/libGL/entry_points_gl_3_3_autogen.cpp":
-    "6fc55298e15efaecbb9617ef5173b4ab",
+    "2629a236c149c428e006ff9a99a47bd6",
   "src/libGL/entry_points_gl_3_3_autogen.h":
     "2151c64b03364111ad1455609243caba",
   "src/libGL/entry_points_gl_4_0_autogen.cpp":
-    "b06de5222528708669f6a8b6842bf17f",
+    "71dafcdf5735674912db4393ae4fb0cc",
   "src/libGL/entry_points_gl_4_0_autogen.h":
     "c5a258322ee6de37ffdbb6f40d5703a2",
   "src/libGL/entry_points_gl_4_1_autogen.cpp":
-    "218a621549f296c99e0640411c289104",
+    "10807001f592e3930603456f4d4a3cd8",
   "src/libGL/entry_points_gl_4_1_autogen.h":
     "ea1e18bf5ed2bd1063c940bd793cb50c",
   "src/libGL/entry_points_gl_4_2_autogen.cpp":
-    "b0e59cd5e13e6cb4c6b32866baa167f0",
+    "00fa653085c5f4f19aafa5f952468966",
   "src/libGL/entry_points_gl_4_2_autogen.h":
     "e6b93e1c3028230ebf5ba8a09f5f4aca",
   "src/libGL/entry_points_gl_4_3_autogen.cpp":
-    "5f89441b537870ba74778b305723ad0b",
+    "4b51e0a3d4ab4d8b74903104744bcf46",
   "src/libGL/entry_points_gl_4_3_autogen.h":
     "60bf8a8337129670875de694386a0a9d",
   "src/libGL/entry_points_gl_4_4_autogen.cpp":
-    "bd8a5145fe7788634bb24a11cf06b718",
+    "f8b38d30ca005adb08858bfe02935c1b",
   "src/libGL/entry_points_gl_4_4_autogen.h":
     "d0a8c556ffb1c9d4519a66b2868c68b2",
   "src/libGL/entry_points_gl_4_5_autogen.cpp":
-    "3b8238d5a4895e833319201ad21146ef",
+    "23b7ca3024a0e3e60583e7dbe6848e80",
   "src/libGL/entry_points_gl_4_5_autogen.h":
     "0cc66bfbe40b1120e38ba977c2c95cc1",
   "src/libGL/entry_points_gl_4_6_autogen.cpp":
-    "5a31fc31f29411675644c87ea0322707",
+    "da6e469e201b6a2d3874003ddbc6d721",
   "src/libGL/entry_points_gl_4_6_autogen.h":
     "d659e18d8caffa8d0729fc1a8bdd79f2",
   "src/libGL/libGL_autogen.cpp":
@@ -220,23 +220,23 @@
   "src/libGL/libGL_autogen.def":
     "b372327de868ff8eaa4f837b7e434f72",
   "src/libGLESv2/entry_points_gles_1_0_autogen.cpp":
-    "5c7c7ece05439ebe23ea21f4152482e7",
+    "ccf5955c47e40d2b9a6177efa483561f",
   "src/libGLESv2/entry_points_gles_1_0_autogen.h":
     "77fa8d307ebf839838f8812786cddc1a",
   "src/libGLESv2/entry_points_gles_2_0_autogen.cpp":
-    "892aa20ee841e55c3d9ca2dfae63f4e5",
+    "b4a1105446c70b35094e296b6f70f9b4",
   "src/libGLESv2/entry_points_gles_2_0_autogen.h":
     "3bbaf1cf42fba5d675e5b54cd1d14df7",
   "src/libGLESv2/entry_points_gles_3_0_autogen.cpp":
-    "7ac23a92e6a0bf2e8e2c640b792a2446",
+    "006255249002c4319460a8140aa3ea5e",
   "src/libGLESv2/entry_points_gles_3_0_autogen.h":
     "395f6978219abd5182bbe80cc367e40c",
   "src/libGLESv2/entry_points_gles_3_1_autogen.cpp":
-    "bbadfecdf0d305d59c5c8a9a5810590d",
+    "80c1f53990346b655630217825dad8a1",
   "src/libGLESv2/entry_points_gles_3_1_autogen.h":
     "043d09a964c740067bf4279e0b544aed",
   "src/libGLESv2/entry_points_gles_ext_autogen.cpp":
-    "47ff54f009e6f8049280be63f7a10a79",
+    "e5447eeb31048ebb2fba7d909835d41f",
   "src/libGLESv2/entry_points_gles_ext_autogen.h":
     "294cc52579b3439e99914c11bb7cd9f6",
   "src/libGLESv2/libGLESv2_autogen.cpp":

scripts/code_generation_hashes/GLenum_value_to_string_map.json

 {
   "scripts/gen_gl_enum_utils.py":
-    "fd5253543ac5f06dc72f8e46f372a02b",
+    "b01e8fd8aaf03282f430d98cccc960e4",
   "scripts/gl.xml":
     "b470cb06b06cbbe7adb2c8129ec85708",
   "scripts/gl_angle_ext.xml":
     "bed6b56a38621721e689ebc19601a556",
   "src/libANGLE/gl_enum_utils_autogen.cpp":
-    "15ffdf92a6252a40990dbcf298a03782",
+    "e1b0d3b84de3e2259961c4af2a1e7853",
   "src/libANGLE/gl_enum_utils_autogen.h":
-    "938a49b915c5a2fe2e5ec44994181df9"
+    "c04076709a7f310bc313d2eae0713f1e"
 }
\ No newline at end of file

scripts/code_generation_hashes/proc_table.json

@@ -10,7 +10,7 @@
   "scripts/gl_angle_ext.xml":
     "bed6b56a38621721e689ebc19601a556",
   "scripts/registry_xml.py":
-    "a801192d7b3fc697cf813a57a41031e0",
+    "40cac0341003ce27d09003ada7f367b4",
   "scripts/wgl.xml":
     "aa96419c582af2f6673430e2847693f4",
   "src/libGL/proc_table_wgl_autogen.cpp":

scripts/gen_gl_enum_utils.py

@@ -30,9 +30,6 @@ template_gl_enums_header = """// GENERATED FILE - DO NOT EDIT.
 # define LIBANGLE_GL_ENUM_UTILS_AUTOGEN_H_
 
 #include <string>
-#include <sstream>
-
-#include "common/PackedGLEnums_autogen.h"
 
 namespace gl
 {{
@@ -46,14 +43,6 @@ const char *GLenumToString(GLenumGroup enumGroup, unsigned int value);
 
 std::string GLbitfieldToString(GLenumGroup enumGroup, unsigned int value);
 
-template<typename T>
-std::string PackedGLenumToString(GLenum packedEnum) {{
-    T internalTypeEnum = FromGLenum<T>(packedEnum);
-    std::stringstream st;
-    st << internalTypeEnum;
-    return st.str();
-}}
-
 }}
 
 # endif  // LIBANGLE_GL_ENUM_UTILS_AUTOGEN_H_
@@ -71,6 +60,8 @@ template_gl_enums_source = """// GENERATED FILE - DO NOT EDIT.
 
 #include "libANGLE/gl_enum_utils_autogen.h"
 
+#include <sstream>
+
 #include "common/debug.h"
 #include "common/bitset_utils.h"
 
@@ -125,8 +116,7 @@ template_enum_value_to_string_case = """case {value}: return {name};"""
 export_apis = ['gles2']
 export_extensions = registry_xml.supported_extensions
 
-trivial_gl_enums = {'GL_NO_ERROR', 'GL_TIMEOUT_IGNORED', 'GL_INVALID_INDEX'}
-trivial_gl_enum_groups = {'SpecialNumbers'}
+trivial_gl_enums = {'GL_FALSE', 'GL_TRUE', 'GL_NO_ERROR', 'GL_TIMEOUT_IGNORED', 'GL_INVALID_INDEX'}
 
 
 def dump_value_to_string_mapping(gl_enum_in_groups, exporting_enums):
@@ -184,9 +174,6 @@ def main(header_output_path, source_output_path):
     enums_has_group = set()
     for enums_group_node in xml.root.findall('groups/group'):
         group_name = enums_group_node.attrib['name']
-        if group_name in trivial_gl_enum_groups:
-            continue
-
         if group_name not in gl_enum_in_groups:
             gl_enum_in_groups[group_name] = dict()
 

scripts/generate_entry_points.py

@@ -366,15 +366,15 @@ reinterpret_cast_to_dict = {
 }
 
 format_dict = {
-    "GLbitfield": "%s",
-    "GLboolean": "%s",
+    "GLbitfield": "0x%X",
+    "GLboolean": "%u",
     "GLbyte": "%d",
     "GLclampx": "0x%X",
     "GLDEBUGPROC": "0x%016\" PRIxPTR \"",
     "GLDEBUGPROCKHR": "0x%016\" PRIxPTR \"",
     "GLdouble": "%f",
     "GLeglImageOES": "0x%016\" PRIxPTR \"",
-    "GLenum": "%s",
+    "GLenum": "0x%X",
     "GLfixed": "0x%X",
     "GLfloat": "%f",
     "GLint": "%d",
@@ -411,10 +411,6 @@ template_sources_includes = """#include "libGLESv2/entry_points_{header_version}
 #include "libANGLE/validation{validation_header_version}.h"
 #include "libANGLE/entry_points_utils.h"
 #include "libGLESv2/global_state.h"
-
-#if defined(ANGLE_TRACE_ENABLED)
-#    include "libANGLE/gl_enum_utils_autogen.h"
-#endif
 """
 
 template_header_includes_gl32 = """#include <export.h>
@@ -436,10 +432,6 @@ template_sources_includes_gl32 = """#include "libGL/entry_points_{}_autogen.h"
 #include "libANGLE/validationGL{}{}_autogen.h"
 #include "libANGLE/entry_points_utils.h"
 #include "libGLESv2/global_state.h"
-
-#if defined(ANGLE_TRACE_ENABLED)
-#    include "libANGLE/gl_enum_utils_autogen.h"
-#endif
 """
 
 template_event_comment = """// Don't run an EVENT() macro on the EXT_debug_marker entry points.
@@ -625,7 +617,7 @@ def just_the_name_packed(param, reserved_set):
         return name
 
 
-def param_print_argument(command_node, packed_gl_enums, param):
+def param_print_argument(param):
     name_only = just_the_name(param)
     type_only = just_the_type(param)
 
@@ -638,21 +630,6 @@ def param_print_argument(command_node, packed_gl_enums, param):
     if type_only in static_cast_to_dict:
         return "static_cast<" + static_cast_to_dict[type_only] + ">(" + name_only + ")"
 
-    if type_only == "GLbitfield":
-        group_name = find_gl_enum_group_in_command(command_node, name_only)
-        return "GLbitfieldToString(GLenumGroup::%s, %s).c_str()" % (group_name, name_only)
-
-    if type_only == "GLboolean":
-        return "GLenumToString(GLenumGroup::Boolean, %s)" % (name_only,)
-
-    if type_only == "GLenum":
-        if name_only in packed_gl_enums:
-            internal_type = packed_gl_enums[name_only]
-            return "PackedGLenumToString<%s>(%s).c_str()" % (internal_type, name_only)
-        else:
-            group_name = find_gl_enum_group_in_command(command_node, name_only)
-            return "GLenumToString(GLenumGroup::%s, %s)" % (group_name, name_only)
-
     return name_only
 
 
@@ -716,8 +693,7 @@ def get_packed_enums(cmd_packed_gl_enums, cmd_name):
     return cmd_packed_gl_enums.get(strip_suffix(cmd_name), {})
 
 
-def format_entry_point_def(command_node, cmd_name, proto, params, is_explicit_context,
-                           cmd_packed_gl_enums):
+def format_entry_point_def(cmd_name, proto, params, is_explicit_context, cmd_packed_gl_enums):
     packed_gl_enums = get_packed_enums(cmd_packed_gl_enums, cmd_name)
     internal_params = [just_the_name_packed(param, packed_gl_enums) for param in params]
     packed_gl_enum_conversions = []
@@ -731,7 +707,7 @@ def format_entry_point_def(command_node, cmd_name, proto, params, is_explicit_co
                 ">(" + name + ");"
             ]
 
-    pass_params = [param_print_argument(command_node, packed_gl_enums, param) for param in params]
+    pass_params = [param_print_argument(param) for param in params]
     format_params = [param_format_string(param) for param in params]
     return_type = proto[:-len(cmd_name)]
     default_return = default_return_value(cmd_name, return_type.strip())
@@ -934,7 +910,7 @@ def get_entry_points(all_commands, commands, is_explicit_context, is_wgl, all_pa
         decls.append(
             format_entry_point_decl(cmd_name, proto_text, param_text, is_explicit_context))
         defs.append(
-            format_entry_point_def(command, cmd_name, proto_text, param_text, is_explicit_context,
+            format_entry_point_def(cmd_name, proto_text, param_text, is_explicit_context,
                                    cmd_packed_gl_enums))
 
         export_defs.append(

scripts/registry_xml.py

@@ -139,9 +139,6 @@ unsupported_enum_group_names = {
     'FenceConditionNV',
     'BufferPointerNameARB',
     'MatrixIndexPointerTypeARB',
-    'PointParameterNameARB',
-    'ClampColorTargetARB',
-    'ClampColorModeARB',
 }
 
 

src/libANGLE/gl_enum_utils_autogen.cpp

@@ -10,6 +10,8 @@
 
 #include "libANGLE/gl_enum_utils_autogen.h"
 
+#include <sstream>
+
 #include "common/bitset_utils.h"
 #include "common/debug.h"
 
@@ -204,19 +206,6 @@ const char *GLenumToString(GLenumGroup enumGroup, unsigned int value)
             }
         }
 
-        case GLenumGroup::Boolean:
-        {
-            switch (value)
-            {
-                case 0x0:
-                    return "GL_FALSE";
-                case 0x1:
-                    return "GL_TRUE";
-                default:
-                    return "EnumUnknown";
-            }
-        }
-
         case GLenumGroup::Buffer:
         {
             switch (value)

src/libANGLE/gl_enum_utils_autogen.h

@@ -11,11 +11,8 @@
 #ifndef LIBANGLE_GL_ENUM_UTILS_AUTOGEN_H_
 #define LIBANGLE_GL_ENUM_UTILS_AUTOGEN_H_
 
-#include <sstream>
 #include <string>
 
-#include "common/PackedGLEnums_autogen.h"
-
 namespace gl
 {
 
@@ -224,15 +221,6 @@ const char *GLenumToString(GLenumGroup enumGroup, unsigned int value);
 
 std::string GLbitfieldToString(GLenumGroup enumGroup, unsigned int value);
 
-template <typename T>
-std::string PackedGLenumToString(GLenum packedEnum)
-{
-    T internalTypeEnum = FromGLenum<T>(packedEnum);
-    std::stringstream st;
-    st << internalTypeEnum;
-    return st.str();
-}
-
 }  // namespace gl
 
 #endif  // LIBANGLE_GL_ENUM_UTILS_AUTOGEN_H_

src/libGL/entry_points_gl_1_2_autogen.cpp

@@ -23,10 +23,6 @@
 #include "libANGLE/validationGL12_autogen.h"
 #include "libGLESv2/global_state.h"
 
-#if defined(ANGLE_TRACE_ENABLED)
-#    include "libANGLE/gl_enum_utils_autogen.h"
-#endif
-
 namespace gl
 {
 void GL_APIENTRY CopyTexSubImage3D(GLenum target,
@@ -40,10 +36,9 @@ void GL_APIENTRY CopyTexSubImage3D(GLenum target,
                                    GLsizei height)
 {
     EVENT(
-        "(GLenum target = %s, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint "
+        "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint "
         "zoffset = %d, GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)",
-        PackedGLenumToString<TextureTarget>(target).c_str(), level, xoffset, yoffset, zoffset, x, y,
-        width, height);
+        target, level, xoffset, yoffset, zoffset, x, y, width, height);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -70,10 +65,9 @@ void GL_APIENTRY DrawRangeElements(GLenum mode,
                                    const void *indices)
 {
     EVENT(
-        "(GLenum mode = %s, GLuint start = %u, GLuint end = %u, GLsizei count = %d, GLenum type = "
-        "%s, const void *indices = 0x%016" PRIxPTR ")",
-        PackedGLenumToString<PrimitiveMode>(mode).c_str(), start, end, count,
-        PackedGLenumToString<DrawElementsType>(type).c_str(), (uintptr_t)indices);
+        "(GLenum mode = 0x%X, GLuint start = %u, GLuint end = %u, GLsizei count = %d, GLenum type "
+        "= 0x%X, const void *indices = 0x%016" PRIxPTR ")",
+        mode, start, end, count, type, (uintptr_t)indices);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -104,12 +98,11 @@ void GL_APIENTRY TexImage3D(GLenum target,
                             const void *pixels)
 {
     EVENT(
-        "(GLenum target = %s, GLint level = %d, GLint internalformat = %d, GLsizei width = %d, "
-        "GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLenum format = %s, GLenum "
-        "type = %s, const void *pixels = 0x%016" PRIxPTR ")",
-        PackedGLenumToString<TextureTarget>(target).c_str(), level, internalformat, width, height,
-        depth, border, GLenumToString(GLenumGroup::PixelFormat, format),
-        GLenumToString(GLenumGroup::PixelType, type), (uintptr_t)pixels);
+        "(GLenum target = 0x%X, GLint level = %d, GLint internalformat = %d, GLsizei width = %d, "
+        "GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLenum format = 0x%X, GLenum "
+        "type = 0x%X, const void *pixels = 0x%016" PRIxPTR ")",
+        target, level, internalformat, width, height, depth, border, format, type,
+        (uintptr_t)pixels);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -141,12 +134,11 @@ void GL_APIENTRY TexSubImage3D(GLenum target,
                                const void *pixels)
 {
     EVENT(
-        "(GLenum target = %s, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint "
+        "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint "
         "zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, GLenum format "
-        "= %s, GLenum type = %s, const void *pixels = 0x%016" PRIxPTR ")",
-        PackedGLenumToString<TextureTarget>(target).c_str(), level, xoffset, yoffset, zoffset,
-        width, height, depth, GLenumToString(GLenumGroup::PixelFormat, format),
-        GLenumToString(GLenumGroup::PixelType, type), (uintptr_t)pixels);
+        "= 0x%X, GLenum type = 0x%X, const void *pixels = 0x%016" PRIxPTR ")",
+        target, level, xoffset, yoffset, zoffset, width, height, depth, format, type,
+        (uintptr_t)pixels);
 
     Context *context = GetValidGlobalContext();
     if (context)

src/libGL/entry_points_gl_1_4_autogen.cpp

@@ -23,10 +23,6 @@
 #include "libANGLE/validationGL14_autogen.h"
 #include "libGLESv2/global_state.h"
 
-#if defined(ANGLE_TRACE_ENABLED)
-#    include "libANGLE/gl_enum_utils_autogen.h"
-#endif
-
 namespace gl
 {
 void GL_APIENTRY BlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
@@ -49,7 +45,7 @@ void GL_APIENTRY BlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat al
 
 void GL_APIENTRY BlendEquation(GLenum mode)
 {
-    EVENT("(GLenum mode = %s)", GLenumToString(GLenumGroup::BlendEquationModeEXT, mode));
+    EVENT("(GLenum mode = 0x%X)", mode);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -69,12 +65,9 @@ void GL_APIENTRY BlendFuncSeparate(GLenum sfactorRGB,
                                    GLenum dfactorAlpha)
 {
     EVENT(
-        "(GLenum sfactorRGB = %s, GLenum dfactorRGB = %s, GLenum sfactorAlpha = %s, GLenum "
-        "dfactorAlpha = %s)",
-        GLenumToString(GLenumGroup::BlendingFactor, sfactorRGB),
-        GLenumToString(GLenumGroup::BlendingFactor, dfactorRGB),
-        GLenumToString(GLenumGroup::BlendingFactor, sfactorAlpha),
-        GLenumToString(GLenumGroup::BlendingFactor, dfactorAlpha));
+        "(GLenum sfactorRGB = 0x%X, GLenum dfactorRGB = 0x%X, GLenum sfactorAlpha = 0x%X, GLenum "
+        "dfactorAlpha = 0x%X)",
+        sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -93,8 +86,8 @@ void GL_APIENTRY BlendFuncSeparate(GLenum sfactorRGB,
 
 void GL_APIENTRY FogCoordPointer(GLenum type, GLsizei stride, const void *pointer)
 {
-    EVENT("(GLenum type = %s, GLsizei stride = %d, const void *pointer = 0x%016" PRIxPTR ")",
-          GLenumToString(GLenumGroup::FogPointerTypeEXT, type), stride, (uintptr_t)pointer);
+    EVENT("(GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = 0x%016" PRIxPTR ")",
+          type, stride, (uintptr_t)pointer);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -178,10 +171,9 @@ void GL_APIENTRY MultiDrawArrays(GLenum mode,
                                  const GLsizei *count,
                                  GLsizei drawcount)
 {
-    EVENT("(GLenum mode = %s, const GLint *first = 0x%016" PRIxPTR
+    EVENT("(GLenum mode = 0x%X, const GLint *first = 0x%016" PRIxPTR
           ", const GLsizei *count = 0x%016" PRIxPTR ", GLsizei drawcount = %d)",
-          PackedGLenumToString<PrimitiveMode>(mode).c_str(), (uintptr_t)first, (uintptr_t)count,
-          drawcount);
+          mode, (uintptr_t)first, (uintptr_t)count, drawcount);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -203,11 +195,10 @@ void GL_APIENTRY MultiDrawElements(GLenum mode,
                                    const void *const *indices,
                                    GLsizei drawcount)
 {
-    EVENT("(GLenum mode = %s, const GLsizei *count = 0x%016" PRIxPTR
-          ", GLenum type = %s, const void *const*indices = 0x%016" PRIxPTR
+    EVENT("(GLenum mode = 0x%X, const GLsizei *count = 0x%016" PRIxPTR
+          ", GLenum type = 0x%X, const void *const*indices = 0x%016" PRIxPTR
           ", GLsizei drawcount = %d)",
-          PackedGLenumToString<PrimitiveMode>(mode).c_str(), (uintptr_t)count,
-          PackedGLenumToString<DrawElementsType>(type).c_str(), (uintptr_t)indices, drawcount);
+          mode, (uintptr_t)count, type, (uintptr_t)indices, drawcount);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -228,8 +219,7 @@ void GL_APIENTRY MultiDrawElements(GLenum mode,
 
 void GL_APIENTRY PointParameterf(GLenum pname, GLfloat param)
 {
-    EVENT("(GLenum pname = %s, GLfloat param = %f)",
-          PackedGLenumToString<PointParameter>(pname).c_str(), param);
+    EVENT("(GLenum pname = 0x%X, GLfloat param = %f)", pname, param);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -247,8 +237,8 @@ void GL_APIENTRY PointParameterf(GLenum pname, GLfloat param)
 
 void GL_APIENTRY PointParameterfv(GLenum pname, const GLfloat *params)
 {
-    EVENT("(GLenum pname = %s, const GLfloat *params = 0x%016" PRIxPTR ")",
-          PackedGLenumToString<PointParameter>(pname).c_str(), (uintptr_t)params);
+    EVENT("(GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")", pname,
+          (uintptr_t)params);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -266,8 +256,7 @@ void GL_APIENTRY PointParameterfv(GLenum pname, const GLfloat *params)
 
 void GL_APIENTRY PointParameteri(GLenum pname, GLint param)
 {
-    EVENT("(GLenum pname = %s, GLint param = %d)", GLenumToString(GLenumGroup::DefaultGroup, pname),
-          param);
+    EVENT("(GLenum pname = 0x%X, GLint param = %d)", pname, param);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -284,8 +273,8 @@ void GL_APIENTRY PointParameteri(GLenum pname, GLint param)
 
 void GL_APIENTRY PointParameteriv(GLenum pname, const GLint *params)
 {
-    EVENT("(GLenum pname = %s, const GLint *params = 0x%016" PRIxPTR ")",
-          GLenumToString(GLenumGroup::DefaultGroup, pname), (uintptr_t)params);
+    EVENT("(GLenum pname = 0x%X, const GLint *params = 0x%016" PRIxPTR ")", pname,
+          (uintptr_t)params);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -567,9 +556,9 @@ void GL_APIENTRY SecondaryColor3usv(const GLushort *v)
 void GL_APIENTRY SecondaryColorPointer(GLint size, GLenum type, GLsizei stride, const void *pointer)
 {
     EVENT(
-        "(GLint size = %d, GLenum type = %s, GLsizei stride = %d, const void *pointer = "
+        "(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = "
         "0x%016" PRIxPTR ")",
-        size, GLenumToString(GLenumGroup::ColorPointerType, type), stride, (uintptr_t)pointer);
+        size, type, stride, (uintptr_t)pointer);
 
     Context *context = GetValidGlobalContext();
     if (context)

src/libGL/entry_points_gl_1_5_autogen.cpp

@@ -23,16 +23,11 @@
 #include "libANGLE/validationGL15_autogen.h"
 #include "libGLESv2/global_state.h"
 
-#if defined(ANGLE_TRACE_ENABLED)
-#    include "libANGLE/gl_enum_utils_autogen.h"
-#endif
-
 namespace gl
 {
 void GL_APIENTRY BeginQuery(GLenum target, GLuint id)
 {
-    EVENT("(GLenum target = %s, GLuint id = %u)", PackedGLenumToString<QueryType>(target).c_str(),
-          id);
+    EVENT("(GLenum target = 0x%X, GLuint id = %u)", target, id);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -50,8 +45,7 @@ void GL_APIENTRY BeginQuery(GLenum target, GLuint id)
 
 void GL_APIENTRY BindBuffer(GLenum target, GLuint buffer)
 {
-    EVENT("(GLenum target = %s, GLuint buffer = %u)",
-          PackedGLenumToString<BufferBinding>(target).c_str(), buffer);
+    EVENT("(GLenum target = 0x%X, GLuint buffer = %u)", target, buffer);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -69,11 +63,9 @@ void GL_APIENTRY BindBuffer(GLenum target, GLuint buffer)
 
 void GL_APIENTRY BufferData(GLenum target, GLsizeiptr size, const void *data, GLenum usage)
 {
-    EVENT("(GLenum target = %s, GLsizeiptr size = %llu, const void *data = 0x%016" PRIxPTR
-          ", GLenum usage = %s)",
-          PackedGLenumToString<BufferBinding>(target).c_str(),
-          static_cast<unsigned long long>(size), (uintptr_t)data,
-          PackedGLenumToString<BufferUsage>(usage).c_str());
+    EVENT("(GLenum target = 0x%X, GLsizeiptr size = %llu, const void *data = 0x%016" PRIxPTR
+          ", GLenum usage = 0x%X)",
+          target, static_cast<unsigned long long>(size), (uintptr_t)data, usage);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -93,10 +85,9 @@ void GL_APIENTRY BufferData(GLenum target, GLsizeiptr size, const void *data, GL
 void GL_APIENTRY BufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const void *data)
 {
     EVENT(
-        "(GLenum target = %s, GLintptr offset = %llu, GLsizeiptr size = %llu, const void *data = "
+        "(GLenum target = 0x%X, GLintptr offset = %llu, GLsizeiptr size = %llu, const void *data = "
         "0x%016" PRIxPTR ")",
-        PackedGLenumToString<BufferBinding>(target).c_str(),
-        static_cast<unsigned long long>(offset), static_cast<unsigned long long>(size),
+        target, static_cast<unsigned long long>(offset), static_cast<unsigned long long>(size),
         (uintptr_t)data);
 
     Context *context = GetValidGlobalContext();
@@ -148,7 +139,7 @@ void GL_APIENTRY DeleteQueries(GLsizei n, const GLuint *ids)
 
 void GL_APIENTRY EndQuery(GLenum target)
 {
-    EVENT("(GLenum target = %s)", PackedGLenumToString<QueryType>(target).c_str());
+    EVENT("(GLenum target = 0x%X)", target);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -197,9 +188,8 @@ void GL_APIENTRY GenQueries(GLsizei n, GLuint *ids)
 
 void GL_APIENTRY GetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    EVENT("(GLenum target = %s, GLenum pname = %s, GLint *params = 0x%016" PRIxPTR ")",
-          PackedGLenumToString<BufferBinding>(target).c_str(),
-          GLenumToString(GLenumGroup::DefaultGroup, pname), (uintptr_t)params);
+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
+          pname, (uintptr_t)params);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -217,9 +207,8 @@ void GL_APIENTRY GetBufferParameteriv(GLenum target, GLenum pname, GLint *params
 
 void GL_APIENTRY GetBufferPointerv(GLenum target, GLenum pname, void **params)
 {
-    EVENT("(GLenum target = %s, GLenum pname = %s, void **params = 0x%016" PRIxPTR ")",
-          PackedGLenumToString<BufferBinding>(target).c_str(),
-          GLenumToString(GLenumGroup::DefaultGroup, pname), (uintptr_t)params);
+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, void **params = 0x%016" PRIxPTR ")", target,
+          pname, (uintptr_t)params);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -238,10 +227,9 @@ void GL_APIENTRY GetBufferPointerv(GLenum target, GLenum pname, void **params)
 void GL_APIENTRY GetBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, void *data)
 {
     EVENT(
-        "(GLenum target = %s, GLintptr offset = %llu, GLsizeiptr size = %llu, void *data = "
+        "(GLenum target = 0x%X, GLintptr offset = %llu, GLsizeiptr size = %llu, void *data = "
         "0x%016" PRIxPTR ")",
-        GLenumToString(GLenumGroup::BufferTargetARB, target),
-        static_cast<unsigned long long>(offset), static_cast<unsigned long long>(size),
+        target, static_cast<unsigned long long>(offset), static_cast<unsigned long long>(size),
         (uintptr_t)data);
 
     Context *context = GetValidGlobalContext();
@@ -259,8 +247,8 @@ void GL_APIENTRY GetBufferSubData(GLenum target, GLintptr offset, GLsizeiptr siz
 
 void GL_APIENTRY GetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
 {
-    EVENT("(GLuint id = %u, GLenum pname = %s, GLint *params = 0x%016" PRIxPTR ")", id,
-          GLenumToString(GLenumGroup::QueryObjectParameterName, pname), (uintptr_t)params);
+    EVENT("(GLuint id = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", id, pname,
+          (uintptr_t)params);
 
     Context *context = GetGlobalContext();
     if (context)
@@ -277,8 +265,8 @@ void GL_APIENTRY GetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
 
 void GL_APIENTRY GetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
 {
-    EVENT("(GLuint id = %u, GLenum pname = %s, GLuint *params = 0x%016" PRIxPTR ")", id,
-          GLenumToString(GLenumGroup::QueryObjectParameterName, pname), (uintptr_t)params);
+    EVENT("(GLuint id = %u, GLenum pname = 0x%X, GLuint *params = 0x%016" PRIxPTR ")", id, pname,
+          (uintptr_t)params);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -295,9 +283,8 @@ void GL_APIENTRY GetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
 
 void GL_APIENTRY GetQueryiv(GLenum target, GLenum pname, GLint *params)
 {
-    EVENT("(GLenum target = %s, GLenum pname = %s, GLint *params = 0x%016" PRIxPTR ")",
-          PackedGLenumToString<QueryType>(target).c_str(),
-          GLenumToString(GLenumGroup::QueryParameterName, pname), (uintptr_t)params);
+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
+          pname, (uintptr_t)params);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -367,9 +354,7 @@ GLboolean GL_APIENTRY IsQuery(GLuint id)
 
 void *GL_APIENTRY MapBuffer(GLenum target, GLenum access)
 {
-    EVENT("(GLenum target = %s, GLenum access = %s)",
-          PackedGLenumToString<BufferBinding>(target).c_str(),
-          GLenumToString(GLenumGroup::BufferAccessARB, access));
+    EVENT("(GLenum target = 0x%X, GLenum access = 0x%X)", target, access);
 
     Context *context = GetValidGlobalContext();
     void *returnValue;
@@ -397,7 +382,7 @@ void *GL_APIENTRY MapBuffer(GLenum target, GLenum access)
 
 GLboolean GL_APIENTRY UnmapBuffer(GLenum target)
 {
-    EVENT("(GLenum target = %s)", PackedGLenumToString<BufferBinding>(target).c_str());
+    EVENT("(GLenum target = 0x%X)", target);
 
     Context *context = GetValidGlobalContext();
     GLboolean returnValue;

src/libGL/entry_points_gl_2_0_autogen.cpp

@@ -23,10 +23,6 @@
 #include "libANGLE/validationGL2_autogen.h"
 #include "libGLESv2/global_state.h"
 
-#if defined(ANGLE_TRACE_ENABLED)
-#    include "libANGLE/gl_enum_utils_autogen.h"
-#endif
-
 namespace gl
 {
 void GL_APIENTRY AttachShader(GLuint program, GLuint shader)
@@ -66,9 +62,7 @@ void GL_APIENTRY BindAttribLocation(GLuint program, GLuint index, const GLchar *
 
 void GL_APIENTRY BlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
 {
-    EVENT("(GLenum modeRGB = %s, GLenum modeAlpha = %s)",
-          GLenumToString(GLenumGroup::BlendEquationModeEXT, modeRGB),
-          GLenumToString(GLenumGroup::BlendEquationModeEXT, modeAlpha));
+    EVENT("(GLenum modeRGB = 0x%X, GLenum modeAlpha = 0x%X)", modeRGB, modeAlpha);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -127,7 +121,7 @@ GLuint GL_APIENTRY CreateProgram()
 
 GLuint GL_APIENTRY CreateShader(GLenum type)
 {
-    EVENT("(GLenum type = %s)", PackedGLenumToString<ShaderType>(type).c_str());
+    EVENT("(GLenum type = 0x%X)", type);
 
     Context *context = GetValidGlobalContext();
     GLuint returnValue;
@@ -385,8 +379,8 @@ void GL_APIENTRY GetProgramInfoLog(GLuint program,
 
 void GL_APIENTRY GetProgramiv(GLuint program, GLenum pname, GLint *params)
 {
-    EVENT("(GLuint program = %u, GLenum pname = %s, GLint *params = 0x%016" PRIxPTR ")", program,
-          GLenumToString(GLenumGroup::ProgramPropertyARB, pname), (uintptr_t)params);
+    EVENT("(GLuint program = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", program,
+          pname, (uintptr_t)params);
 
     Context *context = GetGlobalContext();
     if (context)
@@ -441,8 +435,8 @@ void GL_APIENTRY GetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length
 
 void GL_APIENTRY GetShaderiv(GLuint shader, GLenum pname, GLint *params)
 {
-    EVENT("(GLuint shader = %u, GLenum pname = %s, GLint *params = 0x%016" PRIxPTR ")", shader,
-          GLenumToString(GLenumGroup::ShaderParameterName, pname), (uintptr_t)params);
+    EVENT("(GLuint shader = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", shader,
+          pname, (uintptr_t)params);
 
     Context *context = GetGlobalContext();
     if (context)
@@ -523,8 +517,8 @@ void GL_APIENTRY GetUniformiv(GLuint program, GLint location, GLint *params)
 
 void GL_APIENTRY GetVertexAttribPointerv(GLuint index, GLenum pname, void **pointer)
 {
-    EVENT("(GLuint index = %u, GLenum pname = %s, void **pointer = 0x%016" PRIxPTR ")", index,
-          GLenumToString(GLenumGroup::DefaultGroup, pname), (uintptr_t)pointer);
+    EVENT("(GLuint index = %u, GLenum pname = 0x%X, void **pointer = 0x%016" PRIxPTR ")", index,
+          pname, (uintptr_t)pointer);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -541,8 +535,8 @@ void GL_APIENTRY GetVertexAttribPointerv(GLuint index, GLenum pname, void **poin
 
 void GL_APIENTRY GetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params)
 {
-    EVENT("(GLuint index = %u, GLenum pname = %s, GLdouble *params = 0x%016" PRIxPTR ")", index,
-          GLenumToString(GLenumGroup::DefaultGroup, pname), (uintptr_t)params);
+    EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLdouble *params = 0x%016" PRIxPTR ")", index,
+          pname, (uintptr_t)params);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -559,8 +553,8 @@ void GL_APIENTRY GetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params)
 
 void GL_APIENTRY GetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
 {
-    EVENT("(GLuint index = %u, GLenum pname = %s, GLfloat *params = 0x%016" PRIxPTR ")", index,
-          GLenumToString(GLenumGroup::DefaultGroup, pname), (uintptr_t)params);
+    EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLfloat *params = 0x%016" PRIxPTR ")", index,
+          pname, (uintptr_t)params);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -577,8 +571,8 @@ void GL_APIENTRY GetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
 
 void GL_APIENTRY GetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
 {
-    EVENT("(GLuint index = %u, GLenum pname = %s, GLint *params = 0x%016" PRIxPTR ")", index,
-          GLenumToString(GLenumGroup::DefaultGroup, pname), (uintptr_t)params);
+    EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", index,
+          pname, (uintptr_t)params);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -685,9 +679,8 @@ void GL_APIENTRY ShaderSource(GLuint shader,
 
 void GL_APIENTRY StencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
 {
-    EVENT("(GLenum face = %s, GLenum func = %s, GLint ref = %d, GLuint mask = %u)",
-          GLenumToString(GLenumGroup::StencilFaceDirection, face),
-          GLenumToString(GLenumGroup::StencilFunction, func), ref, mask);
+    EVENT("(GLenum face = 0x%X, GLenum func = 0x%X, GLint ref = %d, GLuint mask = %u)", face, func,
+          ref, mask);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -704,8 +697,7 @@ void GL_APIENTRY StencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint
 
 void GL_APIENTRY StencilMaskSeparate(GLenum face, GLuint mask)
 {
-    EVENT("(GLenum face = %s, GLuint mask = %u)",
-          GLenumToString(GLenumGroup::StencilFaceDirection, face), mask);
+    EVENT("(GLenum face = 0x%X, GLuint mask = %u)", face, mask);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -722,11 +714,8 @@ void GL_APIENTRY StencilMaskSeparate(GLenum face, GLuint mask)
 
 void GL_APIENTRY StencilOpSeparate(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass)
 {
-    EVENT("(GLenum face = %s, GLenum sfail = %s, GLenum dpfail = %s, GLenum dppass = %s)",
-          GLenumToString(GLenumGroup::StencilFaceDirection, face),
-          GLenumToString(GLenumGroup::StencilOp, sfail),
-          GLenumToString(GLenumGroup::StencilOp, dpfail),
-          GLenumToString(GLenumGroup::StencilOp, dppass));
+    EVENT("(GLenum face = 0x%X, GLenum sfail = 0x%X, GLenum dpfail = 0x%X, GLenum dppass = 0x%X)",
+          face, sfail, dpfail, dppass);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -1030,9 +1019,9 @@ void GL_APIENTRY UniformMatrix2fv(GLint location,
                                   const GLfloat *value)
 {
     EVENT(
-        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %s, const GLfloat *value "
+        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
         "= 0x%016" PRIxPTR ")",
-        location, count, GLenumToString(GLenumGroup::Boolean, transpose), (uintptr_t)value);
+        location, count, transpose, (uintptr_t)value);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -1053,9 +1042,9 @@ void GL_APIENTRY UniformMatrix3fv(GLint location,
                                   const GLfloat *value)
 {
     EVENT(
-        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %s, const GLfloat *value "
+        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
         "= 0x%016" PRIxPTR ")",
-        location, count, GLenumToString(GLenumGroup::Boolean, transpose), (uintptr_t)value);
+        location, count, transpose, (uintptr_t)value);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -1076,9 +1065,9 @@ void GL_APIENTRY UniformMatrix4fv(GLint location,
                                   const GLfloat *value)
 {
     EVENT(
-        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %s, const GLfloat *value "
+        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
         "= 0x%016" PRIxPTR ")",
-        location, count, GLenumToString(GLenumGroup::Boolean, transpose), (uintptr_t)value);
+        location, count, transpose, (uintptr_t)value);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -1746,10 +1735,9 @@ void GL_APIENTRY VertexAttribPointer(GLuint index,
                                      const void *pointer)
 {
     EVENT(
-        "(GLuint index = %u, GLint size = %d, GLenum type = %s, GLboolean normalized = %s, GLsizei "
-        "stride = %d, const void *pointer = 0x%016" PRIxPTR ")",
-        index, size, PackedGLenumToString<VertexAttribType>(type).c_str(),
-        GLenumToString(GLenumGroup::Boolean, normalized), stride, (uintptr_t)pointer);
+        "(GLuint index = %u, GLint size = %d, GLenum type = 0x%X, GLboolean normalized = %u, "
+        "GLsizei stride = %d, const void *pointer = 0x%016" PRIxPTR ")",
+        index, size, type, normalized, stride, (uintptr_t)pointer);
 
     Context *context = GetValidGlobalContext();
     if (context)

src/libGL/entry_points_gl_2_1_autogen.cpp

@@ -23,10 +23,6 @@
 #include "libANGLE/validationGL21_autogen.h"
 #include "libGLESv2/global_state.h"
 
-#if defined(ANGLE_TRACE_ENABLED)
-#    include "libANGLE/gl_enum_utils_autogen.h"
-#endif
-
 namespace gl
 {
 void GL_APIENTRY UniformMatrix2x3fv(GLint location,
@@ -35,9 +31,9 @@ void GL_APIENTRY UniformMatrix2x3fv(GLint location,
                                     const GLfloat *value)
 {
     EVENT(
-        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %s, const GLfloat *value "
+        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
         "= 0x%016" PRIxPTR ")",
-        location, count, GLenumToString(GLenumGroup::Boolean, transpose), (uintptr_t)value);
+        location, count, transpose, (uintptr_t)value);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -58,9 +54,9 @@ void GL_APIENTRY UniformMatrix2x4fv(GLint location,
                                     const GLfloat *value)
 {
     EVENT(
-        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %s, const GLfloat *value "
+        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
         "= 0x%016" PRIxPTR ")",
-        location, count, GLenumToString(GLenumGroup::Boolean, transpose), (uintptr_t)value);
+        location, count, transpose, (uintptr_t)value);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -81,9 +77,9 @@ void GL_APIENTRY UniformMatrix3x2fv(GLint location,
                                     const GLfloat *value)
 {
     EVENT(
-        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %s, const GLfloat *value "
+        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
         "= 0x%016" PRIxPTR ")",
-        location, count, GLenumToString(GLenumGroup::Boolean, transpose), (uintptr_t)value);
+        location, count, transpose, (uintptr_t)value);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -104,9 +100,9 @@ void GL_APIENTRY UniformMatrix3x4fv(GLint location,
                                     const GLfloat *value)
 {
     EVENT(
-        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %s, const GLfloat *value "
+        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
         "= 0x%016" PRIxPTR ")",
-        location, count, GLenumToString(GLenumGroup::Boolean, transpose), (uintptr_t)value);
+        location, count, transpose, (uintptr_t)value);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -127,9 +123,9 @@ void GL_APIENTRY UniformMatrix4x2fv(GLint location,
                                     const GLfloat *value)
 {
     EVENT(
-        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %s, const GLfloat *value "
+        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
         "= 0x%016" PRIxPTR ")",
-        location, count, GLenumToString(GLenumGroup::Boolean, transpose), (uintptr_t)value);
+        location, count, transpose, (uintptr_t)value);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -150,9 +146,9 @@ void GL_APIENTRY UniformMatrix4x3fv(GLint location,
                                     const GLfloat *value)
 {
     EVENT(
-        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %s, const GLfloat *value "
+        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
         "= 0x%016" PRIxPTR ")",
-        location, count, GLenumToString(GLenumGroup::Boolean, transpose), (uintptr_t)value);
+        location, count, transpose, (uintptr_t)value);
 
     Context *context = GetValidGlobalContext();
     if (context)

src/libGL/entry_points_gl_3_1_autogen.cpp

@@ -23,10 +23,6 @@
 #include "libANGLE/validationGL31_autogen.h"
 #include "libGLESv2/global_state.h"
 
-#if defined(ANGLE_TRACE_ENABLED)
-#    include "libANGLE/gl_enum_utils_autogen.h"
-#endif
-
 namespace gl
 {
 void GL_APIENTRY CopyBufferSubData(GLenum readTarget,
@@ -36,12 +32,10 @@ void GL_APIENTRY CopyBufferSubData(GLenum readTarget,
                                    GLsizeiptr size)
 {
     EVENT(
-        "(GLenum readTarget = %s, GLenum writeTarget = %s, GLintptr readOffset = %llu, GLintptr "
-        "writeOffset = %llu, GLsizeiptr size = %llu)",
-        PackedGLenumToString<BufferBinding>(readTarget).c_str(),
-        PackedGLenumToString<BufferBinding>(writeTarget).c_str(),
-        static_cast<unsigned long long>(readOffset), static_cast<unsigned long long>(writeOffset),
-        static_cast<unsigned long long>(size));
+        "(GLenum readTarget = 0x%X, GLenum writeTarget = 0x%X, GLintptr readOffset = %llu, "
+        "GLintptr writeOffset = %llu, GLsizeiptr size = %llu)",
+        readTarget, writeTarget, static_cast<unsigned long long>(readOffset),
+        static_cast<unsigned long long>(writeOffset), static_cast<unsigned long long>(size));
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -63,8 +57,8 @@ void GL_APIENTRY CopyBufferSubData(GLenum readTarget,
 
 void GL_APIENTRY DrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instancecount)
 {
-    EVENT("(GLenum mode = %s, GLint first = %d, GLsizei count = %d, GLsizei instancecount = %d)",
-          PackedGLenumToString<PrimitiveMode>(mode).c_str(), first, count, instancecount);
+    EVENT("(GLenum mode = 0x%X, GLint first = %d, GLsizei count = %d, GLsizei instancecount = %d)",
+          mode, first, count, instancecount);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -89,10 +83,9 @@ void GL_APIENTRY DrawElementsInstanced(GLenum mode,
                                        GLsizei instancecount)
 {
     EVENT(
-        "(GLenum mode = %s, GLsizei count = %d, GLenum type = %s, const void *indices = "
+        "(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const void *indices = "
         "0x%016" PRIxPTR ", GLsizei instancecount = %d)",
-        PackedGLenumToString<PrimitiveMode>(mode).c_str(), count,
-        PackedGLenumToString<DrawElementsType>(type).c_str(), (uintptr_t)indices, instancecount);
+        mode, count, type, (uintptr_t)indices, instancecount);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -144,10 +137,9 @@ void GL_APIENTRY GetActiveUniformBlockiv(GLuint program,
                                          GLint *params)
 {
     EVENT(
-        "(GLuint program = %u, GLuint uniformBlockIndex = %u, GLenum pname = %s, GLint *params = "
+        "(GLuint program = %u, GLuint uniformBlockIndex = %u, GLenum pname = 0x%X, GLint *params = "
         "0x%016" PRIxPTR ")",
-        program, uniformBlockIndex, GLenumToString(GLenumGroup::UniformBlockPName, pname),
-        (uintptr_t)params);
+        program, uniformBlockIndex, pname, (uintptr_t)params);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -198,9 +190,8 @@ void GL_APIENTRY GetActiveUniformsiv(GLuint program,
 {
     EVENT(
         "(GLuint program = %u, GLsizei uniformCount = %d, const GLuint *uniformIndices = "
-        "0x%016" PRIxPTR ", GLenum pname = %s, GLint *params = 0x%016" PRIxPTR ")",
-        program, uniformCount, (uintptr_t)uniformIndices,
-        GLenumToString(GLenumGroup::UniformPName, pname), (uintptr_t)params);
+        "0x%016" PRIxPTR ", GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")",
+        program, uniformCount, (uintptr_t)uniformIndices, pname, (uintptr_t)params);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -290,9 +281,8 @@ void GL_APIENTRY PrimitiveRestartIndex(GLuint index)
 
 void GL_APIENTRY TexBuffer(GLenum target, GLenum internalformat, GLuint buffer)
 {
-    EVENT("(GLenum target = %s, GLenum internalformat = %s, GLuint buffer = %u)",
-          GLenumToString(GLenumGroup::TextureTarget, target),
-          GLenumToString(GLenumGroup::InternalFormat, internalformat), buffer);
+    EVENT("(GLenum target = 0x%X, GLenum internalformat = 0x%X, GLuint buffer = %u)", target,
+          internalformat, buffer);
 
     Context *context = GetValidGlobalContext();
     if (context)

src/libGL/entry_points_gl_4_2_autogen.cpp

@@ -23,10 +23,6 @@
 #include "libANGLE/validationGL42_autogen.h"
 #include "libGLESv2/global_state.h"
 
-#if defined(ANGLE_TRACE_ENABLED)
-#    include "libANGLE/gl_enum_utils_autogen.h"
-#endif
-
 namespace gl
 {
 void GL_APIENTRY BindImageTexture(GLuint unit,
@@ -38,11 +34,9 @@ void GL_APIENTRY BindImageTexture(GLuint unit,
                                   GLenum format)
 {
     EVENT(
-        "(GLuint unit = %u, GLuint texture = %u, GLint level = %d, GLboolean layered = %s, GLint "
-        "layer = %d, GLenum access = %s, GLenum format = %s)",
-        unit, texture, level, GLenumToString(GLenumGroup::Boolean, layered), layer,
-        GLenumToString(GLenumGroup::BufferAccessARB, access),
-        GLenumToString(GLenumGroup::InternalFormat, format));
+        "(GLuint unit = %u, GLuint texture = %u, GLint level = %d, GLboolean layered = %u, GLint "
+        "layer = %d, GLenum access = 0x%X, GLenum format = 0x%X)",
+        unit, texture, level, layered, layer, access, format);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -66,10 +60,9 @@ void GL_APIENTRY DrawArraysInstancedBaseInstance(GLenum mode,
                                                  GLuint baseinstance)
 {
     EVENT(
-        "(GLenum mode = %s, GLint first = %d, GLsizei count = %d, GLsizei instancecount = %d, "
+        "(GLenum mode = 0x%X, GLint first = %d, GLsizei count = %d, GLsizei instancecount = %d, "
         "GLuint baseinstance = %u)",
-        GLenumToString(GLenumGroup::PrimitiveType, mode), first, count, instancecount,
-        baseinstance);
+        mode, first, count, instancecount, baseinstance);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -95,11 +88,9 @@ void GL_APIENTRY DrawElementsInstancedBaseInstance(GLenum mode,
                                                    GLuint baseinstance)
 {
     EVENT(
-        "(GLenum mode = %s, GLsizei count = %d, GLenum type = %s, const void *indices = "
+        "(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const void *indices = "
         "0x%016" PRIxPTR ", GLsizei instancecount = %d, GLuint baseinstance = %u)",
-        GLenumToString(GLenumGroup::PrimitiveType, mode), count,
-        GLenumToString(GLenumGroup::PrimitiveType, type), (uintptr_t)indices, instancecount,
-        baseinstance);
+        mode, count, type, (uintptr_t)indices, instancecount, baseinstance);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -126,12 +117,10 @@ void GL_APIENTRY DrawElementsInstancedBaseVertexBaseInstance(GLenum mode,
                                                              GLuint baseinstance)
 {
     EVENT(
-        "(GLenum mode = %s, GLsizei count = %d, GLenum type = %s, const void *indices = "
+        "(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const void *indices = "
         "0x%016" PRIxPTR
         ", GLsizei instancecount = %d, GLint basevertex = %d, GLuint baseinstance = %u)",
-        GLenumToString(GLenumGroup::PrimitiveType, mode), count,
-        GLenumToString(GLenumGroup::PrimitiveType, type), (uintptr_t)indices, instancecount,
-        basevertex, baseinstance);
+        mode, count, type, (uintptr_t)indices, instancecount, basevertex, baseinstance);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -152,8 +141,8 @@ void GL_APIENTRY DrawElementsInstancedBaseVertexBaseInstance(GLenum mode,
 
 void GL_APIENTRY DrawTransformFeedbackInstanced(GLenum mode, GLuint id, GLsizei instancecount)
 {
-    EVENT("(GLenum mode = %s, GLuint id = %u, GLsizei instancecount = %d)",
-          GLenumToString(GLenumGroup::PrimitiveType, mode), id, instancecount);
+    EVENT("(GLenum mode = 0x%X, GLuint id = %u, GLsizei instancecount = %d)", mode, id,
+          instancecount);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -174,8 +163,8 @@ void GL_APIENTRY DrawTransformFeedbackStreamInstanced(GLenum mode,
                                                       GLuint stream,
                                                       GLsizei instancecount)
 {
-    EVENT("(GLenum mode = %s, GLuint id = %u, GLuint stream = %u, GLsizei instancecount = %d)",
-          GLenumToString(GLenumGroup::PrimitiveType, mode), id, stream, instancecount);
+    EVENT("(GLenum mode = 0x%X, GLuint id = %u, GLuint stream = %u, GLsizei instancecount = %d)",
+          mode, id, stream, instancecount);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -198,10 +187,9 @@ void GL_APIENTRY GetActiveAtomicCounterBufferiv(GLuint program,
                                                 GLint *params)
 {
     EVENT(
-        "(GLuint program = %u, GLuint bufferIndex = %u, GLenum pname = %s, GLint *params = "
+        "(GLuint program = %u, GLuint bufferIndex = %u, GLenum pname = 0x%X, GLint *params = "
         "0x%016" PRIxPTR ")",
-        program, bufferIndex, GLenumToString(GLenumGroup::AtomicCounterBufferPName, pname),
-        (uintptr_t)params);
+        program, bufferIndex, pname, (uintptr_t)params);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -225,11 +213,9 @@ void GL_APIENTRY GetInternalformativ(GLenum target,
                                      GLint *params)
 {
     EVENT(
-        "(GLenum target = %s, GLenum internalformat = %s, GLenum pname = %s, GLsizei bufSize = %d, "
-        "GLint *params = 0x%016" PRIxPTR ")",
-        GLenumToString(GLenumGroup::TextureTarget, target),
-        GLenumToString(GLenumGroup::InternalFormat, internalformat),
-        GLenumToString(GLenumGroup::InternalFormatPName, pname), bufSize, (uintptr_t)params);
+        "(GLenum target = 0x%X, GLenum internalformat = 0x%X, GLenum pname = 0x%X, GLsizei bufSize "
+        "= %d, GLint *params = 0x%016" PRIxPTR ")",
+        target, internalformat, pname, bufSize, (uintptr_t)params);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -248,8 +234,7 @@ void GL_APIENTRY GetInternalformativ(GLenum target,
 
 void GL_APIENTRY MemoryBarrier(GLbitfield barriers)
 {
-    EVENT("(GLbitfield barriers = %s)",
-          GLbitfieldToString(GLenumGroup::MemoryBarrierMask, barriers).c_str());
+    EVENT("(GLbitfield barriers = 0x%X)", barriers);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -266,9 +251,9 @@ void GL_APIENTRY MemoryBarrier(GLbitfield barriers)
 void GL_APIENTRY TexStorage1D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width)
 {
     EVENT(
-        "(GLenum target = %s, GLsizei levels = %d, GLenum internalformat = %s, GLsizei width = %d)",
-        GLenumToString(GLenumGroup::TextureTarget, target), levels,
-        GLenumToString(GLenumGroup::InternalFormat, internalformat), width);
+        "(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalformat = 0x%X, GLsizei width = "
+        "%d)",
+        target, levels, internalformat, width);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -287,10 +272,9 @@ void GL_APIENTRY
 TexStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)
 {
     EVENT(
-        "(GLenum target = %s, GLsizei levels = %d, GLenum internalformat = %s, GLsizei width = %d, "
-        "GLsizei height = %d)",
-        PackedGLenumToString<TextureType>(target).c_str(), levels,
-        GLenumToString(GLenumGroup::InternalFormat, internalformat), width, height);
+        "(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalformat = 0x%X, GLsizei width = "
+        "%d, GLsizei height = %d)",
+        target, levels, internalformat, width, height);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -316,10 +300,9 @@ void GL_APIENTRY TexStorage3D(GLenum target,
                               GLsizei depth)
 {
     EVENT(
-        "(GLenum target = %s, GLsizei levels = %d, GLenum internalformat = %s, GLsizei width = %d, "
-        "GLsizei height = %d, GLsizei depth = %d)",
-        PackedGLenumToString<TextureType>(target).c_str(), levels,
-        GLenumToString(GLenumGroup::InternalFormat, internalformat), width, height, depth);
+        "(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalformat = 0x%X, GLsizei width = "
+        "%d, GLsizei height = %d, GLsizei depth = %d)",
+        target, levels, internalformat, width, height, depth);
 
     Context *context = GetValidGlobalContext();
     if (context)

src/libGL/entry_points_gl_4_4_autogen.cpp

@@ -23,18 +23,14 @@
 #include "libANGLE/validationGL44_autogen.h"
 #include "libGLESv2/global_state.h"
 
-#if defined(ANGLE_TRACE_ENABLED)
-#    include "libANGLE/gl_enum_utils_autogen.h"
-#endif
-
 namespace gl
 {
 void GL_APIENTRY BindBuffersBase(GLenum target, GLuint first, GLsizei count, const GLuint *buffers)
 {
     EVENT(
-        "(GLenum target = %s, GLuint first = %u, GLsizei count = %d, const GLuint *buffers = "
+        "(GLenum target = 0x%X, GLuint first = %u, GLsizei count = %d, const GLuint *buffers = "
         "0x%016" PRIxPTR ")",
-        GLenumToString(GLenumGroup::BufferTargetARB, target), first, count, (uintptr_t)buffers);
+        target, first, count, (uintptr_t)buffers);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -57,11 +53,10 @@ void GL_APIENTRY BindBuffersRange(GLenum target,
                                   const GLsizeiptr *sizes)
 {
     EVENT(
-        "(GLenum target = %s, GLuint first = %u, GLsizei count = %d, const GLuint *buffers = "
+        "(GLenum target = 0x%X, GLuint first = %u, GLsizei count = %d, const GLuint *buffers = "
         "0x%016" PRIxPTR ", const GLintptr *offsets = 0x%016" PRIxPTR
         ", const GLsizeiptr *sizes = 0x%016" PRIxPTR ")",
-        GLenumToString(GLenumGroup::BufferTargetARB, target), first, count, (uintptr_t)buffers,
-        (uintptr_t)offsets, (uintptr_t)sizes);
+        target, first, count, (uintptr_t)buffers, (uintptr_t)offsets, (uintptr_t)sizes);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -160,11 +155,9 @@ void GL_APIENTRY BindVertexBuffers(GLuint first,
 
 void GL_APIENTRY BufferStorage(GLenum target, GLsizeiptr size, const void *data, GLbitfield flags)
 {
-    EVENT("(GLenum target = %s, GLsizeiptr size = %llu, const void *data = 0x%016" PRIxPTR
-          ", GLbitfield flags = %s)",
-          GLenumToString(GLenumGroup::BufferStorageTarget, target),
-          static_cast<unsigned long long>(size), (uintptr_t)data,
-          GLbitfieldToString(GLenumGroup::MapBufferUsageMask, flags).c_str());
+    EVENT("(GLenum target = 0x%X, GLsizeiptr size = %llu, const void *data = 0x%016" PRIxPTR
+          ", GLbitfield flags = 0x%X)",
+          target, static_cast<unsigned long long>(size), (uintptr_t)data, flags);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -183,10 +176,9 @@ void GL_APIENTRY
 ClearTexImage(GLuint texture, GLint level, GLenum format, GLenum type, const void *data)
 {
     EVENT(
-        "(GLuint texture = %u, GLint level = %d, GLenum format = %s, GLenum type = %s, const void "
-        "*data = 0x%016" PRIxPTR ")",
-        texture, level, GLenumToString(GLenumGroup::PixelFormat, format),
-        GLenumToString(GLenumGroup::PixelType, type), (uintptr_t)data);
+        "(GLuint texture = %u, GLint level = %d, GLenum format = 0x%X, GLenum type = 0x%X, const "
+        "void *data = 0x%016" PRIxPTR ")",
+        texture, level, format, type, (uintptr_t)data);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -216,10 +208,9 @@ void GL_APIENTRY ClearTexSubImage(GLuint texture,
     EVENT(
         "(GLuint texture = %u, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint "
         "zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, GLenum format "
-        "= %s, GLenum type = %s, const void *data = 0x%016" PRIxPTR ")",
-        texture, level, xoffset, yoffset, zoffset, width, height, depth,
-        GLenumToString(GLenumGroup::PixelFormat, format),
-        GLenumToString(GLenumGroup::PixelType, type), (uintptr_t)data);
+        "= 0x%X, GLenum type = 0x%X, const void *data = 0x%016" PRIxPTR ")",
+        texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type,
+        (uintptr_t)data);
 
     Context *context = GetValidGlobalContext();
     if (context)

src/libGL/entry_points_gl_4_6_autogen.cpp

@@ -23,10 +23,6 @@
 #include "libANGLE/validationGL46_autogen.h"
 #include "libGLESv2/global_state.h"
 
-#if defined(ANGLE_TRACE_ENABLED)
-#    include "libANGLE/gl_enum_utils_autogen.h"
-#endif
-
 namespace gl
 {
 void GL_APIENTRY MultiDrawArraysIndirectCount(GLenum mode,
@@ -35,10 +31,10 @@ void GL_APIENTRY MultiDrawArraysIndirectCount(GLenum mode,
                                               GLsizei maxdrawcount,
                                               GLsizei stride)
 {
-    EVENT("(GLenum mode = %s, const void *indirect = 0x%016" PRIxPTR
+    EVENT("(GLenum mode = 0x%X, const void *indirect = 0x%016" PRIxPTR
           ", GLintptr drawcount = %llu, GLsizei maxdrawcount = %d, GLsizei stride = %d)",
-          GLenumToString(GLenumGroup::PrimitiveType, mode), (uintptr_t)indirect,
-          static_cast<unsigned long long>(drawcount), maxdrawcount, stride);
+          mode, (uintptr_t)indirect, static_cast<unsigned long long>(drawcount), maxdrawcount,
+          stride);
 
     Context *context = GetValidGlobalContext();
     if (context)
@@ -62,11 +58,10 @@ void GL_APIENTRY MultiDrawElementsIndirectCount(GLenum mode,
                                                 GLsizei maxdrawcount,
                                                 GLsizei stride)
 {
-    EVENT("(GLenum mode = %s, GLenum type = %s, const void *indirect = 0x%016" PRIxPTR
+    EVENT("(GLenum mode = 0x%X, GLenum type = 0x%X, const void *indirect = 0x%016" PRIxPTR
           ", GLintptr drawcount = %llu, GLsizei maxdrawcount = %d, GLsizei stride = %d)",
-          GLenumToString(GLenumGroup::PrimitiveType, mode),
-          GLenumToString(GLenumGroup::DefaultGroup, type), (uintptr_t)indirect,
-          static_cast<unsigned long long>(drawcount), maxdrawcount, stride);
+          mode, type, (uintptr_t)indirect, static_cast<unsigned long long>(drawcount), maxdrawcount,
+          stride);
 
     Context *context = GetValidGlobalContext();
     if (context)

src/libGLESv2.gni

@@ -304,8 +304,6 @@ libangle_sources = [
   "src/libANGLE/format_map_desktop.cpp",
   "src/libANGLE/formatutils.cpp",
   "src/libANGLE/formatutils.h",
-  "src/libANGLE/gl_enum_utils_autogen.cpp",
-  "src/libANGLE/gl_enum_utils_autogen.h",
   "src/libANGLE/histogram_macros.h",
   "src/libANGLE/queryconversions.cpp",
   "src/libANGLE/queryconversions.h",
@@ -925,6 +923,7 @@ libangle_sources += [
   "src/libANGLE/capture_gles_3_1_autogen.h",
   "src/libANGLE/capture_gles_ext_autogen.h",
   "src/libANGLE/frame_capture_utils_autogen.h",
+  "src/libANGLE/gl_enum_utils_autogen.h",
 ]
 
 libangle_capture_sources = [
@@ -939,6 +938,7 @@ libangle_capture_sources = [
   "src/libANGLE/capture_gles_3_1_params.cpp",
   "src/libANGLE/capture_gles_ext_autogen.cpp",
   "src/libANGLE/capture_gles_ext_params.cpp",
+  "src/libANGLE/gl_enum_utils_autogen.cpp",
   "src/libANGLE/frame_capture_utils_autogen.cpp",
 ]