X11: Ensure mesa_enum value_string has unique values

Also convert usage to a value_string_ext

Change-Id: Ie515591355879f8eb65faf50e7c04b30cff13519
Reviewed-on: https://code.wireshark.org/review/21124
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

2 files changed, 257 insertions, 685 deletions

diff --git a/epan/dissectors/x11-glx-render-enum.h b/epan/dissectors/x11-glx-render-enum.h
index c0698c0e68..519740e565 100644
--- a/epan/dissectors/x11-glx-render-enum.h
+++ b/epan/dissectors/x11-glx-render-enum.h
@@ -25,8 +25,6 @@
 
 static const value_string mesa_enum[] = {
 /* OpenGL version 1.0 */
-  { 0x0000, "POINTS" },
-  { 0x0001, "LINES" },
   { 0x0002, "LINE_LOOP" },
   { 0x0003, "LINE_STRIP" },
   { 0x0004, "TRIANGLES" },
@@ -431,9 +429,7 @@ static const value_string mesa_enum[] = {
   { 0x4006, "LIGHT6" },
   { 0x4007, "LIGHT7" },
 /* OpenGL version 1.1 */
-  { 0x0BF1, "INDEX_LOGIC_OP" },
   { 0x0BF2, "COLOR_LOGIC_OP" },
-  { 0x1003, "TEXTURE_INTERNAL_FORMAT" },
   { 0x140A, "DOUBLE" },
   { 0x2A00, "POLYGON_OFFSET_UNITS" },
   { 0x2A01, "POLYGON_OFFSET_POINT" },
@@ -561,10 +557,6 @@ static const value_string mesa_enum[] = {
   { 0x81F8, "LIGHT_MODEL_COLOR_CONTROL" },
   { 0x81F9, "SINGLE_COLOR" },
   { 0x81FA, "SEPARATE_SPECULAR_COLOR" },
-  { 0x0B12, "SMOOTH_POINT_SIZE_RANGE" },
-  { 0x0B13, "SMOOTH_POINT_SIZE_GRANULARITY" },
-  { 0x0B22, "SMOOTH_LINE_WIDTH_RANGE" },
-  { 0x0B23, "SMOOTH_LINE_WIDTH_GRANULARITY" },
   { 0x846D, "ALIASED_POINT_SIZE_RANGE" },
   { 0x846E, "ALIASED_LINE_WIDTH_RANGE" },
   { 0x8001, "CONSTANT_COLOR" },
@@ -812,22 +804,7 @@ static const value_string mesa_enum[] = {
   { 0x88E9, "DYNAMIC_READ" },
   { 0x88EA, "DYNAMIC_COPY" },
   { 0x8914, "SAMPLES_PASSED" },
-  { 0x8450, "FOG_COORD_SRC" },
-  { 0x8451, "FOG_COORD" },
-  { 0x8453, "CURRENT_FOG_COORD" },
-  { 0x8454, "FOG_COORD_ARRAY_TYPE" },
-  { 0x8455, "FOG_COORD_ARRAY_STRIDE" },
-  { 0x8456, "FOG_COORD_ARRAY_POINTER" },
-  { 0x8457, "FOG_COORD_ARRAY" },
-  { 0x889D, "FOG_COORD_ARRAY_BUFFER_BINDING" },
-  { 0x8580, "SRC0_RGB" },
-  { 0x8581, "SRC1_RGB" },
-  { 0x8582, "SRC2_RGB" },
-  { 0x8588, "SRC0_ALPHA" },
-  { 0x8589, "SRC1_ALPHA" },
-  { 0x858A, "SRC2_ALPHA" },
 /* OpenGL version 2.0 */
-  { 0x8009, "BLEND_EQUATION_RGB" },
   { 0x8622, "VERTEX_ATTRIB_ARRAY_ENABLED" },
   { 0x8623, "VERTEX_ATTRIB_ARRAY_SIZE" },
   { 0x8624, "VERTEX_ATTRIB_ARRAY_STRIDE" },
@@ -936,88 +913,13 @@ static const value_string mesa_enum[] = {
   { 0x8C4A, "COMPRESSED_SLUMINANCE" },
   { 0x8C4B, "COMPRESSED_SLUMINANCE_ALPHA" },
 /* OpenGL extension GL_ARB_multitexture */
-  { 0x84C0, "TEXTURE0_ARB" },
-  { 0x84C1, "TEXTURE1_ARB" },
-  { 0x84C2, "TEXTURE2_ARB" },
-  { 0x84C3, "TEXTURE3_ARB" },
-  { 0x84C4, "TEXTURE4_ARB" },
-  { 0x84C5, "TEXTURE5_ARB" },
-  { 0x84C6, "TEXTURE6_ARB" },
-  { 0x84C7, "TEXTURE7_ARB" },
-  { 0x84C8, "TEXTURE8_ARB" },
-  { 0x84C9, "TEXTURE9_ARB" },
-  { 0x84CA, "TEXTURE10_ARB" },
-  { 0x84CB, "TEXTURE11_ARB" },
-  { 0x84CC, "TEXTURE12_ARB" },
-  { 0x84CD, "TEXTURE13_ARB" },
-  { 0x84CE, "TEXTURE14_ARB" },
-  { 0x84CF, "TEXTURE15_ARB" },
-  { 0x84D0, "TEXTURE16_ARB" },
-  { 0x84D1, "TEXTURE17_ARB" },
-  { 0x84D2, "TEXTURE18_ARB" },
-  { 0x84D3, "TEXTURE19_ARB" },
-  { 0x84D4, "TEXTURE20_ARB" },
-  { 0x84D5, "TEXTURE21_ARB" },
-  { 0x84D6, "TEXTURE22_ARB" },
-  { 0x84D7, "TEXTURE23_ARB" },
-  { 0x84D8, "TEXTURE24_ARB" },
-  { 0x84D9, "TEXTURE25_ARB" },
-  { 0x84DA, "TEXTURE26_ARB" },
-  { 0x84DB, "TEXTURE27_ARB" },
-  { 0x84DC, "TEXTURE28_ARB" },
-  { 0x84DD, "TEXTURE29_ARB" },
-  { 0x84DE, "TEXTURE30_ARB" },
-  { 0x84DF, "TEXTURE31_ARB" },
-  { 0x84E0, "ACTIVE_TEXTURE_ARB" },
-  { 0x84E1, "CLIENT_ACTIVE_TEXTURE_ARB" },
-  { 0x84E2, "MAX_TEXTURE_UNITS_ARB" },
 /* OpenGL extension GL_ARB_transpose_matrix */
-  { 0x84E3, "TRANSPOSE_MODELVIEW_MATRIX_ARB" },
-  { 0x84E4, "TRANSPOSE_PROJECTION_MATRIX_ARB" },
-  { 0x84E5, "TRANSPOSE_TEXTURE_MATRIX_ARB" },
-  { 0x84E6, "TRANSPOSE_COLOR_MATRIX_ARB" },
 /* OpenGL extension GL_ARB_multisample */
-  { 0x809D, "MULTISAMPLE_ARB" },
-  { 0x809E, "SAMPLE_ALPHA_TO_COVERAGE_ARB" },
-  { 0x809F, "SAMPLE_ALPHA_TO_ONE_ARB" },
-  { 0x80A0, "SAMPLE_COVERAGE_ARB" },
-  { 0x80A8, "SAMPLE_BUFFERS_ARB" },
-  { 0x80A9, "SAMPLES_ARB" },
-  { 0x80AA, "SAMPLE_COVERAGE_VALUE_ARB" },
-  { 0x80AB, "SAMPLE_COVERAGE_INVERT_ARB" },
 /* OpenGL extension GL_ARB_texture_env_add */
 /* OpenGL extension GL_ARB_texture_cube_map */
-  { 0x8511, "NORMAL_MAP_ARB" },
-  { 0x8512, "REFLECTION_MAP_ARB" },
-  { 0x8513, "TEXTURE_CUBE_MAP_ARB" },
-  { 0x8514, "TEXTURE_BINDING_CUBE_MAP_ARB" },
-  { 0x8515, "TEXTURE_CUBE_MAP_POSITIVE_X_ARB" },
-  { 0x8516, "TEXTURE_CUBE_MAP_NEGATIVE_X_ARB" },
-  { 0x8517, "TEXTURE_CUBE_MAP_POSITIVE_Y_ARB" },
-  { 0x8518, "TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB" },
-  { 0x8519, "TEXTURE_CUBE_MAP_POSITIVE_Z_ARB" },
-  { 0x851A, "TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB" },
-  { 0x851B, "PROXY_TEXTURE_CUBE_MAP_ARB" },
-  { 0x851C, "MAX_CUBE_MAP_TEXTURE_SIZE_ARB" },
 /* OpenGL extension GL_ARB_texture_compression */
-  { 0x84E9, "COMPRESSED_ALPHA_ARB" },
-  { 0x84EA, "COMPRESSED_LUMINANCE_ARB" },
-  { 0x84EB, "COMPRESSED_LUMINANCE_ALPHA_ARB" },
-  { 0x84EC, "COMPRESSED_INTENSITY_ARB" },
-  { 0x84ED, "COMPRESSED_RGB_ARB" },
-  { 0x84EE, "COMPRESSED_RGBA_ARB" },
-  { 0x84EF, "TEXTURE_COMPRESSION_HINT_ARB" },
-  { 0x86A0, "TEXTURE_COMPRESSED_IMAGE_SIZE_ARB" },
-  { 0x86A1, "TEXTURE_COMPRESSED_ARB" },
-  { 0x86A2, "NUM_COMPRESSED_TEXTURE_FORMATS_ARB" },
-  { 0x86A3, "TEXTURE_COMPRESSED_FORMATS_ARB" },
 /* OpenGL extension GL_ARB_texture_border_clamp */
-  { 0x812D, "CLAMP_TO_BORDER_ARB" },
 /* OpenGL extension GL_ARB_point_parameters */
-  { 0x8126, "POINT_SIZE_MIN_ARB" },
-  { 0x8127, "POINT_SIZE_MAX_ARB" },
-  { 0x8128, "POINT_FADE_THRESHOLD_SIZE_ARB" },
-  { 0x8129, "POINT_DISTANCE_ATTENUATION_ARB" },
 /* OpenGL extension GL_ARB_vertex_blend */
   { 0x86A4, "MAX_VERTEX_UNITS_ARB" },
   { 0x86A5, "ACTIVE_VERTEX_UNITS_ARB" },
@@ -1029,7 +931,6 @@ static const value_string mesa_enum[] = {
   { 0x86AB, "WEIGHT_ARRAY_SIZE_ARB" },
   { 0x86AC, "WEIGHT_ARRAY_POINTER_ARB" },
   { 0x86AD, "WEIGHT_ARRAY_ARB" },
-  { 0x1700, "MODELVIEW0_ARB" },
   { 0x850A, "MODELVIEW1_ARB" },
   { 0x8722, "MODELVIEW2_ARB" },
   { 0x8723, "MODELVIEW3_ARB" },
@@ -1073,68 +974,24 @@ static const value_string mesa_enum[] = {
   { 0x8848, "MATRIX_INDEX_ARRAY_STRIDE_ARB" },
   { 0x8849, "MATRIX_INDEX_ARRAY_POINTER_ARB" },
 /* OpenGL extension GL_ARB_texture_env_combine */
-  { 0x8570, "COMBINE_ARB" },
-  { 0x8571, "COMBINE_RGB_ARB" },
-  { 0x8572, "COMBINE_ALPHA_ARB" },
-  { 0x8580, "SOURCE0_RGB_ARB" },
-  { 0x8581, "SOURCE1_RGB_ARB" },
-  { 0x8582, "SOURCE2_RGB_ARB" },
-  { 0x8588, "SOURCE0_ALPHA_ARB" },
-  { 0x8589, "SOURCE1_ALPHA_ARB" },
-  { 0x858A, "SOURCE2_ALPHA_ARB" },
-  { 0x8590, "OPERAND0_RGB_ARB" },
-  { 0x8591, "OPERAND1_RGB_ARB" },
-  { 0x8592, "OPERAND2_RGB_ARB" },
-  { 0x8598, "OPERAND0_ALPHA_ARB" },
-  { 0x8599, "OPERAND1_ALPHA_ARB" },
-  { 0x859A, "OPERAND2_ALPHA_ARB" },
-  { 0x8573, "RGB_SCALE_ARB" },
-  { 0x8574, "ADD_SIGNED_ARB" },
-  { 0x8575, "INTERPOLATE_ARB" },
-  { 0x84E7, "SUBTRACT_ARB" },
-  { 0x8576, "CONSTANT_ARB" },
-  { 0x8577, "PRIMARY_COLOR_ARB" },
-  { 0x8578, "PREVIOUS_ARB" },
 /* OpenGL extension GL_ARB_texture_env_crossbar */
 /* OpenGL extension GL_ARB_texture_env_dot3 */
-  { 0x86AE, "DOT3_RGB_ARB" },
-  { 0x86AF, "DOT3_RGBA_ARB" },
 /* OpenGL extension GL_ARB_texture_mirrored_repeat */
-  { 0x8370, "MIRRORED_REPEAT_ARB" },
 /* OpenGL extension GL_ARB_depth_texture */
-  { 0x81A5, "DEPTH_COMPONENT16_ARB" },
-  { 0x81A6, "DEPTH_COMPONENT24_ARB" },
-  { 0x81A7, "DEPTH_COMPONENT32_ARB" },
-  { 0x884A, "TEXTURE_DEPTH_SIZE_ARB" },
-  { 0x884B, "DEPTH_TEXTURE_MODE_ARB" },
 /* OpenGL extension GL_ARB_shadow */
-  { 0x884C, "TEXTURE_COMPARE_MODE_ARB" },
-  { 0x884D, "TEXTURE_COMPARE_FUNC_ARB" },
-  { 0x884E, "COMPARE_R_TO_TEXTURE_ARB" },
 /* OpenGL extension GL_ARB_shadow_ambient */
   { 0x80BF, "TEXTURE_COMPARE_FAIL_VALUE_ARB" },
 /* OpenGL extension GL_ARB_window_pos */
 /* OpenGL extension GL_ARB_vertex_program */
-  { 0x8458, "COLOR_SUM_ARB" },
   { 0x8620, "VERTEX_PROGRAM_ARB" },
-  { 0x8622, "VERTEX_ATTRIB_ARRAY_ENABLED_ARB" },
-  { 0x8623, "VERTEX_ATTRIB_ARRAY_SIZE_ARB" },
-  { 0x8624, "VERTEX_ATTRIB_ARRAY_STRIDE_ARB" },
-  { 0x8625, "VERTEX_ATTRIB_ARRAY_TYPE_ARB" },
-  { 0x8626, "CURRENT_VERTEX_ATTRIB_ARB" },
   { 0x8627, "PROGRAM_LENGTH_ARB" },
   { 0x8628, "PROGRAM_STRING_ARB" },
   { 0x862E, "MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB" },
   { 0x862F, "MAX_PROGRAM_MATRICES_ARB" },
   { 0x8640, "CURRENT_MATRIX_STACK_DEPTH_ARB" },
   { 0x8641, "CURRENT_MATRIX_ARB" },
-  { 0x8642, "VERTEX_PROGRAM_POINT_SIZE_ARB" },
-  { 0x8643, "VERTEX_PROGRAM_TWO_SIDE_ARB" },
-  { 0x8645, "VERTEX_ATTRIB_ARRAY_POINTER_ARB" },
   { 0x864B, "PROGRAM_ERROR_POSITION_ARB" },
   { 0x8677, "PROGRAM_BINDING_ARB" },
-  { 0x8869, "MAX_VERTEX_ATTRIBS_ARB" },
-  { 0x886A, "VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB" },
   { 0x8874, "PROGRAM_ERROR_STRING_ARB" },
   { 0x8875, "PROGRAM_FORMAT_ASCII_ARB" },
   { 0x8876, "PROGRAM_FORMAT_ARB" },
@@ -1208,87 +1065,17 @@ static const value_string mesa_enum[] = {
   { 0x880E, "MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB" },
   { 0x880F, "MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB" },
   { 0x8810, "MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB" },
-  { 0x8871, "MAX_TEXTURE_COORDS_ARB" },
-  { 0x8872, "MAX_TEXTURE_IMAGE_UNITS_ARB" },
 /* OpenGL extension GL_ARB_vertex_buffer_object */
-  { 0x8764, "BUFFER_SIZE_ARB" },
-  { 0x8765, "BUFFER_USAGE_ARB" },
-  { 0x8894, "ARRAY_BUFFER_BINDING_ARB" },
-  { 0x8895, "ELEMENT_ARRAY_BUFFER_BINDING_ARB" },
-  { 0x8896, "VERTEX_ARRAY_BUFFER_BINDING_ARB" },
-  { 0x8897, "NORMAL_ARRAY_BUFFER_BINDING_ARB" },
-  { 0x8898, "COLOR_ARRAY_BUFFER_BINDING_ARB" },
-  { 0x8899, "INDEX_ARRAY_BUFFER_BINDING_ARB" },
-  { 0x889A, "TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB" },
-  { 0x889B, "EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB" },
-  { 0x889C, "SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB" },
-  { 0x889D, "FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB" },
-  { 0x889E, "WEIGHT_ARRAY_BUFFER_BINDING_ARB" },
-  { 0x889F, "VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB" },
-  { 0x88B8, "READ_ONLY_ARB" },
-  { 0x88B9, "WRITE_ONLY_ARB" },
-  { 0x88BA, "READ_WRITE_ARB" },
-  { 0x88BB, "BUFFER_ACCESS_ARB" },
-  { 0x88BC, "BUFFER_MAPPED_ARB" },
-  { 0x88BD, "BUFFER_MAP_POINTER_ARB" },
-  { 0x88E0, "STREAM_DRAW_ARB" },
-  { 0x88E1, "STREAM_READ_ARB" },
-  { 0x88E2, "STREAM_COPY_ARB" },
-  { 0x88E4, "STATIC_DRAW_ARB" },
-  { 0x88E5, "STATIC_READ_ARB" },
-  { 0x88E6, "STATIC_COPY_ARB" },
-  { 0x88E8, "DYNAMIC_DRAW_ARB" },
-  { 0x88E9, "DYNAMIC_READ_ARB" },
-  { 0x88EA, "DYNAMIC_COPY_ARB" },
 /* OpenGL extension GL_ARB_occlusion_query */
-  { 0x8864, "QUERY_COUNTER_BITS_ARB" },
-  { 0x8865, "CURRENT_QUERY_ARB" },
-  { 0x8866, "QUERY_RESULT_ARB" },
-  { 0x8867, "QUERY_RESULT_AVAILABLE_ARB" },
-  { 0x8914, "SAMPLES_PASSED_ARB" },
 /* OpenGL extension GL_ARB_shader_objects */
   { 0x8B40, "PROGRAM_OBJECT_ARB" },
   { 0x8B48, "SHADER_OBJECT_ARB" },
   { 0x8B4E, "OBJECT_TYPE_ARB" },
-  { 0x8B4F, "OBJECT_SUBTYPE_ARB" },
-  { 0x8B50, "FLOAT_VEC2_ARB" },
-  { 0x8B51, "FLOAT_VEC3_ARB" },
-  { 0x8B52, "FLOAT_VEC4_ARB" },
-  { 0x8B53, "INT_VEC2_ARB" },
-  { 0x8B54, "INT_VEC3_ARB" },
-  { 0x8B55, "INT_VEC4_ARB" },
-  { 0x8B56, "BOOL_ARB" },
-  { 0x8B57, "BOOL_VEC2_ARB" },
-  { 0x8B58, "BOOL_VEC3_ARB" },
-  { 0x8B59, "BOOL_VEC4_ARB" },
-  { 0x8B5A, "FLOAT_MAT2_ARB" },
-  { 0x8B5B, "FLOAT_MAT3_ARB" },
-  { 0x8B5C, "FLOAT_MAT4_ARB" },
-  { 0x8B80, "OBJECT_DELETE_STATUS_ARB" },
-  { 0x8B81, "OBJECT_COMPILE_STATUS_ARB" },
-  { 0x8B82, "OBJECT_LINK_STATUS_ARB" },
-  { 0x8B83, "OBJECT_VALIDATE_STATUS_ARB" },
-  { 0x8B84, "OBJECT_INFO_LOG_LENGTH_ARB" },
-  { 0x8B85, "OBJECT_ATTACHED_OBJECTS_ARB" },
-  { 0x8B86, "OBJECT_ACTIVE_UNIFORMS_ARB" },
-  { 0x8B87, "OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB" },
-  { 0x8B88, "OBJECT_SHADER_SOURCE_LENGTH_ARB" },
 /* OpenGL extension GL_ARB_vertex_shader */
-  { 0x8B31, "VERTEX_SHADER_ARB" },
-  { 0x8B4A, "MAX_VERTEX_UNIFORM_COMPONENTS_ARB" },
-  { 0x8B4B, "MAX_VARYING_FLOATS_ARB" },
-  { 0x8B4C, "MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB" },
-  { 0x8B4D, "MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB" },
-  { 0x8B89, "OBJECT_ACTIVE_ATTRIBUTES_ARB" },
-  { 0x8B8A, "OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB" },
 /* OpenGL extension GL_ARB_fragment_shader */
-  { 0x8B30, "FRAGMENT_SHADER_ARB" },
-  { 0x8B49, "MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB" },
 /* OpenGL extension GL_ARB_shading_language_100 */
 /* OpenGL extension GL_ARB_texture_non_power_of_two */
 /* OpenGL extension GL_ARB_point_sprite */
-  { 0x8861, "POINT_SPRITE_ARB" },
-  { 0x8862, "COORD_REPLACE_ARB" },
 /* OpenGL extension GL_ARB_fragment_program_shadow */
 /* OpenGL extension GL_ARB_texture_rectangle */
   { 0x84F5, "TEXTURE_RECTANGLE_ARB" },
@@ -1311,13 +1098,8 @@ static const value_string mesa_enum[] = {
 /* OpenGL extension GL_ARB_explicit_uniform_location */
   { 0x826E, "MAX_UNIFORM_LOCATIONS" },
 /* OpenGL extension GL_ARB_buffer_storage */
-  { 0x40, "MAP_PERSISTENT_BIT" },
-  { 0x80, "MAP_COHERENT_BIT" },
-  { 0x100, "DYNAMIC_STORAGE_BIT" },
-  { 0x200, "CLIENT_STORAGE_BIT" },
   { 0x821F, "BUFFER_IMMUTABLE_STORAGE" },
   { 0x8220, "BUFFER_STORAGE_FLAGS" },
-  { 0x4000, "CLIENT_MAPPED_BUFFER_BARRIER_BIT" },
 /* OpenGL extension GL_ARB_query_buffer_object */
   { 0x9194, "QUERY_RESULT_NO_WAIT" },
   { 0x9192, "QUERY_BUFFER" },
@@ -1353,117 +1135,21 @@ static const value_string mesa_enum[] = {
   { 0x9381, "MULTISAMPLE_LINE_WIDTH_RANGE_ARB" },
   { 0x9382, "MULTISAMPLE_LINE_WIDTH_GRANULARITY_ARB" },
 /* OpenGL extension GL_EXT_blend_color */
-  { 0x8001, "CONSTANT_COLOR_EXT" },
-  { 0x8002, "ONE_MINUS_CONSTANT_COLOR_EXT" },
-  { 0x8003, "CONSTANT_ALPHA_EXT" },
-  { 0x8004, "ONE_MINUS_CONSTANT_ALPHA_EXT" },
-  { 0x8005, "BLEND_COLOR_EXT" },
 /* OpenGL extension GL_EXT_polygon_offset */
   { 0x8039, "POLYGON_OFFSET_BIAS_EXT" },
 /* OpenGL extension GL_EXT_texture */
-  { 0x803B, "ALPHA4_EXT" },
-  { 0x803C, "ALPHA8_EXT" },
-  { 0x803D, "ALPHA12_EXT" },
-  { 0x803E, "ALPHA16_EXT" },
-  { 0x803F, "LUMINANCE4_EXT" },
-  { 0x8040, "LUMINANCE8_EXT" },
-  { 0x8041, "LUMINANCE12_EXT" },
-  { 0x8042, "LUMINANCE16_EXT" },
-  { 0x8043, "LUMINANCE4_ALPHA4_EXT" },
-  { 0x8044, "LUMINANCE6_ALPHA2_EXT" },
-  { 0x8045, "LUMINANCE8_ALPHA8_EXT" },
-  { 0x8046, "LUMINANCE12_ALPHA4_EXT" },
-  { 0x8047, "LUMINANCE12_ALPHA12_EXT" },
-  { 0x8048, "LUMINANCE16_ALPHA16_EXT" },
-  { 0x8049, "INTENSITY_EXT" },
-  { 0x804A, "INTENSITY4_EXT" },
-  { 0x804B, "INTENSITY8_EXT" },
-  { 0x804C, "INTENSITY12_EXT" },
-  { 0x804D, "INTENSITY16_EXT" },
   { 0x804E, "RGB2_EXT" },
-  { 0x804F, "RGB4_EXT" },
-  { 0x8050, "RGB5_EXT" },
-  { 0x8051, "RGB8_EXT" },
-  { 0x8052, "RGB10_EXT" },
-  { 0x8053, "RGB12_EXT" },
-  { 0x8054, "RGB16_EXT" },
-  { 0x8055, "RGBA2_EXT" },
-  { 0x8056, "RGBA4_EXT" },
-  { 0x8057, "RGB5_A1_EXT" },
-  { 0x8058, "RGBA8_EXT" },
-  { 0x8059, "RGB10_A2_EXT" },
-  { 0x805A, "RGBA12_EXT" },
-  { 0x805B, "RGBA16_EXT" },
-  { 0x805C, "TEXTURE_RED_SIZE_EXT" },
-  { 0x805D, "TEXTURE_GREEN_SIZE_EXT" },
-  { 0x805E, "TEXTURE_BLUE_SIZE_EXT" },
-  { 0x805F, "TEXTURE_ALPHA_SIZE_EXT" },
-  { 0x8060, "TEXTURE_LUMINANCE_SIZE_EXT" },
-  { 0x8061, "TEXTURE_INTENSITY_SIZE_EXT" },
   { 0x8062, "REPLACE_EXT" },
-  { 0x8063, "PROXY_TEXTURE_1D_EXT" },
-  { 0x8064, "PROXY_TEXTURE_2D_EXT" },
   { 0x8065, "TEXTURE_TOO_LARGE_EXT" },
 /* OpenGL extension GL_EXT_texture3D */
 /* OpenGL extension GL_SGIS_texture_filter4 */
 /* OpenGL extension GL_EXT_subtexture */
 /* OpenGL extension GL_EXT_copy_texture */
 /* OpenGL extension GL_EXT_histogram */
-  { 0x8024, "HISTOGRAM_EXT" },
-  { 0x8025, "PROXY_HISTOGRAM_EXT" },
-  { 0x8026, "HISTOGRAM_WIDTH_EXT" },
-  { 0x8027, "HISTOGRAM_FORMAT_EXT" },
-  { 0x8028, "HISTOGRAM_RED_SIZE_EXT" },
-  { 0x8029, "HISTOGRAM_GREEN_SIZE_EXT" },
-  { 0x802A, "HISTOGRAM_BLUE_SIZE_EXT" },
-  { 0x802B, "HISTOGRAM_ALPHA_SIZE_EXT" },
-  { 0x802C, "HISTOGRAM_LUMINANCE_SIZE_EXT" },
-  { 0x802D, "HISTOGRAM_SINK_EXT" },
-  { 0x802E, "MINMAX_EXT" },
-  { 0x802F, "MINMAX_FORMAT_EXT" },
-  { 0x8030, "MINMAX_SINK_EXT" },
   { 0x8031, "TABLE_TOO_LARGE_EXT" },
 /* OpenGL extension GL_EXT_convolution */
-  { 0x8013, "CONVOLUTION_BORDER_MODE_EXT" },
-  { 0x8014, "CONVOLUTION_FILTER_SCALE_EXT" },
-  { 0x8015, "CONVOLUTION_FILTER_BIAS_EXT" },
-  { 0x8016, "REDUCE_EXT" },
-  { 0x8017, "CONVOLUTION_FORMAT_EXT" },
-  { 0x8018, "CONVOLUTION_WIDTH_EXT" },
-  { 0x8019, "CONVOLUTION_HEIGHT_EXT" },
-  { 0x801A, "MAX_CONVOLUTION_WIDTH_EXT" },
-  { 0x801B, "MAX_CONVOLUTION_HEIGHT_EXT" },
-  { 0x801C, "POST_CONVOLUTION_RED_SCALE_EXT" },
-  { 0x801D, "POST_CONVOLUTION_GREEN_SCALE_EXT" },
-  { 0x801E, "POST_CONVOLUTION_BLUE_SCALE_EXT" },
-  { 0x801F, "POST_CONVOLUTION_ALPHA_SCALE_EXT" },
-  { 0x8020, "POST_CONVOLUTION_RED_BIAS_EXT" },
-  { 0x8021, "POST_CONVOLUTION_GREEN_BIAS_EXT" },
-  { 0x8022, "POST_CONVOLUTION_BLUE_BIAS_EXT" },
-  { 0x8023, "POST_CONVOLUTION_ALPHA_BIAS_EXT" },
 /* OpenGL extension GL_SGI_color_matrix */
-  { 0x80B1, "COLOR_MATRIX_SGI" },
-  { 0x80B2, "COLOR_MATRIX_STACK_DEPTH_SGI" },
-  { 0x80B3, "MAX_COLOR_MATRIX_STACK_DEPTH_SGI" },
-  { 0x80B4, "POST_COLOR_MATRIX_RED_SCALE_SGI" },
-  { 0x80B5, "POST_COLOR_MATRIX_GREEN_SCALE_SGI" },
-  { 0x80B6, "POST_COLOR_MATRIX_BLUE_SCALE_SGI" },
-  { 0x80B7, "POST_COLOR_MATRIX_ALPHA_SCALE_SGI" },
-  { 0x80B8, "POST_COLOR_MATRIX_RED_BIAS_SGI" },
-  { 0x80B9, "POST_COLOR_MATRIX_GREEN_BIAS_SGI" },
-  { 0x80BA, "POST_COLOR_MATRIX_BLUE_BIAS_SGI" },
-  { 0x80BB, "POST_COLOR_MATRIX_ALPHA_BIAS_SGI" },
 /* OpenGL extension GL_SGI_color_table */
-  { 0x80D6, "COLOR_TABLE_SCALE_SGI" },
-  { 0x80D7, "COLOR_TABLE_BIAS_SGI" },
-  { 0x80D8, "COLOR_TABLE_FORMAT_SGI" },
-  { 0x80D9, "COLOR_TABLE_WIDTH_SGI" },
-  { 0x80DA, "COLOR_TABLE_RED_SIZE_SGI" },
-  { 0x80DB, "COLOR_TABLE_GREEN_SIZE_SGI" },
-  { 0x80DC, "COLOR_TABLE_BLUE_SIZE_SGI" },
-  { 0x80DD, "COLOR_TABLE_ALPHA_SIZE_SGI" },
-  { 0x80DE, "COLOR_TABLE_LUMINANCE_SIZE_SGI" },
-  { 0x80DF, "COLOR_TABLE_INTENSITY_SIZE_SGI" },
 /* OpenGL extension GL_SGIS_pixel_texture */
 /* OpenGL extension GL_SGIS_texture4D */
 /* OpenGL extension GL_SGI_texture_color_table */
@@ -1474,7 +1160,6 @@ static const value_string mesa_enum[] = {
 /* OpenGL extension GL_SGIS_sharpen_texture */
 /* OpenGL extension GL_SGIS_multisample */
 /* OpenGL extension GL_EXT_rescale_normal */
-  { 0x803A, "RESCALE_NORMAL_EXT" },
 /* OpenGL extension GL_EXT_vertex_array */
   { 0x807D, "VERTEX_ARRAY_COUNT_EXT" },
   { 0x8080, "NORMAL_ARRAY_COUNT_EXT" },
@@ -1483,8 +1168,6 @@ static const value_string mesa_enum[] = {
   { 0x808B, "TEXTURE_COORD_ARRAY_COUNT_EXT" },
   { 0x808D, "EDGE_FLAG_ARRAY_COUNT_EXT" },
 /* OpenGL extension GL_SGIS_generate_mipmap */
-  { 0x8191, "GENERATE_MIPMAP_SGIS" },
-  { 0x8192, "GENERATE_MIPMAP_HINT_SGIS" },
 /* OpenGL extension GL_SGIX_clipmap */
   { 0x8170, "LINEAR_CLIPMAP_LINEAR_SGIX" },
   { 0x8171, "TEXTURE_CLIPMAP_CENTER_SGIX" },
@@ -1504,23 +1187,11 @@ static const value_string mesa_enum[] = {
   { 0x819C, "TEXTURE_LEQUAL_R_SGIX" },
   { 0x819D, "TEXTURE_GEQUAL_R_SGIX" },
 /* OpenGL extension GL_SGIS_texture_edge_clamp */
-  { 0x812F, "CLAMP_TO_EDGE_SGIS" },
 /* OpenGL extension GL_SGIS_texture_border_clamp */
-  { 0x812D, "CLAMP_TO_BORDER_SGIS" },
 /* OpenGL extension GL_EXT_blend_minmax */
-  { 0x8006, "FUNC_ADD_EXT" },
-  { 0x8007, "MIN_EXT" },
-  { 0x8008, "MAX_EXT" },
-  { 0x8009, "BLEND_EQUATION_EXT" },
 /* OpenGL extension GL_EXT_blend_subtract */
-  { 0x800A, "FUNC_SUBTRACT_EXT" },
-  { 0x800B, "FUNC_REVERSE_SUBTRACT_EXT" },
 /* OpenGL extension GL_SGIX_sprite */
 /* OpenGL extension GL_EXT_point_parameters */
-  { 0x8126, "POINT_SIZE_MIN_EXT" },
-  { 0x8127, "POINT_SIZE_MAX_EXT" },
-  { 0x8128, "POINT_FADE_THRESHOLD_SIZE_EXT" },
-  { 0x8129, "POINT_DISTANCE_ATTENUATION_EXT" },
 /* OpenGL extension GL_SGIX_instruments */
 /* OpenGL extension GL_SGIX_texture_scale_bias */
   { 0x8179, "POST_TEXTURE_FILTER_BIAS_SGIX" },
@@ -1532,9 +1203,6 @@ static const value_string mesa_enum[] = {
 /* OpenGL extension GL_SGIX_reference_plane */
 /* OpenGL extension GL_SGIX_flush_raster */
 /* OpenGL extension GL_SGIX_depth_texture */
-  { 0x81A5, "DEPTH_COMPONENT16_SGIX" },
-  { 0x81A6, "DEPTH_COMPONENT24_SGIX" },
-  { 0x81A7, "DEPTH_COMPONENT32_SGIX" },
 /* OpenGL extension GL_SGIS_fog_function */
 /* OpenGL extension GL_SGIX_fog_offset */
   { 0x8198, "FOG_OFFSET_SGIX" },
@@ -1544,18 +1212,9 @@ static const value_string mesa_enum[] = {
   { 0x8150, "IGNORE_BORDER_HP" },
   { 0x8151, "CONSTANT_BORDER_HP" },
   { 0x8153, "REPLICATE_BORDER_HP" },
-  { 0x8154, "CONVOLUTION_BORDER_COLOR_HP" },
 /* OpenGL extension GL_EXT_color_subtable */
 /* OpenGL extension GL_PGI_misc_hints */
 /* OpenGL extension GL_EXT_paletted_texture */
-  { 0x80D8, "COLOR_TABLE_FORMAT_EXT" },
-  { 0x80D9, "COLOR_TABLE_WIDTH_EXT" },
-  { 0x80DA, "COLOR_TABLE_RED_SIZE_EXT" },
-  { 0x80DB, "COLOR_TABLE_GREEN_SIZE_EXT" },
-  { 0x80DC, "COLOR_TABLE_BLUE_SIZE_EXT" },
-  { 0x80DD, "COLOR_TABLE_ALPHA_SIZE_EXT" },
-  { 0x80DE, "COLOR_TABLE_LUMINANCE_SIZE_EXT" },
-  { 0x80DF, "COLOR_TABLE_INTENSITY_SIZE_EXT" },
   { 0x80ED, "TEXTURE_INDEX_SIZE_EXT" },
 /* OpenGL extension GL_EXT_clip_volume_hint */
   { 0x80F0, "CLIP_VOLUME_CLIPPING_HINT_EXT" },
@@ -1565,7 +1224,6 @@ static const value_string mesa_enum[] = {
   { 0x818F, "TEXTURE_LOD_BIAS_T_SGIX" },
   { 0x8190, "TEXTURE_LOD_BIAS_R_SGIX" },
 /* OpenGL extension GL_SGIX_shadow_ambient */
-  { 0x80BF, "SHADOW_AMBIENT_SGIX" },
 /* OpenGL extension GL_EXT_index_material */
 /* OpenGL extension GL_EXT_index_func */
 /* OpenGL extension GL_EXT_compiled_vertex_array */
@@ -1589,36 +1247,12 @@ static const value_string mesa_enum[] = {
 /* OpenGL extension GL_EXT_shared_texture_palette */
   { 0x81FB, "SHARED_TEXTURE_PALETTE_EXT" },
 /* OpenGL extension GL_EXT_separate_specular_color */
-  { 0x81F8, "LIGHT_MODEL_COLOR_CONTROL_EXT" },
-  { 0x81F9, "SINGLE_COLOR_EXT" },
-  { 0x81FA, "SEPARATE_SPECULAR_COLOR_EXT" },
 /* OpenGL extension GL_EXT_secondary_color */
 /* OpenGL extension GL_EXT_texture_perturb_normal */
 /* OpenGL extension GL_EXT_multi_draw_arrays */
 /* OpenGL extension GL_EXT_fog_coord */
 /* OpenGL extension GL_EXT_coordinate_frame */
 /* OpenGL extension GL_EXT_texture_env_combine */
-  { 0x8570, "COMBINE_EXT" },
-  { 0x8571, "COMBINE_RGB_EXT" },
-  { 0x8572, "COMBINE_ALPHA_EXT" },
-  { 0x8573, "RGB_SCALE_EXT" },
-  { 0x8574, "ADD_SIGNED_EXT" },
-  { 0x8575, "INTERPOLATE_EXT" },
-  { 0x8576, "CONSTANT_EXT" },
-  { 0x8577, "PRIMARY_COLOR_EXT" },
-  { 0x8578, "PREVIOUS_EXT" },
-  { 0x8580, "SOURCE0_RGB_EXT" },
-  { 0x8581, "SOURCE1_RGB_EXT" },
-  { 0x8582, "SOURCE2_RGB_EXT" },
-  { 0x8588, "SOURCE0_ALPHA_EXT" },
-  { 0x8589, "SOURCE1_ALPHA_EXT" },
-  { 0x858A, "SOURCE2_ALPHA_EXT" },
-  { 0x8590, "OPERAND0_RGB_EXT" },
-  { 0x8591, "OPERAND1_RGB_EXT" },
-  { 0x8592, "OPERAND2_RGB_EXT" },
-  { 0x8598, "OPERAND0_ALPHA_EXT" },
-  { 0x8599, "OPERAND1_ALPHA_EXT" },
-  { 0x859A, "OPERAND2_ALPHA_EXT" },
 /* OpenGL extension GL_SGIX_pixel_texture */
 /* OpenGL extension GL_SUNX_constant_data */
 /* OpenGL extension GL_SUN_global_alpha */
@@ -1626,16 +1260,11 @@ static const value_string mesa_enum[] = {
 /* OpenGL extension GL_SUN_vertex */
 /* OpenGL extension GL_EXT_blend_func_separate */
 /* OpenGL extension GL_EXT_stencil_wrap */
-  { 0x8507, "INCR_WRAP_EXT" },
-  { 0x8508, "DECR_WRAP_EXT" },
 /* OpenGL extension GL_NV_texgen_reflection */
-  { 0x8511, "NORMAL_MAP_NV" },
-  { 0x8512, "REFLECTION_MAP_NV" },
 /* OpenGL extension GL_SUN_convolution_border_modes */
   { 0x81D4, "WRAP_BORDER_SUN" },
 /* OpenGL extension GL_EXT_texture_env_add */
 /* OpenGL extension GL_EXT_texture_lod_bias */
-  { 0x8501, "TEXTURE_LOD_BIAS_EXT" },
 /* OpenGL extension GL_EXT_texture_filter_anisotropic */
   { 0x84FE, "TEXTURE_MAX_ANISOTROPY_EXT" },
   { 0x84FF, "MAX_TEXTURE_MAX_ANISOTROPY_EXT" },
@@ -1684,38 +1313,20 @@ static const value_string mesa_enum[] = {
   { 0x8743, "MIRROR_CLAMP_TO_EDGE_ATI" },
 /* OpenGL extension GL_NV_fence */
 /* OpenGL extension GL_IBM_texture_mirrored_repeat */
-  { 0x8370, "MIRRORED_REPEAT_IBM" },
 /* OpenGL extension GL_NV_evaluators */
 /* OpenGL extension GL_NV_packed_depth_stencil */
   { 0x84F9, "DEPTH_STENCIL_NV" },
   { 0x84FA, "UNSIGNED_INT_24_8_NV" },
 /* OpenGL extension GL_NV_register_combiners2 */
 /* OpenGL extension GL_NV_texture_compression_vtc */
-  { 0x83F0, "COMPRESSED_RGB_S3TC_DXT1_EXT" },
-  { 0x83F1, "COMPRESSED_RGBA_S3TC_DXT1_EXT" },
-  { 0x83F2, "COMPRESSED_RGBA_S3TC_DXT3_EXT" },
-  { 0x83F3, "COMPRESSED_RGBA_S3TC_DXT5_EXT" },
 /* OpenGL extension GL_NV_texture_rectangle */
-  { 0x84F5, "TEXTURE_RECTANGLE_NV" },
-  { 0x84F6, "TEXTURE_BINDING_RECTANGLE_NV" },
-  { 0x84F7, "PROXY_TEXTURE_RECTANGLE_NV" },
-  { 0x84F8, "MAX_RECTANGLE_TEXTURE_SIZE_NV" },
 /* OpenGL extension GL_NV_vertex_program */
-  { 0x8620, "VERTEX_PROGRAM_NV" },
   { 0x8621, "VERTEX_STATE_PROGRAM_NV" },
-  { 0x8623, "ATTRIB_ARRAY_SIZE_NV" },
-  { 0x8624, "ATTRIB_ARRAY_STRIDE_NV" },
-  { 0x8625, "ATTRIB_ARRAY_TYPE_NV" },
-  { 0x8626, "CURRENT_ATTRIB_NV" },
-  { 0x8627, "PROGRAM_LENGTH_NV" },
-  { 0x8628, "PROGRAM_STRING_NV" },
   { 0x8629, "MODELVIEW_PROJECTION_NV" },
   { 0x862A, "IDENTITY_NV" },
   { 0x862B, "INVERSE_NV" },
   { 0x862C, "TRANSPOSE_NV" },
   { 0x862D, "INVERSE_TRANSPOSE_NV" },
-  { 0x862E, "MAX_TRACK_MATRIX_STACK_DEPTH_NV" },
-  { 0x862F, "MAX_TRACK_MATRICES_NV" },
   { 0x8630, "MATRIX0_NV" },
   { 0x8631, "MATRIX1_NV" },
   { 0x8632, "MATRIX2_NV" },
@@ -1724,18 +1335,12 @@ static const value_string mesa_enum[] = {
   { 0x8635, "MATRIX5_NV" },
   { 0x8636, "MATRIX6_NV" },
   { 0x8637, "MATRIX7_NV" },
-  { 0x8640, "CURRENT_MATRIX_STACK_DEPTH_NV" },
-  { 0x8641, "CURRENT_MATRIX_NV" },
-  { 0x8642, "VERTEX_PROGRAM_POINT_SIZE_NV" },
-  { 0x8643, "VERTEX_PROGRAM_TWO_SIDE_NV" },
   { 0x8644, "PROGRAM_PARAMETER_NV" },
-  { 0x8645, "ATTRIB_ARRAY_POINTER_NV" },
   { 0x8646, "PROGRAM_TARGET_NV" },
   { 0x8647, "PROGRAM_RESIDENT_NV" },
   { 0x8648, "TRACK_MATRIX_NV" },
   { 0x8649, "TRACK_MATRIX_TRANSFORM_NV" },
   { 0x864A, "VERTEX_PROGRAM_BINDING_NV" },
-  { 0x864B, "PROGRAM_ERROR_POSITION_NV" },
   { 0x8650, "VERTEX_ATTRIB_ARRAY0_NV" },
   { 0x8651, "VERTEX_ATTRIB_ARRAY1_NV" },
   { 0x8652, "VERTEX_ATTRIB_ARRAY2_NV" },
@@ -1775,7 +1380,6 @@ static const value_string mesa_enum[] = {
   { 0x8674, "MAP2_VERTEX_ATTRIB4_4_NV" },
   { 0x8675, "MAP2_VERTEX_ATTRIB5_4_NV" },
   { 0x8676, "MAP2_VERTEX_ATTRIB6_4_NV" },
-  { 0x8677, "MAP2_VERTEX_ATTRIB7_4_NV" },
   { 0x8678, "MAP2_VERTEX_ATTRIB8_4_NV" },
   { 0x8679, "MAP2_VERTEX_ATTRIB9_4_NV" },
   { 0x867A, "MAP2_VERTEX_ATTRIB10_4_NV" },
@@ -1902,12 +1506,6 @@ static const value_string mesa_enum[] = {
 /* OpenGL extension GL_NV_depth_clamp */
   { 0x864F, "DEPTH_CLAMP_NV" },
 /* OpenGL extension GL_NV_point_sprite */
-  { 0x8126, "POINT_SIZE_MIN_EXT" },
-  { 0x8127, "POINT_SIZE_MAX_EXT" },
-  { 0x8128, "POINT_FADE_THRESHOLD_SIZE_EXT" },
-  { 0x8129, "POINT_DISTANCE_ATTENUATION_EXT" },
-  { 0x8861, "POINT_SPRITE_NV" },
-  { 0x8862, "COORD_REPLACE_NV" },
   { 0x8863, "POINT_SPRITE_R_MODE_NV" },
 /* OpenGL extension GL_EXT_shadow_funcs */
 /* OpenGL extension GL_EXT_stencil_two_side */
@@ -1930,11 +1528,8 @@ static const value_string mesa_enum[] = {
   { 0x8746, "MODULATE_SUBTRACT_ATI" },
 /* OpenGL extension GL_NV_fragment_program */
   { 0x8870, "FRAGMENT_PROGRAM_NV" },
-  { 0x8871, "MAX_TEXTURE_COORDS_NV" },
-  { 0x8872, "MAX_TEXTURE_IMAGE_UNITS_NV" },
   { 0x8873, "FRAGMENT_PROGRAM_BINDING_NV" },
   { 0x8868, "MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV" },
-  { 0x8874, "PROGRAM_ERROR_STRING_NV" },
 /* OpenGL extension GL_NV_texture_expand_normal */
   { 0x888F, "TEXTURE_UNSIGNED_REMAP_MODE_NV" },
 /* OpenGL extension GL_OES_compressed_paletted_texture */
@@ -1955,23 +1550,13 @@ static const value_string mesa_enum[] = {
   { 0x8890, "DEPTH_BOUNDS_TEST_EXT" },
   { 0x8891, "DEPTH_BOUNDS_EXT" },
 /* OpenGL extension GL_EXT_texture_mirror_clamp */
-  { 0x8742, "MIRROR_CLAMP_EXT" },
-  { 0x8743, "MIRROR_CLAMP_TO_EDGE_EXT" },
   { 0x8912, "MIRROR_CLAMP_TO_BORDER_EXT" },
 /* OpenGL extension GL_EXT_blend_equation_separate */
-  { 0x8009, "BLEND_EQUATION_RGB_EXT" },
-  { 0x883D, "BLEND_EQUATION_ALPHA_EXT" },
 /* OpenGL extension GL_MESA_pack_invert */
   { 0x8758, "PACK_INVERT_MESA" },
 /* OpenGL extension GL_MESA_ycbcr_texture */
   { 0x8757, "YCBCR_MESA" },
-  { 0x85BA, "UNSIGNED_SHORT_8_8_MESA" },
-  { 0x85BB, "UNSIGNED_SHORT_8_8_REV_MESA" },
 /* OpenGL extension GL_EXT_pixel_buffer_object */
-  { 0x88EB, "PIXEL_PACK_BUFFER_EXT" },
-  { 0x88EC, "PIXEL_UNPACK_BUFFER_EXT" },
-  { 0x88ED, "PIXEL_PACK_BUFFER_BINDING_EXT" },
-  { 0x88EF, "PIXEL_UNPACK_BUFFER_BINDING_EXT" },
 /* OpenGL extension GL_NV_fragment_program_option */
 /* OpenGL extension GL_NV_fragment_program2 */
   { 0x88F4, "MAX_PROGRAM_EXEC_INSTRUCTIONS_NV" },
@@ -1980,13 +1565,8 @@ static const value_string mesa_enum[] = {
   { 0x88F7, "MAX_PROGRAM_LOOP_DEPTH_NV" },
   { 0x88F8, "MAX_PROGRAM_LOOP_COUNT_NV" },
 /* OpenGL extension GL_NV_vertex_program2_option */
-  { 0x88F4, "MAX_PROGRAM_EXEC_INSTRUCTIONS_NV" },
-  { 0x88F5, "MAX_PROGRAM_CALL_DEPTH_NV" },
 /* OpenGL extension GL_NV_vertex_program3 */
-  { 0x8B4C, "MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB" },
 /* OpenGL extension GL_EXT_texture_compression_dxt1 */
-  { 0x83F0, "COMPRESSED_RGB_S3TC_DXT1_EXT" },
-  { 0x83F1, "COMPRESSED_RGBA_S3TC_DXT1_EXT" },
 /* OpenGL extension GL_APPLE_flush_buffer_range */
   { 0x8A12, "BUFFER_SERIALIZED_MODIFY_APPLE" },
   { 0x8A13, "BUFFER_FLUSHING_UNMAP_APPLE" },
@@ -2028,24 +1608,16 @@ static const value_string mesa_enum[] = {
   { 0x8E1B, "POLYGON_OFFSET_CLAMP_EXT" },
 /* OpenGL extension GL_ATI_blend_equation_separate */
 /* OpenGL extension GL_ATI_separate_stencil */
-  { 0x8800, "STENCIL_BACK_FUNC_ATI" },
-  { 0x8801, "STENCIL_BACK_FAIL_ATI" },
-  { 0x8802, "STENCIL_BACK_PASS_DEPTH_FAIL_ATI" },
-  { 0x8803, "STENCIL_BACK_PASS_DEPTH_PASS_ATI" },
 /* OpenGL extension GL_EXT_gpu_program_parameters */
 /* OpenGL extension GL_EXT_timer_query */
-  { 0x88BF, "TIME_ELAPSED_EXT" },
 /* OpenGL extension GL_INGR_blend_func_separate */
 /* OpenGL extension GL_MESA_texture_signed_rgba */
   { 0x8F9C, "SIGNED_NORMALIZED" },
   { 0x8F93, "RGBA_SNORM" },
   { 0x8F97, "RGBA8_SNORM" },
 /* OpenGL extension GL_SGIS_point_parameters */
-  { 0x8126, "POINT_SIZE_MIN_SGIS" },
-  { 0x8127, "POINT_SIZE_MAX_SGIS" },
-  { 0x8128, "POINT_FADE_THRESHOLD_SIZE_SGIS" },
-  { 0x8129, "POINT_DISTANCE_ATTENUATION_SGIS" },
 /* OpenGL extension GL_SGIX_igloo_interface */
 /* OpenGL extension GL_SGIX_polynomial_ffd */
     { 0, NULL }
 };
+static value_string_ext mesa_enum_ext = VALUE_STRING_EXT_INIT(mesa_enum);
diff --git a/epan/dissectors/x11-register-info.h b/epan/dissectors/x11-register-info.h
index ad7ce35bcd..ddee0891f5 100644
--- a/epan/dissectors/x11-register-info.h
+++ b/epan/dissectors/x11-register-info.h
@@ -520,7 +520,7 @@
 /* Generated by ../../tools/process-x11-xcb.pl below this line */
 { &hf_x11_glx_render_CallList_list, { "list", "x11.glx.render.CallList.list", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CallLists_n, { "n", "x11.glx.render.CallLists.n", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CallLists_type, { "type", "x11.glx.render.CallLists.type", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CallLists_type, { "type", "x11.glx.render.CallLists.type", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CallLists_lists, { "lists", "x11.glx.render.CallLists.lists", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CallLists_lists_signed, { "lists", "x11.glx.render.CallLists.lists", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CallLists_lists_unsigned, { "lists", "x11.glx.render.CallLists.lists", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
@@ -530,7 +530,7 @@
 { &hf_x11_glx_render_CallLists_lists_item_int32, { "lists", "x11.glx.render.CallLists.lists", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CallLists_lists_item_float, { "lists", "x11.glx.render.CallLists.lists", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ListBase_base, { "base", "x11.glx.render.ListBase.base", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Begin_mode, { "mode", "x11.glx.render.Begin.mode", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Begin_mode, { "mode", "x11.glx.render.Begin.mode", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Bitmap_width, { "width", "x11.glx.render.Bitmap.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Bitmap_height, { "height", "x11.glx.render.Bitmap.height", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Bitmap_xorig, { "xorig", "x11.glx.render.Bitmap.xorig", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -686,69 +686,69 @@
 { &hf_x11_glx_render_Vertex4iv_v_item, { "v", "x11.glx.render.Vertex4iv.v", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Vertex4sv_v, { "v", "x11.glx.render.Vertex4sv.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Vertex4sv_v_item, { "v", "x11.glx.render.Vertex4sv.v", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ClipPlane_plane, { "plane", "x11.glx.render.ClipPlane.plane", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ClipPlane_plane, { "plane", "x11.glx.render.ClipPlane.plane", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ClipPlane_equation, { "equation", "x11.glx.render.ClipPlane.equation", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ClipPlane_equation_item, { "equation", "x11.glx.render.ClipPlane.equation", FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ColorMaterial_face, { "face", "x11.glx.render.ColorMaterial.face", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ColorMaterial_mode, { "mode", "x11.glx.render.ColorMaterial.mode", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CullFace_mode, { "mode", "x11.glx.render.CullFace.mode", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Fogf_pname, { "pname", "x11.glx.render.Fogf.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ColorMaterial_face, { "face", "x11.glx.render.ColorMaterial.face", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ColorMaterial_mode, { "mode", "x11.glx.render.ColorMaterial.mode", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CullFace_mode, { "mode", "x11.glx.render.CullFace.mode", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Fogf_pname, { "pname", "x11.glx.render.Fogf.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Fogf_param, { "param", "x11.glx.render.Fogf.param", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Fogfv_pname, { "pname", "x11.glx.render.Fogfv.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Fogfv_pname, { "pname", "x11.glx.render.Fogfv.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Fogfv_params, { "params", "x11.glx.render.Fogfv.params", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Fogfv_params_item, { "params", "x11.glx.render.Fogfv.params", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Fogi_pname, { "pname", "x11.glx.render.Fogi.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Fogi_pname, { "pname", "x11.glx.render.Fogi.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Fogi_param, { "param", "x11.glx.render.Fogi.param", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Fogiv_pname, { "pname", "x11.glx.render.Fogiv.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Fogiv_pname, { "pname", "x11.glx.render.Fogiv.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Fogiv_params, { "params", "x11.glx.render.Fogiv.params", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Fogiv_params_item, { "params", "x11.glx.render.Fogiv.params", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_FrontFace_mode, { "mode", "x11.glx.render.FrontFace.mode", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Hint_target, { "target", "x11.glx.render.Hint.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Hint_mode, { "mode", "x11.glx.render.Hint.mode", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Lightf_light, { "light", "x11.glx.render.Lightf.light", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Lightf_pname, { "pname", "x11.glx.render.Lightf.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_FrontFace_mode, { "mode", "x11.glx.render.FrontFace.mode", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Hint_target, { "target", "x11.glx.render.Hint.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Hint_mode, { "mode", "x11.glx.render.Hint.mode", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Lightf_light, { "light", "x11.glx.render.Lightf.light", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Lightf_pname, { "pname", "x11.glx.render.Lightf.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Lightf_param, { "param", "x11.glx.render.Lightf.param", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Lightfv_light, { "light", "x11.glx.render.Lightfv.light", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Lightfv_pname, { "pname", "x11.glx.render.Lightfv.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Lightfv_light, { "light", "x11.glx.render.Lightfv.light", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Lightfv_pname, { "pname", "x11.glx.render.Lightfv.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Lightfv_params, { "params", "x11.glx.render.Lightfv.params", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Lightfv_params_item, { "params", "x11.glx.render.Lightfv.params", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Lighti_light, { "light", "x11.glx.render.Lighti.light", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Lighti_pname, { "pname", "x11.glx.render.Lighti.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Lighti_light, { "light", "x11.glx.render.Lighti.light", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Lighti_pname, { "pname", "x11.glx.render.Lighti.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Lighti_param, { "param", "x11.glx.render.Lighti.param", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Lightiv_light, { "light", "x11.glx.render.Lightiv.light", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Lightiv_pname, { "pname", "x11.glx.render.Lightiv.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Lightiv_light, { "light", "x11.glx.render.Lightiv.light", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Lightiv_pname, { "pname", "x11.glx.render.Lightiv.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Lightiv_params, { "params", "x11.glx.render.Lightiv.params", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Lightiv_params_item, { "params", "x11.glx.render.Lightiv.params", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_LightModelf_pname, { "pname", "x11.glx.render.LightModelf.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_LightModelf_pname, { "pname", "x11.glx.render.LightModelf.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_LightModelf_param, { "param", "x11.glx.render.LightModelf.param", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_LightModelfv_pname, { "pname", "x11.glx.render.LightModelfv.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_LightModelfv_pname, { "pname", "x11.glx.render.LightModelfv.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_LightModelfv_params, { "params", "x11.glx.render.LightModelfv.params", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_LightModelfv_params_item, { "params", "x11.glx.render.LightModelfv.params", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_LightModeli_pname, { "pname", "x11.glx.render.LightModeli.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_LightModeli_pname, { "pname", "x11.glx.render.LightModeli.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_LightModeli_param, { "param", "x11.glx.render.LightModeli.param", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_LightModeliv_pname, { "pname", "x11.glx.render.LightModeliv.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_LightModeliv_pname, { "pname", "x11.glx.render.LightModeliv.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_LightModeliv_params, { "params", "x11.glx.render.LightModeliv.params", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_LightModeliv_params_item, { "params", "x11.glx.render.LightModeliv.params", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_LineStipple_factor, { "factor", "x11.glx.render.LineStipple.factor", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_LineStipple_pattern, { "pattern", "x11.glx.render.LineStipple.pattern", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_LineWidth_width, { "width", "x11.glx.render.LineWidth.width", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Materialf_face, { "face", "x11.glx.render.Materialf.face", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Materialf_pname, { "pname", "x11.glx.render.Materialf.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Materialf_face, { "face", "x11.glx.render.Materialf.face", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Materialf_pname, { "pname", "x11.glx.render.Materialf.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Materialf_param, { "param", "x11.glx.render.Materialf.param", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Materialfv_face, { "face", "x11.glx.render.Materialfv.face", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Materialfv_pname, { "pname", "x11.glx.render.Materialfv.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Materialfv_face, { "face", "x11.glx.render.Materialfv.face", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Materialfv_pname, { "pname", "x11.glx.render.Materialfv.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Materialfv_params, { "params", "x11.glx.render.Materialfv.params", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Materialfv_params_item, { "params", "x11.glx.render.Materialfv.params", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Materiali_face, { "face", "x11.glx.render.Materiali.face", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Materiali_pname, { "pname", "x11.glx.render.Materiali.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Materiali_face, { "face", "x11.glx.render.Materiali.face", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Materiali_pname, { "pname", "x11.glx.render.Materiali.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Materiali_param, { "param", "x11.glx.render.Materiali.param", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Materialiv_face, { "face", "x11.glx.render.Materialiv.face", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Materialiv_pname, { "pname", "x11.glx.render.Materialiv.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Materialiv_face, { "face", "x11.glx.render.Materialiv.face", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Materialiv_pname, { "pname", "x11.glx.render.Materialiv.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Materialiv_params, { "params", "x11.glx.render.Materialiv.params", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Materialiv_params_item, { "params", "x11.glx.render.Materialiv.params", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PointSize_size, { "size", "x11.glx.render.PointSize.size", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_PolygonMode_face, { "face", "x11.glx.render.PolygonMode.face", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_PolygonMode_mode, { "mode", "x11.glx.render.PolygonMode.mode", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_PolygonMode_face, { "face", "x11.glx.render.PolygonMode.face", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_PolygonMode_mode, { "mode", "x11.glx.render.PolygonMode.mode", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PolygonStipple_mask, { "mask", "x11.glx.render.PolygonStipple.mask", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PolygonStipple_swapbytes, { "swap bytes", "x11.glx.render.PolygonStipple.swapbytes", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PolygonStipple_lsbfirst, { "lsb first", "x11.glx.render.PolygonStipple.lsbfirst", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -760,28 +760,28 @@
 { &hf_x11_glx_render_Scissor_y, { "y", "x11.glx.render.Scissor.y", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Scissor_width, { "width", "x11.glx.render.Scissor.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Scissor_height, { "height", "x11.glx.render.Scissor.height", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ShadeModel_mode, { "mode", "x11.glx.render.ShadeModel.mode", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexParameterf_target, { "target", "x11.glx.render.TexParameterf.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexParameterf_pname, { "pname", "x11.glx.render.TexParameterf.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ShadeModel_mode, { "mode", "x11.glx.render.ShadeModel.mode", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexParameterf_target, { "target", "x11.glx.render.TexParameterf.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexParameterf_pname, { "pname", "x11.glx.render.TexParameterf.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexParameterf_param, { "param", "x11.glx.render.TexParameterf.param", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexParameterfv_target, { "target", "x11.glx.render.TexParameterfv.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexParameterfv_pname, { "pname", "x11.glx.render.TexParameterfv.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexParameterfv_target, { "target", "x11.glx.render.TexParameterfv.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexParameterfv_pname, { "pname", "x11.glx.render.TexParameterfv.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexParameterfv_params, { "params", "x11.glx.render.TexParameterfv.params", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexParameterfv_params_item, { "params", "x11.glx.render.TexParameterfv.params", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexParameteri_target, { "target", "x11.glx.render.TexParameteri.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexParameteri_pname, { "pname", "x11.glx.render.TexParameteri.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexParameteri_target, { "target", "x11.glx.render.TexParameteri.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexParameteri_pname, { "pname", "x11.glx.render.TexParameteri.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexParameteri_param, { "param", "x11.glx.render.TexParameteri.param", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexParameteriv_target, { "target", "x11.glx.render.TexParameteriv.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexParameteriv_pname, { "pname", "x11.glx.render.TexParameteriv.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexParameteriv_target, { "target", "x11.glx.render.TexParameteriv.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexParameteriv_pname, { "pname", "x11.glx.render.TexParameteriv.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexParameteriv_params, { "params", "x11.glx.render.TexParameteriv.params", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexParameteriv_params_item, { "params", "x11.glx.render.TexParameteriv.params", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexImage1D_target, { "target", "x11.glx.render.TexImage1D.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexImage1D_target, { "target", "x11.glx.render.TexImage1D.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage1D_level, { "level", "x11.glx.render.TexImage1D.level", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage1D_internalformat, { "internalformat", "x11.glx.render.TexImage1D.internalformat", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage1D_width, { "width", "x11.glx.render.TexImage1D.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage1D_border, { "border", "x11.glx.render.TexImage1D.border", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexImage1D_format, { "format", "x11.glx.render.TexImage1D.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexImage1D_type, { "type", "x11.glx.render.TexImage1D.type", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexImage1D_format, { "format", "x11.glx.render.TexImage1D.format", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexImage1D_type, { "type", "x11.glx.render.TexImage1D.type", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage1D_pixels, { "pixels", "x11.glx.render.TexImage1D.pixels", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage1D_swapbytes, { "swap bytes", "x11.glx.render.TexImage1D.swapbytes", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage1D_lsbfirst, { "lsb first", "x11.glx.render.TexImage1D.lsbfirst", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -789,14 +789,14 @@
 { &hf_x11_glx_render_TexImage1D_skiprows, { "skip rows", "x11.glx.render.TexImage1D.skiprows", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage1D_skippixels, { "skip pixels", "x11.glx.render.TexImage1D.skippixels", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage1D_alignment, { "alignment", "x11.glx.render.TexImage1D.alignment", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexImage2D_target, { "target", "x11.glx.render.TexImage2D.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexImage2D_target, { "target", "x11.glx.render.TexImage2D.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage2D_level, { "level", "x11.glx.render.TexImage2D.level", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage2D_internalformat, { "internalformat", "x11.glx.render.TexImage2D.internalformat", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage2D_width, { "width", "x11.glx.render.TexImage2D.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage2D_height, { "height", "x11.glx.render.TexImage2D.height", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage2D_border, { "border", "x11.glx.render.TexImage2D.border", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexImage2D_format, { "format", "x11.glx.render.TexImage2D.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexImage2D_type, { "type", "x11.glx.render.TexImage2D.type", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexImage2D_format, { "format", "x11.glx.render.TexImage2D.format", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexImage2D_type, { "type", "x11.glx.render.TexImage2D.type", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage2D_pixels, { "pixels", "x11.glx.render.TexImage2D.pixels", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage2D_swapbytes, { "swap bytes", "x11.glx.render.TexImage2D.swapbytes", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage2D_lsbfirst, { "lsb first", "x11.glx.render.TexImage2D.lsbfirst", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -804,45 +804,45 @@
 { &hf_x11_glx_render_TexImage2D_skiprows, { "skip rows", "x11.glx.render.TexImage2D.skiprows", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage2D_skippixels, { "skip pixels", "x11.glx.render.TexImage2D.skippixels", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage2D_alignment, { "alignment", "x11.glx.render.TexImage2D.alignment", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexEnvf_target, { "target", "x11.glx.render.TexEnvf.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexEnvf_pname, { "pname", "x11.glx.render.TexEnvf.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexEnvf_target, { "target", "x11.glx.render.TexEnvf.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexEnvf_pname, { "pname", "x11.glx.render.TexEnvf.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexEnvf_param, { "param", "x11.glx.render.TexEnvf.param", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexEnvfv_target, { "target", "x11.glx.render.TexEnvfv.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexEnvfv_pname, { "pname", "x11.glx.render.TexEnvfv.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexEnvfv_target, { "target", "x11.glx.render.TexEnvfv.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexEnvfv_pname, { "pname", "x11.glx.render.TexEnvfv.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexEnvfv_params, { "params", "x11.glx.render.TexEnvfv.params", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexEnvfv_params_item, { "params", "x11.glx.render.TexEnvfv.params", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexEnvi_target, { "target", "x11.glx.render.TexEnvi.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexEnvi_pname, { "pname", "x11.glx.render.TexEnvi.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexEnvi_target, { "target", "x11.glx.render.TexEnvi.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexEnvi_pname, { "pname", "x11.glx.render.TexEnvi.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexEnvi_param, { "param", "x11.glx.render.TexEnvi.param", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexEnviv_target, { "target", "x11.glx.render.TexEnviv.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexEnviv_pname, { "pname", "x11.glx.render.TexEnviv.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexEnviv_target, { "target", "x11.glx.render.TexEnviv.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexEnviv_pname, { "pname", "x11.glx.render.TexEnviv.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexEnviv_params, { "params", "x11.glx.render.TexEnviv.params", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexEnviv_params_item, { "params", "x11.glx.render.TexEnviv.params", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexGend_coord, { "coord", "x11.glx.render.TexGend.coord", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexGend_pname, { "pname", "x11.glx.render.TexGend.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexGend_coord, { "coord", "x11.glx.render.TexGend.coord", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexGend_pname, { "pname", "x11.glx.render.TexGend.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexGend_param, { "param", "x11.glx.render.TexGend.param", FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexGendv_coord, { "coord", "x11.glx.render.TexGendv.coord", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexGendv_pname, { "pname", "x11.glx.render.TexGendv.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexGendv_coord, { "coord", "x11.glx.render.TexGendv.coord", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexGendv_pname, { "pname", "x11.glx.render.TexGendv.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexGendv_params, { "params", "x11.glx.render.TexGendv.params", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexGendv_params_item, { "params", "x11.glx.render.TexGendv.params", FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexGenf_coord, { "coord", "x11.glx.render.TexGenf.coord", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexGenf_pname, { "pname", "x11.glx.render.TexGenf.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexGenf_coord, { "coord", "x11.glx.render.TexGenf.coord", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexGenf_pname, { "pname", "x11.glx.render.TexGenf.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexGenf_param, { "param", "x11.glx.render.TexGenf.param", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexGenfv_coord, { "coord", "x11.glx.render.TexGenfv.coord", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexGenfv_pname, { "pname", "x11.glx.render.TexGenfv.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexGenfv_coord, { "coord", "x11.glx.render.TexGenfv.coord", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexGenfv_pname, { "pname", "x11.glx.render.TexGenfv.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexGenfv_params, { "params", "x11.glx.render.TexGenfv.params", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexGenfv_params_item, { "params", "x11.glx.render.TexGenfv.params", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexGeni_coord, { "coord", "x11.glx.render.TexGeni.coord", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexGeni_pname, { "pname", "x11.glx.render.TexGeni.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexGeni_coord, { "coord", "x11.glx.render.TexGeni.coord", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexGeni_pname, { "pname", "x11.glx.render.TexGeni.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexGeni_param, { "param", "x11.glx.render.TexGeni.param", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexGeniv_coord, { "coord", "x11.glx.render.TexGeniv.coord", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexGeniv_pname, { "pname", "x11.glx.render.TexGeniv.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexGeniv_coord, { "coord", "x11.glx.render.TexGeniv.coord", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexGeniv_pname, { "pname", "x11.glx.render.TexGeniv.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexGeniv_params, { "params", "x11.glx.render.TexGeniv.params", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexGeniv_params_item, { "params", "x11.glx.render.TexGeniv.params", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_LoadName_name, { "name", "x11.glx.render.LoadName.name", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PassThrough_token, { "token", "x11.glx.render.PassThrough.token", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PushName_name, { "name", "x11.glx.render.PushName.name", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_DrawBuffer_mode, { "mode", "x11.glx.render.DrawBuffer.mode", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_DrawBuffer_mode, { "mode", "x11.glx.render.DrawBuffer.mode", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Clear_mask, { "mask", "x11.glx.render.Clear.mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ClearAccum_red, { "red", "x11.glx.render.ClearAccum.red", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ClearAccum_green, { "green", "x11.glx.render.ClearAccum.green", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -862,26 +862,26 @@
 { &hf_x11_glx_render_ColorMask_alpha, { "alpha", "x11.glx.render.ColorMask.alpha", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_DepthMask_flag, { "flag", "x11.glx.render.DepthMask.flag", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_IndexMask_mask, { "mask", "x11.glx.render.IndexMask.mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Accum_op, { "op", "x11.glx.render.Accum.op", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Accum_op, { "op", "x11.glx.render.Accum.op", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Accum_value, { "value", "x11.glx.render.Accum.value", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Disable_cap, { "cap", "x11.glx.render.Disable.cap", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Enable_cap, { "cap", "x11.glx.render.Enable.cap", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Disable_cap, { "cap", "x11.glx.render.Disable.cap", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Enable_cap, { "cap", "x11.glx.render.Enable.cap", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PushAttrib_mask, { "mask", "x11.glx.render.PushAttrib.mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Map1d_target, { "target", "x11.glx.render.Map1d.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Map1d_target, { "target", "x11.glx.render.Map1d.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Map1d_u1, { "u1", "x11.glx.render.Map1d.u1", FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Map1d_u2, { "u2", "x11.glx.render.Map1d.u2", FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Map1d_stride, { "stride", "x11.glx.render.Map1d.stride", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Map1d_order, { "order", "x11.glx.render.Map1d.order", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Map1d_points, { "points", "x11.glx.render.Map1d.points", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Map1d_points_item, { "points", "x11.glx.render.Map1d.points", FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Map1f_target, { "target", "x11.glx.render.Map1f.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Map1f_target, { "target", "x11.glx.render.Map1f.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Map1f_u1, { "u1", "x11.glx.render.Map1f.u1", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Map1f_u2, { "u2", "x11.glx.render.Map1f.u2", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Map1f_stride, { "stride", "x11.glx.render.Map1f.stride", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Map1f_order, { "order", "x11.glx.render.Map1f.order", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Map1f_points, { "points", "x11.glx.render.Map1f.points", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Map1f_points_item, { "points", "x11.glx.render.Map1f.points", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Map2d_target, { "target", "x11.glx.render.Map2d.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Map2d_target, { "target", "x11.glx.render.Map2d.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Map2d_u1, { "u1", "x11.glx.render.Map2d.u1", FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Map2d_u2, { "u2", "x11.glx.render.Map2d.u2", FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Map2d_ustride, { "ustride", "x11.glx.render.Map2d.ustride", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
@@ -892,7 +892,7 @@
 { &hf_x11_glx_render_Map2d_vorder, { "vorder", "x11.glx.render.Map2d.vorder", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Map2d_points, { "points", "x11.glx.render.Map2d.points", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Map2d_points_item, { "points", "x11.glx.render.Map2d.points", FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Map2f_target, { "target", "x11.glx.render.Map2f.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Map2f_target, { "target", "x11.glx.render.Map2f.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Map2f_u1, { "u1", "x11.glx.render.Map2f.u1", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Map2f_u2, { "u2", "x11.glx.render.Map2f.u2", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Map2f_ustride, { "ustride", "x11.glx.render.Map2f.ustride", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
@@ -929,57 +929,57 @@
 { &hf_x11_glx_render_EvalCoord2dv_u_item, { "u", "x11.glx.render.EvalCoord2dv.u", FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_EvalCoord2fv_u, { "u", "x11.glx.render.EvalCoord2fv.u", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_EvalCoord2fv_u_item, { "u", "x11.glx.render.EvalCoord2fv.u", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_EvalMesh1_mode, { "mode", "x11.glx.render.EvalMesh1.mode", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_EvalMesh1_mode, { "mode", "x11.glx.render.EvalMesh1.mode", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_EvalMesh1_i1, { "i1", "x11.glx.render.EvalMesh1.i1", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_EvalMesh1_i2, { "i2", "x11.glx.render.EvalMesh1.i2", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_EvalPoint1_i, { "i", "x11.glx.render.EvalPoint1.i", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_EvalMesh2_mode, { "mode", "x11.glx.render.EvalMesh2.mode", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_EvalMesh2_mode, { "mode", "x11.glx.render.EvalMesh2.mode", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_EvalMesh2_i1, { "i1", "x11.glx.render.EvalMesh2.i1", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_EvalMesh2_i2, { "i2", "x11.glx.render.EvalMesh2.i2", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_EvalMesh2_j1, { "j1", "x11.glx.render.EvalMesh2.j1", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_EvalMesh2_j2, { "j2", "x11.glx.render.EvalMesh2.j2", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_EvalPoint2_i, { "i", "x11.glx.render.EvalPoint2.i", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_EvalPoint2_j, { "j", "x11.glx.render.EvalPoint2.j", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_AlphaFunc_func, { "func", "x11.glx.render.AlphaFunc.func", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_AlphaFunc_func, { "func", "x11.glx.render.AlphaFunc.func", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_AlphaFunc_ref, { "ref", "x11.glx.render.AlphaFunc.ref", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_BlendFunc_sfactor, { "sfactor", "x11.glx.render.BlendFunc.sfactor", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_BlendFunc_dfactor, { "dfactor", "x11.glx.render.BlendFunc.dfactor", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_LogicOp_opcode, { "opcode", "x11.glx.render.LogicOp.opcode", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_StencilFunc_func, { "func", "x11.glx.render.StencilFunc.func", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_BlendFunc_sfactor, { "sfactor", "x11.glx.render.BlendFunc.sfactor", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_BlendFunc_dfactor, { "dfactor", "x11.glx.render.BlendFunc.dfactor", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_LogicOp_opcode, { "opcode", "x11.glx.render.LogicOp.opcode", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_StencilFunc_func, { "func", "x11.glx.render.StencilFunc.func", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_StencilFunc_ref, { "ref", "x11.glx.render.StencilFunc.ref", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_StencilFunc_mask, { "mask", "x11.glx.render.StencilFunc.mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_StencilOp_fail, { "fail", "x11.glx.render.StencilOp.fail", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_StencilOp_zfail, { "zfail", "x11.glx.render.StencilOp.zfail", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_StencilOp_zpass, { "zpass", "x11.glx.render.StencilOp.zpass", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_DepthFunc_func, { "func", "x11.glx.render.DepthFunc.func", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_StencilOp_fail, { "fail", "x11.glx.render.StencilOp.fail", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_StencilOp_zfail, { "zfail", "x11.glx.render.StencilOp.zfail", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_StencilOp_zpass, { "zpass", "x11.glx.render.StencilOp.zpass", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_DepthFunc_func, { "func", "x11.glx.render.DepthFunc.func", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PixelZoom_xfactor, { "xfactor", "x11.glx.render.PixelZoom.xfactor", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PixelZoom_yfactor, { "yfactor", "x11.glx.render.PixelZoom.yfactor", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_PixelTransferf_pname, { "pname", "x11.glx.render.PixelTransferf.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_PixelTransferf_pname, { "pname", "x11.glx.render.PixelTransferf.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PixelTransferf_param, { "param", "x11.glx.render.PixelTransferf.param", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_PixelTransferi_pname, { "pname", "x11.glx.render.PixelTransferi.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_PixelTransferi_pname, { "pname", "x11.glx.render.PixelTransferi.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PixelTransferi_param, { "param", "x11.glx.render.PixelTransferi.param", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_PixelMapfv_map, { "map", "x11.glx.render.PixelMapfv.map", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_PixelMapfv_map, { "map", "x11.glx.render.PixelMapfv.map", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PixelMapfv_mapsize, { "mapsize", "x11.glx.render.PixelMapfv.mapsize", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PixelMapfv_values, { "values", "x11.glx.render.PixelMapfv.values", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PixelMapfv_values_item, { "values", "x11.glx.render.PixelMapfv.values", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_PixelMapuiv_map, { "map", "x11.glx.render.PixelMapuiv.map", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_PixelMapuiv_map, { "map", "x11.glx.render.PixelMapuiv.map", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PixelMapuiv_mapsize, { "mapsize", "x11.glx.render.PixelMapuiv.mapsize", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PixelMapuiv_values, { "values", "x11.glx.render.PixelMapuiv.values", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PixelMapuiv_values_item, { "values", "x11.glx.render.PixelMapuiv.values", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_PixelMapusv_map, { "map", "x11.glx.render.PixelMapusv.map", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_PixelMapusv_map, { "map", "x11.glx.render.PixelMapusv.map", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PixelMapusv_mapsize, { "mapsize", "x11.glx.render.PixelMapusv.mapsize", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PixelMapusv_values, { "values", "x11.glx.render.PixelMapusv.values", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PixelMapusv_values_item, { "values", "x11.glx.render.PixelMapusv.values", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ReadBuffer_mode, { "mode", "x11.glx.render.ReadBuffer.mode", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ReadBuffer_mode, { "mode", "x11.glx.render.ReadBuffer.mode", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyPixels_x, { "x", "x11.glx.render.CopyPixels.x", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyPixels_y, { "y", "x11.glx.render.CopyPixels.y", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyPixels_width, { "width", "x11.glx.render.CopyPixels.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyPixels_height, { "height", "x11.glx.render.CopyPixels.height", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CopyPixels_type, { "type", "x11.glx.render.CopyPixels.type", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CopyPixels_type, { "type", "x11.glx.render.CopyPixels.type", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_DrawPixels_width, { "width", "x11.glx.render.DrawPixels.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_DrawPixels_height, { "height", "x11.glx.render.DrawPixels.height", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_DrawPixels_format, { "format", "x11.glx.render.DrawPixels.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_DrawPixels_type, { "type", "x11.glx.render.DrawPixels.type", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_DrawPixels_format, { "format", "x11.glx.render.DrawPixels.format", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_DrawPixels_type, { "type", "x11.glx.render.DrawPixels.type", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_DrawPixels_pixels, { "pixels", "x11.glx.render.DrawPixels.pixels", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_DrawPixels_swapbytes, { "swap bytes", "x11.glx.render.DrawPixels.swapbytes", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_DrawPixels_lsbfirst, { "lsb first", "x11.glx.render.DrawPixels.lsbfirst", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -999,7 +999,7 @@
 { &hf_x11_glx_render_LoadMatrixf_m_item, { "m", "x11.glx.render.LoadMatrixf.m", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_LoadMatrixd_m, { "m", "x11.glx.render.LoadMatrixd.m", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_LoadMatrixd_m_item, { "m", "x11.glx.render.LoadMatrixd.m", FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_MatrixMode_mode, { "mode", "x11.glx.render.MatrixMode.mode", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_MatrixMode_mode, { "mode", "x11.glx.render.MatrixMode.mode", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultMatrixf_m, { "m", "x11.glx.render.MultMatrixf.m", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultMatrixf_m_item, { "m", "x11.glx.render.MultMatrixf.m", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultMatrixd_m, { "m", "x11.glx.render.MultMatrixd.m", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -1034,33 +1034,33 @@
 { &hf_x11_glx_render_Viewport_y, { "y", "x11.glx.render.Viewport.y", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Viewport_width, { "width", "x11.glx.render.Viewport.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Viewport_height, { "height", "x11.glx.render.Viewport.height", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_DrawArrays_mode, { "mode", "x11.glx.render.DrawArrays.mode", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_DrawArrays_mode, { "mode", "x11.glx.render.DrawArrays.mode", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_DrawArrays_first, { "first", "x11.glx.render.DrawArrays.first", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_DrawArrays_count, { "count", "x11.glx.render.DrawArrays.count", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PolygonOffset_factor, { "factor", "x11.glx.render.PolygonOffset.factor", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PolygonOffset_units, { "units", "x11.glx.render.PolygonOffset.units", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CopyTexImage1D_target, { "target", "x11.glx.render.CopyTexImage1D.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CopyTexImage1D_target, { "target", "x11.glx.render.CopyTexImage1D.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyTexImage1D_level, { "level", "x11.glx.render.CopyTexImage1D.level", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CopyTexImage1D_internalformat, { "internalformat", "x11.glx.render.CopyTexImage1D.internalformat", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CopyTexImage1D_internalformat, { "internalformat", "x11.glx.render.CopyTexImage1D.internalformat", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyTexImage1D_x, { "x", "x11.glx.render.CopyTexImage1D.x", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyTexImage1D_y, { "y", "x11.glx.render.CopyTexImage1D.y", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyTexImage1D_width, { "width", "x11.glx.render.CopyTexImage1D.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyTexImage1D_border, { "border", "x11.glx.render.CopyTexImage1D.border", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CopyTexImage2D_target, { "target", "x11.glx.render.CopyTexImage2D.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CopyTexImage2D_target, { "target", "x11.glx.render.CopyTexImage2D.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyTexImage2D_level, { "level", "x11.glx.render.CopyTexImage2D.level", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CopyTexImage2D_internalformat, { "internalformat", "x11.glx.render.CopyTexImage2D.internalformat", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CopyTexImage2D_internalformat, { "internalformat", "x11.glx.render.CopyTexImage2D.internalformat", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyTexImage2D_x, { "x", "x11.glx.render.CopyTexImage2D.x", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyTexImage2D_y, { "y", "x11.glx.render.CopyTexImage2D.y", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyTexImage2D_width, { "width", "x11.glx.render.CopyTexImage2D.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyTexImage2D_height, { "height", "x11.glx.render.CopyTexImage2D.height", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyTexImage2D_border, { "border", "x11.glx.render.CopyTexImage2D.border", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CopyTexSubImage1D_target, { "target", "x11.glx.render.CopyTexSubImage1D.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CopyTexSubImage1D_target, { "target", "x11.glx.render.CopyTexSubImage1D.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyTexSubImage1D_level, { "level", "x11.glx.render.CopyTexSubImage1D.level", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyTexSubImage1D_xoffset, { "xoffset", "x11.glx.render.CopyTexSubImage1D.xoffset", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyTexSubImage1D_x, { "x", "x11.glx.render.CopyTexSubImage1D.x", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyTexSubImage1D_y, { "y", "x11.glx.render.CopyTexSubImage1D.y", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyTexSubImage1D_width, { "width", "x11.glx.render.CopyTexSubImage1D.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CopyTexSubImage2D_target, { "target", "x11.glx.render.CopyTexSubImage2D.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CopyTexSubImage2D_target, { "target", "x11.glx.render.CopyTexSubImage2D.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyTexSubImage2D_level, { "level", "x11.glx.render.CopyTexSubImage2D.level", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyTexSubImage2D_xoffset, { "xoffset", "x11.glx.render.CopyTexSubImage2D.xoffset", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyTexSubImage2D_yoffset, { "yoffset", "x11.glx.render.CopyTexSubImage2D.yoffset", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
@@ -1068,12 +1068,12 @@
 { &hf_x11_glx_render_CopyTexSubImage2D_y, { "y", "x11.glx.render.CopyTexSubImage2D.y", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyTexSubImage2D_width, { "width", "x11.glx.render.CopyTexSubImage2D.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyTexSubImage2D_height, { "height", "x11.glx.render.CopyTexSubImage2D.height", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexSubImage1D_target, { "target", "x11.glx.render.TexSubImage1D.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexSubImage1D_target, { "target", "x11.glx.render.TexSubImage1D.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage1D_level, { "level", "x11.glx.render.TexSubImage1D.level", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage1D_xoffset, { "xoffset", "x11.glx.render.TexSubImage1D.xoffset", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage1D_width, { "width", "x11.glx.render.TexSubImage1D.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexSubImage1D_format, { "format", "x11.glx.render.TexSubImage1D.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexSubImage1D_type, { "type", "x11.glx.render.TexSubImage1D.type", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexSubImage1D_format, { "format", "x11.glx.render.TexSubImage1D.format", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexSubImage1D_type, { "type", "x11.glx.render.TexSubImage1D.type", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage1D_UNUSED, { "UNUSED", "x11.glx.render.TexSubImage1D.UNUSED", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage1D_pixels, { "pixels", "x11.glx.render.TexSubImage1D.pixels", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage1D_swapbytes, { "swap bytes", "x11.glx.render.TexSubImage1D.swapbytes", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -1082,14 +1082,14 @@
 { &hf_x11_glx_render_TexSubImage1D_skiprows, { "skip rows", "x11.glx.render.TexSubImage1D.skiprows", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage1D_skippixels, { "skip pixels", "x11.glx.render.TexSubImage1D.skippixels", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage1D_alignment, { "alignment", "x11.glx.render.TexSubImage1D.alignment", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexSubImage2D_target, { "target", "x11.glx.render.TexSubImage2D.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexSubImage2D_target, { "target", "x11.glx.render.TexSubImage2D.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage2D_level, { "level", "x11.glx.render.TexSubImage2D.level", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage2D_xoffset, { "xoffset", "x11.glx.render.TexSubImage2D.xoffset", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage2D_yoffset, { "yoffset", "x11.glx.render.TexSubImage2D.yoffset", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage2D_width, { "width", "x11.glx.render.TexSubImage2D.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage2D_height, { "height", "x11.glx.render.TexSubImage2D.height", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexSubImage2D_format, { "format", "x11.glx.render.TexSubImage2D.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexSubImage2D_type, { "type", "x11.glx.render.TexSubImage2D.type", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexSubImage2D_format, { "format", "x11.glx.render.TexSubImage2D.format", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexSubImage2D_type, { "type", "x11.glx.render.TexSubImage2D.type", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage2D_UNUSED, { "UNUSED", "x11.glx.render.TexSubImage2D.UNUSED", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage2D_pixels, { "pixels", "x11.glx.render.TexSubImage2D.pixels", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage2D_swapbytes, { "swap bytes", "x11.glx.render.TexSubImage2D.swapbytes", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -1098,7 +1098,7 @@
 { &hf_x11_glx_render_TexSubImage2D_skiprows, { "skip rows", "x11.glx.render.TexSubImage2D.skiprows", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage2D_skippixels, { "skip pixels", "x11.glx.render.TexSubImage2D.skippixels", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage2D_alignment, { "alignment", "x11.glx.render.TexSubImage2D.alignment", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_BindTexture_target, { "target", "x11.glx.render.BindTexture.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_BindTexture_target, { "target", "x11.glx.render.BindTexture.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_BindTexture_texture, { "texture", "x11.glx.render.BindTexture.texture", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PrioritizeTextures_n, { "n", "x11.glx.render.PrioritizeTextures.n", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PrioritizeTextures_textures, { "textures", "x11.glx.render.PrioritizeTextures.textures", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -1110,12 +1110,12 @@
 { &hf_x11_glx_render_BlendColor_green, { "green", "x11.glx.render.BlendColor.green", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_BlendColor_blue, { "blue", "x11.glx.render.BlendColor.blue", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_BlendColor_alpha, { "alpha", "x11.glx.render.BlendColor.alpha", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_BlendEquation_mode, { "mode", "x11.glx.render.BlendEquation.mode", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ColorTable_target, { "target", "x11.glx.render.ColorTable.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ColorTable_internalformat, { "internalformat", "x11.glx.render.ColorTable.internalformat", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_BlendEquation_mode, { "mode", "x11.glx.render.BlendEquation.mode", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ColorTable_target, { "target", "x11.glx.render.ColorTable.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ColorTable_internalformat, { "internalformat", "x11.glx.render.ColorTable.internalformat", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ColorTable_width, { "width", "x11.glx.render.ColorTable.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ColorTable_format, { "format", "x11.glx.render.ColorTable.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ColorTable_type, { "type", "x11.glx.render.ColorTable.type", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ColorTable_format, { "format", "x11.glx.render.ColorTable.format", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ColorTable_type, { "type", "x11.glx.render.ColorTable.type", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ColorTable_table, { "table", "x11.glx.render.ColorTable.table", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ColorTable_swapbytes, { "swap bytes", "x11.glx.render.ColorTable.swapbytes", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ColorTable_lsbfirst, { "lsb first", "x11.glx.render.ColorTable.lsbfirst", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -1123,24 +1123,24 @@
 { &hf_x11_glx_render_ColorTable_skiprows, { "skip rows", "x11.glx.render.ColorTable.skiprows", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ColorTable_skippixels, { "skip pixels", "x11.glx.render.ColorTable.skippixels", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ColorTable_alignment, { "alignment", "x11.glx.render.ColorTable.alignment", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ColorTableParameterfv_target, { "target", "x11.glx.render.ColorTableParameterfv.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ColorTableParameterfv_pname, { "pname", "x11.glx.render.ColorTableParameterfv.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ColorTableParameterfv_target, { "target", "x11.glx.render.ColorTableParameterfv.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ColorTableParameterfv_pname, { "pname", "x11.glx.render.ColorTableParameterfv.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ColorTableParameterfv_params, { "params", "x11.glx.render.ColorTableParameterfv.params", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ColorTableParameterfv_params_item, { "params", "x11.glx.render.ColorTableParameterfv.params", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ColorTableParameteriv_target, { "target", "x11.glx.render.ColorTableParameteriv.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ColorTableParameteriv_pname, { "pname", "x11.glx.render.ColorTableParameteriv.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ColorTableParameteriv_target, { "target", "x11.glx.render.ColorTableParameteriv.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ColorTableParameteriv_pname, { "pname", "x11.glx.render.ColorTableParameteriv.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ColorTableParameteriv_params, { "params", "x11.glx.render.ColorTableParameteriv.params", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ColorTableParameteriv_params_item, { "params", "x11.glx.render.ColorTableParameteriv.params", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CopyColorTable_target, { "target", "x11.glx.render.CopyColorTable.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CopyColorTable_internalformat, { "internalformat", "x11.glx.render.CopyColorTable.internalformat", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CopyColorTable_target, { "target", "x11.glx.render.CopyColorTable.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CopyColorTable_internalformat, { "internalformat", "x11.glx.render.CopyColorTable.internalformat", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyColorTable_x, { "x", "x11.glx.render.CopyColorTable.x", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyColorTable_y, { "y", "x11.glx.render.CopyColorTable.y", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyColorTable_width, { "width", "x11.glx.render.CopyColorTable.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ColorSubTable_target, { "target", "x11.glx.render.ColorSubTable.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ColorSubTable_target, { "target", "x11.glx.render.ColorSubTable.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ColorSubTable_start, { "start", "x11.glx.render.ColorSubTable.start", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ColorSubTable_count, { "count", "x11.glx.render.ColorSubTable.count", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ColorSubTable_format, { "format", "x11.glx.render.ColorSubTable.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ColorSubTable_type, { "type", "x11.glx.render.ColorSubTable.type", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ColorSubTable_format, { "format", "x11.glx.render.ColorSubTable.format", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ColorSubTable_type, { "type", "x11.glx.render.ColorSubTable.type", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ColorSubTable_data, { "data", "x11.glx.render.ColorSubTable.data", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ColorSubTable_swapbytes, { "swap bytes", "x11.glx.render.ColorSubTable.swapbytes", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ColorSubTable_lsbfirst, { "lsb first", "x11.glx.render.ColorSubTable.lsbfirst", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -1148,16 +1148,16 @@
 { &hf_x11_glx_render_ColorSubTable_skiprows, { "skip rows", "x11.glx.render.ColorSubTable.skiprows", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ColorSubTable_skippixels, { "skip pixels", "x11.glx.render.ColorSubTable.skippixels", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ColorSubTable_alignment, { "alignment", "x11.glx.render.ColorSubTable.alignment", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CopyColorSubTable_target, { "target", "x11.glx.render.CopyColorSubTable.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CopyColorSubTable_target, { "target", "x11.glx.render.CopyColorSubTable.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyColorSubTable_start, { "start", "x11.glx.render.CopyColorSubTable.start", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyColorSubTable_x, { "x", "x11.glx.render.CopyColorSubTable.x", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyColorSubTable_y, { "y", "x11.glx.render.CopyColorSubTable.y", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyColorSubTable_width, { "width", "x11.glx.render.CopyColorSubTable.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ConvolutionFilter1D_target, { "target", "x11.glx.render.ConvolutionFilter1D.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ConvolutionFilter1D_internalformat, { "internalformat", "x11.glx.render.ConvolutionFilter1D.internalformat", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ConvolutionFilter1D_target, { "target", "x11.glx.render.ConvolutionFilter1D.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ConvolutionFilter1D_internalformat, { "internalformat", "x11.glx.render.ConvolutionFilter1D.internalformat", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ConvolutionFilter1D_width, { "width", "x11.glx.render.ConvolutionFilter1D.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ConvolutionFilter1D_format, { "format", "x11.glx.render.ConvolutionFilter1D.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ConvolutionFilter1D_type, { "type", "x11.glx.render.ConvolutionFilter1D.type", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ConvolutionFilter1D_format, { "format", "x11.glx.render.ConvolutionFilter1D.format", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ConvolutionFilter1D_type, { "type", "x11.glx.render.ConvolutionFilter1D.type", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ConvolutionFilter1D_image, { "image", "x11.glx.render.ConvolutionFilter1D.image", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ConvolutionFilter1D_swapbytes, { "swap bytes", "x11.glx.render.ConvolutionFilter1D.swapbytes", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ConvolutionFilter1D_lsbfirst, { "lsb first", "x11.glx.render.ConvolutionFilter1D.lsbfirst", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -1165,12 +1165,12 @@
 { &hf_x11_glx_render_ConvolutionFilter1D_skiprows, { "skip rows", "x11.glx.render.ConvolutionFilter1D.skiprows", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ConvolutionFilter1D_skippixels, { "skip pixels", "x11.glx.render.ConvolutionFilter1D.skippixels", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ConvolutionFilter1D_alignment, { "alignment", "x11.glx.render.ConvolutionFilter1D.alignment", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ConvolutionFilter2D_target, { "target", "x11.glx.render.ConvolutionFilter2D.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ConvolutionFilter2D_internalformat, { "internalformat", "x11.glx.render.ConvolutionFilter2D.internalformat", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ConvolutionFilter2D_target, { "target", "x11.glx.render.ConvolutionFilter2D.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ConvolutionFilter2D_internalformat, { "internalformat", "x11.glx.render.ConvolutionFilter2D.internalformat", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ConvolutionFilter2D_width, { "width", "x11.glx.render.ConvolutionFilter2D.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ConvolutionFilter2D_height, { "height", "x11.glx.render.ConvolutionFilter2D.height", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ConvolutionFilter2D_format, { "format", "x11.glx.render.ConvolutionFilter2D.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ConvolutionFilter2D_type, { "type", "x11.glx.render.ConvolutionFilter2D.type", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ConvolutionFilter2D_format, { "format", "x11.glx.render.ConvolutionFilter2D.format", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ConvolutionFilter2D_type, { "type", "x11.glx.render.ConvolutionFilter2D.type", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ConvolutionFilter2D_image, { "image", "x11.glx.render.ConvolutionFilter2D.image", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ConvolutionFilter2D_swapbytes, { "swap bytes", "x11.glx.render.ConvolutionFilter2D.swapbytes", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ConvolutionFilter2D_lsbfirst, { "lsb first", "x11.glx.render.ConvolutionFilter2D.lsbfirst", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -1178,57 +1178,57 @@
 { &hf_x11_glx_render_ConvolutionFilter2D_skiprows, { "skip rows", "x11.glx.render.ConvolutionFilter2D.skiprows", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ConvolutionFilter2D_skippixels, { "skip pixels", "x11.glx.render.ConvolutionFilter2D.skippixels", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ConvolutionFilter2D_alignment, { "alignment", "x11.glx.render.ConvolutionFilter2D.alignment", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ConvolutionParameterf_target, { "target", "x11.glx.render.ConvolutionParameterf.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ConvolutionParameterf_pname, { "pname", "x11.glx.render.ConvolutionParameterf.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ConvolutionParameterf_target, { "target", "x11.glx.render.ConvolutionParameterf.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ConvolutionParameterf_pname, { "pname", "x11.glx.render.ConvolutionParameterf.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ConvolutionParameterf_params, { "params", "x11.glx.render.ConvolutionParameterf.params", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ConvolutionParameterfv_target, { "target", "x11.glx.render.ConvolutionParameterfv.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ConvolutionParameterfv_pname, { "pname", "x11.glx.render.ConvolutionParameterfv.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ConvolutionParameterfv_target, { "target", "x11.glx.render.ConvolutionParameterfv.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ConvolutionParameterfv_pname, { "pname", "x11.glx.render.ConvolutionParameterfv.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ConvolutionParameterfv_params, { "params", "x11.glx.render.ConvolutionParameterfv.params", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ConvolutionParameterfv_params_item, { "params", "x11.glx.render.ConvolutionParameterfv.params", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ConvolutionParameteri_target, { "target", "x11.glx.render.ConvolutionParameteri.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ConvolutionParameteri_pname, { "pname", "x11.glx.render.ConvolutionParameteri.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ConvolutionParameteri_target, { "target", "x11.glx.render.ConvolutionParameteri.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ConvolutionParameteri_pname, { "pname", "x11.glx.render.ConvolutionParameteri.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ConvolutionParameteri_params, { "params", "x11.glx.render.ConvolutionParameteri.params", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ConvolutionParameteriv_target, { "target", "x11.glx.render.ConvolutionParameteriv.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ConvolutionParameteriv_pname, { "pname", "x11.glx.render.ConvolutionParameteriv.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ConvolutionParameteriv_target, { "target", "x11.glx.render.ConvolutionParameteriv.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ConvolutionParameteriv_pname, { "pname", "x11.glx.render.ConvolutionParameteriv.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ConvolutionParameteriv_params, { "params", "x11.glx.render.ConvolutionParameteriv.params", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ConvolutionParameteriv_params_item, { "params", "x11.glx.render.ConvolutionParameteriv.params", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CopyConvolutionFilter1D_target, { "target", "x11.glx.render.CopyConvolutionFilter1D.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CopyConvolutionFilter1D_internalformat, { "internalformat", "x11.glx.render.CopyConvolutionFilter1D.internalformat", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CopyConvolutionFilter1D_target, { "target", "x11.glx.render.CopyConvolutionFilter1D.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CopyConvolutionFilter1D_internalformat, { "internalformat", "x11.glx.render.CopyConvolutionFilter1D.internalformat", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyConvolutionFilter1D_x, { "x", "x11.glx.render.CopyConvolutionFilter1D.x", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyConvolutionFilter1D_y, { "y", "x11.glx.render.CopyConvolutionFilter1D.y", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyConvolutionFilter1D_width, { "width", "x11.glx.render.CopyConvolutionFilter1D.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CopyConvolutionFilter2D_target, { "target", "x11.glx.render.CopyConvolutionFilter2D.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CopyConvolutionFilter2D_internalformat, { "internalformat", "x11.glx.render.CopyConvolutionFilter2D.internalformat", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CopyConvolutionFilter2D_target, { "target", "x11.glx.render.CopyConvolutionFilter2D.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CopyConvolutionFilter2D_internalformat, { "internalformat", "x11.glx.render.CopyConvolutionFilter2D.internalformat", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyConvolutionFilter2D_x, { "x", "x11.glx.render.CopyConvolutionFilter2D.x", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyConvolutionFilter2D_y, { "y", "x11.glx.render.CopyConvolutionFilter2D.y", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyConvolutionFilter2D_width, { "width", "x11.glx.render.CopyConvolutionFilter2D.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyConvolutionFilter2D_height, { "height", "x11.glx.render.CopyConvolutionFilter2D.height", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_SeparableFilter2D_target, { "target", "x11.glx.render.SeparableFilter2D.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_SeparableFilter2D_internalformat, { "internalformat", "x11.glx.render.SeparableFilter2D.internalformat", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_SeparableFilter2D_target, { "target", "x11.glx.render.SeparableFilter2D.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_SeparableFilter2D_internalformat, { "internalformat", "x11.glx.render.SeparableFilter2D.internalformat", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_SeparableFilter2D_width, { "width", "x11.glx.render.SeparableFilter2D.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_SeparableFilter2D_height, { "height", "x11.glx.render.SeparableFilter2D.height", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_SeparableFilter2D_format, { "format", "x11.glx.render.SeparableFilter2D.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_SeparableFilter2D_type, { "type", "x11.glx.render.SeparableFilter2D.type", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_SeparableFilter2D_format, { "format", "x11.glx.render.SeparableFilter2D.format", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_SeparableFilter2D_type, { "type", "x11.glx.render.SeparableFilter2D.type", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_SeparableFilter2D_row, { "row", "x11.glx.render.SeparableFilter2D.row", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_SeparableFilter2D_column, { "column", "x11.glx.render.SeparableFilter2D.column", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Histogram_target, { "target", "x11.glx.render.Histogram.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Histogram_target, { "target", "x11.glx.render.Histogram.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Histogram_width, { "width", "x11.glx.render.Histogram.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Histogram_internalformat, { "internalformat", "x11.glx.render.Histogram.internalformat", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Histogram_internalformat, { "internalformat", "x11.glx.render.Histogram.internalformat", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Histogram_sink, { "sink", "x11.glx.render.Histogram.sink", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Minmax_target, { "target", "x11.glx.render.Minmax.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_Minmax_internalformat, { "internalformat", "x11.glx.render.Minmax.internalformat", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Minmax_target, { "target", "x11.glx.render.Minmax.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_Minmax_internalformat, { "internalformat", "x11.glx.render.Minmax.internalformat", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_Minmax_sink, { "sink", "x11.glx.render.Minmax.sink", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ResetHistogram_target, { "target", "x11.glx.render.ResetHistogram.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ResetMinmax_target, { "target", "x11.glx.render.ResetMinmax.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexImage3D_target, { "target", "x11.glx.render.TexImage3D.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ResetHistogram_target, { "target", "x11.glx.render.ResetHistogram.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ResetMinmax_target, { "target", "x11.glx.render.ResetMinmax.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexImage3D_target, { "target", "x11.glx.render.TexImage3D.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage3D_level, { "level", "x11.glx.render.TexImage3D.level", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage3D_internalformat, { "internalformat", "x11.glx.render.TexImage3D.internalformat", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage3D_width, { "width", "x11.glx.render.TexImage3D.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage3D_height, { "height", "x11.glx.render.TexImage3D.height", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage3D_depth, { "depth", "x11.glx.render.TexImage3D.depth", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage3D_border, { "border", "x11.glx.render.TexImage3D.border", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexImage3D_format, { "format", "x11.glx.render.TexImage3D.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexImage3D_type, { "type", "x11.glx.render.TexImage3D.type", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexImage3D_format, { "format", "x11.glx.render.TexImage3D.format", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexImage3D_type, { "type", "x11.glx.render.TexImage3D.type", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage3D_pixels, { "pixels", "x11.glx.render.TexImage3D.pixels", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage3D_swapbytes, { "swap bytes", "x11.glx.render.TexImage3D.swapbytes", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage3D_lsbfirst, { "lsb first", "x11.glx.render.TexImage3D.lsbfirst", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -1236,7 +1236,7 @@
 { &hf_x11_glx_render_TexImage3D_skiprows, { "skip rows", "x11.glx.render.TexImage3D.skiprows", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage3D_skippixels, { "skip pixels", "x11.glx.render.TexImage3D.skippixels", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage3D_alignment, { "alignment", "x11.glx.render.TexImage3D.alignment", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexSubImage3D_target, { "target", "x11.glx.render.TexSubImage3D.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexSubImage3D_target, { "target", "x11.glx.render.TexSubImage3D.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage3D_level, { "level", "x11.glx.render.TexSubImage3D.level", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage3D_xoffset, { "xoffset", "x11.glx.render.TexSubImage3D.xoffset", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage3D_yoffset, { "yoffset", "x11.glx.render.TexSubImage3D.yoffset", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
@@ -1244,8 +1244,8 @@
 { &hf_x11_glx_render_TexSubImage3D_width, { "width", "x11.glx.render.TexSubImage3D.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage3D_height, { "height", "x11.glx.render.TexSubImage3D.height", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage3D_depth, { "depth", "x11.glx.render.TexSubImage3D.depth", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexSubImage3D_format, { "format", "x11.glx.render.TexSubImage3D.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexSubImage3D_type, { "type", "x11.glx.render.TexSubImage3D.type", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexSubImage3D_format, { "format", "x11.glx.render.TexSubImage3D.format", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexSubImage3D_type, { "type", "x11.glx.render.TexSubImage3D.type", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage3D_UNUSED, { "UNUSED", "x11.glx.render.TexSubImage3D.UNUSED", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage3D_pixels, { "pixels", "x11.glx.render.TexSubImage3D.pixels", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage3D_swapbytes, { "swap bytes", "x11.glx.render.TexSubImage3D.swapbytes", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -1254,7 +1254,7 @@
 { &hf_x11_glx_render_TexSubImage3D_skiprows, { "skip rows", "x11.glx.render.TexSubImage3D.skiprows", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage3D_skippixels, { "skip pixels", "x11.glx.render.TexSubImage3D.skippixels", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage3D_alignment, { "alignment", "x11.glx.render.TexSubImage3D.alignment", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CopyTexSubImage3D_target, { "target", "x11.glx.render.CopyTexSubImage3D.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CopyTexSubImage3D_target, { "target", "x11.glx.render.CopyTexSubImage3D.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyTexSubImage3D_level, { "level", "x11.glx.render.CopyTexSubImage3D.level", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyTexSubImage3D_xoffset, { "xoffset", "x11.glx.render.CopyTexSubImage3D.xoffset", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyTexSubImage3D_yoffset, { "yoffset", "x11.glx.render.CopyTexSubImage3D.yoffset", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
@@ -1263,70 +1263,70 @@
 { &hf_x11_glx_render_CopyTexSubImage3D_y, { "y", "x11.glx.render.CopyTexSubImage3D.y", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyTexSubImage3D_width, { "width", "x11.glx.render.CopyTexSubImage3D.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CopyTexSubImage3D_height, { "height", "x11.glx.render.CopyTexSubImage3D.height", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ActiveTexture_texture, { "texture", "x11.glx.render.ActiveTexture.texture", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_MultiTexCoord1dv_target, { "target", "x11.glx.render.MultiTexCoord1dv.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ActiveTexture_texture, { "texture", "x11.glx.render.ActiveTexture.texture", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_MultiTexCoord1dv_target, { "target", "x11.glx.render.MultiTexCoord1dv.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultiTexCoord1dv_v, { "v", "x11.glx.render.MultiTexCoord1dv.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultiTexCoord1dv_v_item, { "v", "x11.glx.render.MultiTexCoord1dv.v", FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_MultiTexCoord1iv_target, { "target", "x11.glx.render.MultiTexCoord1iv.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_MultiTexCoord1iv_target, { "target", "x11.glx.render.MultiTexCoord1iv.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultiTexCoord1iv_v, { "v", "x11.glx.render.MultiTexCoord1iv.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultiTexCoord1iv_v_item, { "v", "x11.glx.render.MultiTexCoord1iv.v", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_MultiTexCoord1sv_target, { "target", "x11.glx.render.MultiTexCoord1sv.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_MultiTexCoord1sv_target, { "target", "x11.glx.render.MultiTexCoord1sv.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultiTexCoord1sv_v, { "v", "x11.glx.render.MultiTexCoord1sv.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultiTexCoord1sv_v_item, { "v", "x11.glx.render.MultiTexCoord1sv.v", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_MultiTexCoord2dv_target, { "target", "x11.glx.render.MultiTexCoord2dv.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_MultiTexCoord2dv_target, { "target", "x11.glx.render.MultiTexCoord2dv.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultiTexCoord2dv_v, { "v", "x11.glx.render.MultiTexCoord2dv.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultiTexCoord2dv_v_item, { "v", "x11.glx.render.MultiTexCoord2dv.v", FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_MultiTexCoord2iv_target, { "target", "x11.glx.render.MultiTexCoord2iv.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_MultiTexCoord2iv_target, { "target", "x11.glx.render.MultiTexCoord2iv.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultiTexCoord2iv_v, { "v", "x11.glx.render.MultiTexCoord2iv.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultiTexCoord2iv_v_item, { "v", "x11.glx.render.MultiTexCoord2iv.v", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_MultiTexCoord2sv_target, { "target", "x11.glx.render.MultiTexCoord2sv.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_MultiTexCoord2sv_target, { "target", "x11.glx.render.MultiTexCoord2sv.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultiTexCoord2sv_v, { "v", "x11.glx.render.MultiTexCoord2sv.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultiTexCoord2sv_v_item, { "v", "x11.glx.render.MultiTexCoord2sv.v", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_MultiTexCoord3dv_target, { "target", "x11.glx.render.MultiTexCoord3dv.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_MultiTexCoord3dv_target, { "target", "x11.glx.render.MultiTexCoord3dv.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultiTexCoord3dv_v, { "v", "x11.glx.render.MultiTexCoord3dv.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultiTexCoord3dv_v_item, { "v", "x11.glx.render.MultiTexCoord3dv.v", FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_MultiTexCoord3iv_target, { "target", "x11.glx.render.MultiTexCoord3iv.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_MultiTexCoord3iv_target, { "target", "x11.glx.render.MultiTexCoord3iv.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultiTexCoord3iv_v, { "v", "x11.glx.render.MultiTexCoord3iv.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultiTexCoord3iv_v_item, { "v", "x11.glx.render.MultiTexCoord3iv.v", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_MultiTexCoord3sv_target, { "target", "x11.glx.render.MultiTexCoord3sv.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_MultiTexCoord3sv_target, { "target", "x11.glx.render.MultiTexCoord3sv.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultiTexCoord3sv_v, { "v", "x11.glx.render.MultiTexCoord3sv.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultiTexCoord3sv_v_item, { "v", "x11.glx.render.MultiTexCoord3sv.v", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_MultiTexCoord4dv_target, { "target", "x11.glx.render.MultiTexCoord4dv.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_MultiTexCoord4dv_target, { "target", "x11.glx.render.MultiTexCoord4dv.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultiTexCoord4dv_v, { "v", "x11.glx.render.MultiTexCoord4dv.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultiTexCoord4dv_v_item, { "v", "x11.glx.render.MultiTexCoord4dv.v", FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_MultiTexCoord4iv_target, { "target", "x11.glx.render.MultiTexCoord4iv.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_MultiTexCoord4iv_target, { "target", "x11.glx.render.MultiTexCoord4iv.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultiTexCoord4iv_v, { "v", "x11.glx.render.MultiTexCoord4iv.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultiTexCoord4iv_v_item, { "v", "x11.glx.render.MultiTexCoord4iv.v", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_MultiTexCoord4sv_target, { "target", "x11.glx.render.MultiTexCoord4sv.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_MultiTexCoord4sv_target, { "target", "x11.glx.render.MultiTexCoord4sv.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultiTexCoord4sv_v, { "v", "x11.glx.render.MultiTexCoord4sv.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultiTexCoord4sv_v_item, { "v", "x11.glx.render.MultiTexCoord4sv.v", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_SampleCoverage_value, { "value", "x11.glx.render.SampleCoverage.value", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_SampleCoverage_invert, { "invert", "x11.glx.render.SampleCoverage.invert", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CompressedTexImage3D_target, { "target", "x11.glx.render.CompressedTexImage3D.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CompressedTexImage3D_target, { "target", "x11.glx.render.CompressedTexImage3D.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexImage3D_level, { "level", "x11.glx.render.CompressedTexImage3D.level", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CompressedTexImage3D_internalformat, { "internalformat", "x11.glx.render.CompressedTexImage3D.internalformat", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CompressedTexImage3D_internalformat, { "internalformat", "x11.glx.render.CompressedTexImage3D.internalformat", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexImage3D_width, { "width", "x11.glx.render.CompressedTexImage3D.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexImage3D_height, { "height", "x11.glx.render.CompressedTexImage3D.height", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexImage3D_depth, { "depth", "x11.glx.render.CompressedTexImage3D.depth", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexImage3D_border, { "border", "x11.glx.render.CompressedTexImage3D.border", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexImage3D_imageSize, { "imageSize", "x11.glx.render.CompressedTexImage3D.imageSize", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexImage3D_data, { "data", "x11.glx.render.CompressedTexImage3D.data", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CompressedTexImage2D_target, { "target", "x11.glx.render.CompressedTexImage2D.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CompressedTexImage2D_target, { "target", "x11.glx.render.CompressedTexImage2D.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexImage2D_level, { "level", "x11.glx.render.CompressedTexImage2D.level", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CompressedTexImage2D_internalformat, { "internalformat", "x11.glx.render.CompressedTexImage2D.internalformat", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CompressedTexImage2D_internalformat, { "internalformat", "x11.glx.render.CompressedTexImage2D.internalformat", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexImage2D_width, { "width", "x11.glx.render.CompressedTexImage2D.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexImage2D_height, { "height", "x11.glx.render.CompressedTexImage2D.height", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexImage2D_border, { "border", "x11.glx.render.CompressedTexImage2D.border", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexImage2D_imageSize, { "imageSize", "x11.glx.render.CompressedTexImage2D.imageSize", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexImage2D_data, { "data", "x11.glx.render.CompressedTexImage2D.data", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CompressedTexImage1D_target, { "target", "x11.glx.render.CompressedTexImage1D.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CompressedTexImage1D_target, { "target", "x11.glx.render.CompressedTexImage1D.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexImage1D_level, { "level", "x11.glx.render.CompressedTexImage1D.level", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CompressedTexImage1D_internalformat, { "internalformat", "x11.glx.render.CompressedTexImage1D.internalformat", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CompressedTexImage1D_internalformat, { "internalformat", "x11.glx.render.CompressedTexImage1D.internalformat", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexImage1D_width, { "width", "x11.glx.render.CompressedTexImage1D.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexImage1D_border, { "border", "x11.glx.render.CompressedTexImage1D.border", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexImage1D_imageSize, { "imageSize", "x11.glx.render.CompressedTexImage1D.imageSize", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexImage1D_data, { "data", "x11.glx.render.CompressedTexImage1D.data", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CompressedTexSubImage3D_target, { "target", "x11.glx.render.CompressedTexSubImage3D.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CompressedTexSubImage3D_target, { "target", "x11.glx.render.CompressedTexSubImage3D.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexSubImage3D_level, { "level", "x11.glx.render.CompressedTexSubImage3D.level", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexSubImage3D_xoffset, { "xoffset", "x11.glx.render.CompressedTexSubImage3D.xoffset", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexSubImage3D_yoffset, { "yoffset", "x11.glx.render.CompressedTexSubImage3D.yoffset", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
@@ -1334,39 +1334,39 @@
 { &hf_x11_glx_render_CompressedTexSubImage3D_width, { "width", "x11.glx.render.CompressedTexSubImage3D.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexSubImage3D_height, { "height", "x11.glx.render.CompressedTexSubImage3D.height", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexSubImage3D_depth, { "depth", "x11.glx.render.CompressedTexSubImage3D.depth", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CompressedTexSubImage3D_format, { "format", "x11.glx.render.CompressedTexSubImage3D.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CompressedTexSubImage3D_format, { "format", "x11.glx.render.CompressedTexSubImage3D.format", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexSubImage3D_imageSize, { "imageSize", "x11.glx.render.CompressedTexSubImage3D.imageSize", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexSubImage3D_data, { "data", "x11.glx.render.CompressedTexSubImage3D.data", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CompressedTexSubImage2D_target, { "target", "x11.glx.render.CompressedTexSubImage2D.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CompressedTexSubImage2D_target, { "target", "x11.glx.render.CompressedTexSubImage2D.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexSubImage2D_level, { "level", "x11.glx.render.CompressedTexSubImage2D.level", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexSubImage2D_xoffset, { "xoffset", "x11.glx.render.CompressedTexSubImage2D.xoffset", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexSubImage2D_yoffset, { "yoffset", "x11.glx.render.CompressedTexSubImage2D.yoffset", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexSubImage2D_width, { "width", "x11.glx.render.CompressedTexSubImage2D.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexSubImage2D_height, { "height", "x11.glx.render.CompressedTexSubImage2D.height", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CompressedTexSubImage2D_format, { "format", "x11.glx.render.CompressedTexSubImage2D.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CompressedTexSubImage2D_format, { "format", "x11.glx.render.CompressedTexSubImage2D.format", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexSubImage2D_imageSize, { "imageSize", "x11.glx.render.CompressedTexSubImage2D.imageSize", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexSubImage2D_data, { "data", "x11.glx.render.CompressedTexSubImage2D.data", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CompressedTexSubImage1D_target, { "target", "x11.glx.render.CompressedTexSubImage1D.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CompressedTexSubImage1D_target, { "target", "x11.glx.render.CompressedTexSubImage1D.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexSubImage1D_level, { "level", "x11.glx.render.CompressedTexSubImage1D.level", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexSubImage1D_xoffset, { "xoffset", "x11.glx.render.CompressedTexSubImage1D.xoffset", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexSubImage1D_width, { "width", "x11.glx.render.CompressedTexSubImage1D.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CompressedTexSubImage1D_format, { "format", "x11.glx.render.CompressedTexSubImage1D.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CompressedTexSubImage1D_format, { "format", "x11.glx.render.CompressedTexSubImage1D.format", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexSubImage1D_imageSize, { "imageSize", "x11.glx.render.CompressedTexSubImage1D.imageSize", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CompressedTexSubImage1D_data, { "data", "x11.glx.render.CompressedTexSubImage1D.data", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_BlendFuncSeparate_sfactorRGB, { "sfactorRGB", "x11.glx.render.BlendFuncSeparate.sfactorRGB", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_BlendFuncSeparate_dfactorRGB, { "dfactorRGB", "x11.glx.render.BlendFuncSeparate.dfactorRGB", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_BlendFuncSeparate_sfactorAlpha, { "sfactorAlpha", "x11.glx.render.BlendFuncSeparate.sfactorAlpha", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_BlendFuncSeparate_dfactorAlpha, { "dfactorAlpha", "x11.glx.render.BlendFuncSeparate.dfactorAlpha", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_BlendFuncSeparate_sfactorRGB, { "sfactorRGB", "x11.glx.render.BlendFuncSeparate.sfactorRGB", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_BlendFuncSeparate_dfactorRGB, { "dfactorRGB", "x11.glx.render.BlendFuncSeparate.dfactorRGB", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_BlendFuncSeparate_sfactorAlpha, { "sfactorAlpha", "x11.glx.render.BlendFuncSeparate.sfactorAlpha", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_BlendFuncSeparate_dfactorAlpha, { "dfactorAlpha", "x11.glx.render.BlendFuncSeparate.dfactorAlpha", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_FogCoorddv_coord, { "coord", "x11.glx.render.FogCoorddv.coord", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_FogCoorddv_coord_item, { "coord", "x11.glx.render.FogCoorddv.coord", FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_PointParameterf_pname, { "pname", "x11.glx.render.PointParameterf.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_PointParameterf_pname, { "pname", "x11.glx.render.PointParameterf.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PointParameterf_param, { "param", "x11.glx.render.PointParameterf.param", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_PointParameterfv_pname, { "pname", "x11.glx.render.PointParameterfv.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_PointParameterfv_pname, { "pname", "x11.glx.render.PointParameterfv.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PointParameterfv_params, { "params", "x11.glx.render.PointParameterfv.params", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PointParameterfv_params_item, { "params", "x11.glx.render.PointParameterfv.params", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_PointParameteri_pname, { "pname", "x11.glx.render.PointParameteri.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_PointParameteri_pname, { "pname", "x11.glx.render.PointParameteri.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PointParameteri_param, { "param", "x11.glx.render.PointParameteri.param", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_PointParameteriv_pname, { "pname", "x11.glx.render.PointParameteriv.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_PointParameteriv_pname, { "pname", "x11.glx.render.PointParameteriv.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PointParameteriv_params, { "params", "x11.glx.render.PointParameteriv.params", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PointParameteriv_params_item, { "params", "x11.glx.render.PointParameteriv.params", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_SecondaryColor3bv_v, { "v", "x11.glx.render.SecondaryColor3bv.v", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }},
@@ -1383,14 +1383,14 @@
 { &hf_x11_glx_render_SecondaryColor3usv_v_item, { "v", "x11.glx.render.SecondaryColor3usv.v", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_WindowPos3fv_v, { "v", "x11.glx.render.WindowPos3fv.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_WindowPos3fv_v_item, { "v", "x11.glx.render.WindowPos3fv.v", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_BeginQuery_target, { "target", "x11.glx.render.BeginQuery.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_BeginQuery_target, { "target", "x11.glx.render.BeginQuery.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_BeginQuery_id, { "id", "x11.glx.render.BeginQuery.id", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_EndQuery_target, { "target", "x11.glx.render.EndQuery.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_BlendEquationSeparate_modeRGB, { "modeRGB", "x11.glx.render.BlendEquationSeparate.modeRGB", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_BlendEquationSeparate_modeA, { "modeA", "x11.glx.render.BlendEquationSeparate.modeA", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_EndQuery_target, { "target", "x11.glx.render.EndQuery.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_BlendEquationSeparate_modeRGB, { "modeRGB", "x11.glx.render.BlendEquationSeparate.modeRGB", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_BlendEquationSeparate_modeA, { "modeA", "x11.glx.render.BlendEquationSeparate.modeA", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_DrawBuffers_n, { "n", "x11.glx.render.DrawBuffers.n", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_DrawBuffers_bufs, { "bufs", "x11.glx.render.DrawBuffers.bufs", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_DrawBuffers_bufs_item, { "bufs", "x11.glx.render.DrawBuffers.bufs", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_DrawBuffers_bufs_item, { "bufs", "x11.glx.render.DrawBuffers.bufs", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_VertexAttrib1dv_index, { "index", "x11.glx.render.VertexAttrib1dv.index", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_VertexAttrib1dv_v, { "v", "x11.glx.render.VertexAttrib1dv.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_VertexAttrib1dv_v_item, { "v", "x11.glx.render.VertexAttrib1dv.v", FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -1444,16 +1444,16 @@
 { &hf_x11_glx_render_VertexAttrib4usv_index, { "index", "x11.glx.render.VertexAttrib4usv.index", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_VertexAttrib4usv_v, { "v", "x11.glx.render.VertexAttrib4usv.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_VertexAttrib4usv_v_item, { "v", "x11.glx.render.VertexAttrib4usv.v", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_MultiTexCoord1fvARB_target, { "target", "x11.glx.render.MultiTexCoord1fvARB.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_MultiTexCoord1fvARB_target, { "target", "x11.glx.render.MultiTexCoord1fvARB.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultiTexCoord1fvARB_v, { "v", "x11.glx.render.MultiTexCoord1fvARB.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultiTexCoord1fvARB_v_item, { "v", "x11.glx.render.MultiTexCoord1fvARB.v", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_MultiTexCoord2fvARB_target, { "target", "x11.glx.render.MultiTexCoord2fvARB.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_MultiTexCoord2fvARB_target, { "target", "x11.glx.render.MultiTexCoord2fvARB.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultiTexCoord2fvARB_v, { "v", "x11.glx.render.MultiTexCoord2fvARB.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultiTexCoord2fvARB_v_item, { "v", "x11.glx.render.MultiTexCoord2fvARB.v", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_MultiTexCoord3fvARB_target, { "target", "x11.glx.render.MultiTexCoord3fvARB.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_MultiTexCoord3fvARB_target, { "target", "x11.glx.render.MultiTexCoord3fvARB.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultiTexCoord3fvARB_v, { "v", "x11.glx.render.MultiTexCoord3fvARB.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultiTexCoord3fvARB_v_item, { "v", "x11.glx.render.MultiTexCoord3fvARB.v", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_MultiTexCoord4fvARB_target, { "target", "x11.glx.render.MultiTexCoord4fvARB.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_MultiTexCoord4fvARB_target, { "target", "x11.glx.render.MultiTexCoord4fvARB.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultiTexCoord4fvARB_v, { "v", "x11.glx.render.MultiTexCoord4fvARB.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_MultiTexCoord4fvARB_v_item, { "v", "x11.glx.render.MultiTexCoord4fvARB.v", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CurrentPaletteMatrixARB_index, { "index", "x11.glx.render.CurrentPaletteMatrixARB.index", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
@@ -1477,45 +1477,45 @@
 { &hf_x11_glx_render_VertexAttrib4fvARB_index, { "index", "x11.glx.render.VertexAttrib4fvARB.index", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_VertexAttrib4fvARB_v, { "v", "x11.glx.render.VertexAttrib4fvARB.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_VertexAttrib4fvARB_v_item, { "v", "x11.glx.render.VertexAttrib4fvARB.v", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ProgramStringARB_target, { "target", "x11.glx.render.ProgramStringARB.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ProgramStringARB_format, { "format", "x11.glx.render.ProgramStringARB.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ProgramStringARB_target, { "target", "x11.glx.render.ProgramStringARB.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ProgramStringARB_format, { "format", "x11.glx.render.ProgramStringARB.format", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ProgramStringARB_len, { "len", "x11.glx.render.ProgramStringARB.len", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ProgramStringARB_string, { "string", "x11.glx.render.ProgramStringARB.string", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_BindProgramARB_target, { "target", "x11.glx.render.BindProgramARB.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_BindProgramARB_target, { "target", "x11.glx.render.BindProgramARB.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_BindProgramARB_program, { "program", "x11.glx.render.BindProgramARB.program", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ProgramEnvParameter4dvARB_target, { "target", "x11.glx.render.ProgramEnvParameter4dvARB.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ProgramEnvParameter4dvARB_target, { "target", "x11.glx.render.ProgramEnvParameter4dvARB.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ProgramEnvParameter4dvARB_index, { "index", "x11.glx.render.ProgramEnvParameter4dvARB.index", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ProgramEnvParameter4dvARB_params, { "params", "x11.glx.render.ProgramEnvParameter4dvARB.params", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ProgramEnvParameter4dvARB_params_item, { "params", "x11.glx.render.ProgramEnvParameter4dvARB.params", FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ProgramEnvParameter4fvARB_target, { "target", "x11.glx.render.ProgramEnvParameter4fvARB.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ProgramEnvParameter4fvARB_target, { "target", "x11.glx.render.ProgramEnvParameter4fvARB.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ProgramEnvParameter4fvARB_index, { "index", "x11.glx.render.ProgramEnvParameter4fvARB.index", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ProgramEnvParameter4fvARB_params, { "params", "x11.glx.render.ProgramEnvParameter4fvARB.params", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ProgramEnvParameter4fvARB_params_item, { "params", "x11.glx.render.ProgramEnvParameter4fvARB.params", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ProgramLocalParameter4dvARB_target, { "target", "x11.glx.render.ProgramLocalParameter4dvARB.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ProgramLocalParameter4dvARB_target, { "target", "x11.glx.render.ProgramLocalParameter4dvARB.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ProgramLocalParameter4dvARB_index, { "index", "x11.glx.render.ProgramLocalParameter4dvARB.index", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ProgramLocalParameter4dvARB_params, { "params", "x11.glx.render.ProgramLocalParameter4dvARB.params", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ProgramLocalParameter4dvARB_params_item, { "params", "x11.glx.render.ProgramLocalParameter4dvARB.params", FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ProgramLocalParameter4fvARB_target, { "target", "x11.glx.render.ProgramLocalParameter4fvARB.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ProgramLocalParameter4fvARB_target, { "target", "x11.glx.render.ProgramLocalParameter4fvARB.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ProgramLocalParameter4fvARB_index, { "index", "x11.glx.render.ProgramLocalParameter4fvARB.index", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ProgramLocalParameter4fvARB_params, { "params", "x11.glx.render.ProgramLocalParameter4fvARB.params", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ProgramLocalParameter4fvARB_params_item, { "params", "x11.glx.render.ProgramLocalParameter4fvARB.params", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PolygonOffsetEXT_factor, { "factor", "x11.glx.render.PolygonOffsetEXT.factor", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PolygonOffsetEXT_bias, { "bias", "x11.glx.render.PolygonOffsetEXT.bias", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexFilterFuncSGIS_target, { "target", "x11.glx.render.TexFilterFuncSGIS.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexFilterFuncSGIS_filter, { "filter", "x11.glx.render.TexFilterFuncSGIS.filter", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexFilterFuncSGIS_target, { "target", "x11.glx.render.TexFilterFuncSGIS.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexFilterFuncSGIS_filter, { "filter", "x11.glx.render.TexFilterFuncSGIS.filter", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexFilterFuncSGIS_n, { "n", "x11.glx.render.TexFilterFuncSGIS.n", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexFilterFuncSGIS_weights, { "weights", "x11.glx.render.TexFilterFuncSGIS.weights", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexFilterFuncSGIS_weights_item, { "weights", "x11.glx.render.TexFilterFuncSGIS.weights", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexImage4DSGIS_target, { "target", "x11.glx.render.TexImage4DSGIS.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexImage4DSGIS_target, { "target", "x11.glx.render.TexImage4DSGIS.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage4DSGIS_level, { "level", "x11.glx.render.TexImage4DSGIS.level", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexImage4DSGIS_internalformat, { "internalformat", "x11.glx.render.TexImage4DSGIS.internalformat", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexImage4DSGIS_internalformat, { "internalformat", "x11.glx.render.TexImage4DSGIS.internalformat", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage4DSGIS_width, { "width", "x11.glx.render.TexImage4DSGIS.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage4DSGIS_height, { "height", "x11.glx.render.TexImage4DSGIS.height", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage4DSGIS_depth, { "depth", "x11.glx.render.TexImage4DSGIS.depth", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage4DSGIS_size4d, { "size4d", "x11.glx.render.TexImage4DSGIS.size4d", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage4DSGIS_border, { "border", "x11.glx.render.TexImage4DSGIS.border", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexImage4DSGIS_format, { "format", "x11.glx.render.TexImage4DSGIS.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexImage4DSGIS_type, { "type", "x11.glx.render.TexImage4DSGIS.type", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexImage4DSGIS_format, { "format", "x11.glx.render.TexImage4DSGIS.format", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexImage4DSGIS_type, { "type", "x11.glx.render.TexImage4DSGIS.type", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage4DSGIS_pixels, { "pixels", "x11.glx.render.TexImage4DSGIS.pixels", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage4DSGIS_swapbytes, { "swap bytes", "x11.glx.render.TexImage4DSGIS.swapbytes", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage4DSGIS_lsbfirst, { "lsb first", "x11.glx.render.TexImage4DSGIS.lsbfirst", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -1523,7 +1523,7 @@
 { &hf_x11_glx_render_TexImage4DSGIS_skiprows, { "skip rows", "x11.glx.render.TexImage4DSGIS.skiprows", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage4DSGIS_skippixels, { "skip pixels", "x11.glx.render.TexImage4DSGIS.skippixels", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexImage4DSGIS_alignment, { "alignment", "x11.glx.render.TexImage4DSGIS.alignment", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexSubImage4DSGIS_target, { "target", "x11.glx.render.TexSubImage4DSGIS.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexSubImage4DSGIS_target, { "target", "x11.glx.render.TexSubImage4DSGIS.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage4DSGIS_level, { "level", "x11.glx.render.TexSubImage4DSGIS.level", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage4DSGIS_xoffset, { "xoffset", "x11.glx.render.TexSubImage4DSGIS.xoffset", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage4DSGIS_yoffset, { "yoffset", "x11.glx.render.TexSubImage4DSGIS.yoffset", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
@@ -1533,8 +1533,8 @@
 { &hf_x11_glx_render_TexSubImage4DSGIS_height, { "height", "x11.glx.render.TexSubImage4DSGIS.height", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage4DSGIS_depth, { "depth", "x11.glx.render.TexSubImage4DSGIS.depth", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage4DSGIS_size4d, { "size4d", "x11.glx.render.TexSubImage4DSGIS.size4d", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexSubImage4DSGIS_format, { "format", "x11.glx.render.TexSubImage4DSGIS.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TexSubImage4DSGIS_type, { "type", "x11.glx.render.TexSubImage4DSGIS.type", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexSubImage4DSGIS_format, { "format", "x11.glx.render.TexSubImage4DSGIS.format", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TexSubImage4DSGIS_type, { "type", "x11.glx.render.TexSubImage4DSGIS.type", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage4DSGIS_UNUSED, { "UNUSED", "x11.glx.render.TexSubImage4DSGIS.UNUSED", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage4DSGIS_pixels, { "pixels", "x11.glx.render.TexSubImage4DSGIS.pixels", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage4DSGIS_swapbytes, { "swap bytes", "x11.glx.render.TexSubImage4DSGIS.swapbytes", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -1543,17 +1543,17 @@
 { &hf_x11_glx_render_TexSubImage4DSGIS_skiprows, { "skip rows", "x11.glx.render.TexSubImage4DSGIS.skiprows", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage4DSGIS_skippixels, { "skip pixels", "x11.glx.render.TexSubImage4DSGIS.skippixels", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexSubImage4DSGIS_alignment, { "alignment", "x11.glx.render.TexSubImage4DSGIS.alignment", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_DetailTexFuncSGIS_target, { "target", "x11.glx.render.DetailTexFuncSGIS.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_DetailTexFuncSGIS_target, { "target", "x11.glx.render.DetailTexFuncSGIS.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_DetailTexFuncSGIS_n, { "n", "x11.glx.render.DetailTexFuncSGIS.n", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_DetailTexFuncSGIS_points, { "points", "x11.glx.render.DetailTexFuncSGIS.points", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_DetailTexFuncSGIS_points_item, { "points", "x11.glx.render.DetailTexFuncSGIS.points", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_SharpenTexFuncSGIS_target, { "target", "x11.glx.render.SharpenTexFuncSGIS.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_SharpenTexFuncSGIS_target, { "target", "x11.glx.render.SharpenTexFuncSGIS.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_SharpenTexFuncSGIS_n, { "n", "x11.glx.render.SharpenTexFuncSGIS.n", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_SharpenTexFuncSGIS_points, { "points", "x11.glx.render.SharpenTexFuncSGIS.points", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_SharpenTexFuncSGIS_points_item, { "points", "x11.glx.render.SharpenTexFuncSGIS.points", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_SampleMaskSGIS_value, { "value", "x11.glx.render.SampleMaskSGIS.value", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_SampleMaskSGIS_invert, { "invert", "x11.glx.render.SampleMaskSGIS.invert", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_SamplePatternSGIS_pattern, { "pattern", "x11.glx.render.SamplePatternSGIS.pattern", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_SamplePatternSGIS_pattern, { "pattern", "x11.glx.render.SamplePatternSGIS.pattern", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_FrameZoomSGIX_factor, { "factor", "x11.glx.render.FrameZoomSGIX.factor", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ReferencePlaneSGIX_equation, { "equation", "x11.glx.render.ReferencePlaneSGIX.equation", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ReferencePlaneSGIX_equation_item, { "equation", "x11.glx.render.ReferencePlaneSGIX.equation", FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -1564,57 +1564,57 @@
 { &hf_x11_glx_render_SecondaryColor3fvEXT_v_item, { "v", "x11.glx.render.SecondaryColor3fvEXT.v", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_FogCoordfvEXT_coord, { "coord", "x11.glx.render.FogCoordfvEXT.coord", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_FogCoordfvEXT_coord_item, { "coord", "x11.glx.render.FogCoordfvEXT.coord", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_PixelTexGenSGIX_mode, { "mode", "x11.glx.render.PixelTexGenSGIX.mode", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_PixelTexGenSGIX_mode, { "mode", "x11.glx.render.PixelTexGenSGIX.mode", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_VertexWeightfvEXT_weight, { "weight", "x11.glx.render.VertexWeightfvEXT.weight", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_VertexWeightfvEXT_weight_item, { "weight", "x11.glx.render.VertexWeightfvEXT.weight", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CombinerParameterfvNV_pname, { "pname", "x11.glx.render.CombinerParameterfvNV.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CombinerParameterfvNV_pname, { "pname", "x11.glx.render.CombinerParameterfvNV.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CombinerParameterfvNV_params, { "params", "x11.glx.render.CombinerParameterfvNV.params", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CombinerParameterfvNV_params_item, { "params", "x11.glx.render.CombinerParameterfvNV.params", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CombinerParameterfNV_pname, { "pname", "x11.glx.render.CombinerParameterfNV.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CombinerParameterfNV_pname, { "pname", "x11.glx.render.CombinerParameterfNV.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CombinerParameterfNV_param, { "param", "x11.glx.render.CombinerParameterfNV.param", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CombinerParameterivNV_pname, { "pname", "x11.glx.render.CombinerParameterivNV.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CombinerParameterivNV_pname, { "pname", "x11.glx.render.CombinerParameterivNV.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CombinerParameterivNV_params, { "params", "x11.glx.render.CombinerParameterivNV.params", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CombinerParameterivNV_params_item, { "params", "x11.glx.render.CombinerParameterivNV.params", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CombinerParameteriNV_pname, { "pname", "x11.glx.render.CombinerParameteriNV.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CombinerParameteriNV_pname, { "pname", "x11.glx.render.CombinerParameteriNV.pname", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CombinerParameteriNV_param, { "param", "x11.glx.render.CombinerParameteriNV.param", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CombinerInputNV_stage, { "stage", "x11.glx.render.CombinerInputNV.stage", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CombinerInputNV_portion, { "portion", "x11.glx.render.CombinerInputNV.portion", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CombinerInputNV_variable, { "variable", "x11.glx.render.CombinerInputNV.variable", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CombinerInputNV_input, { "input", "x11.glx.render.CombinerInputNV.input", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CombinerInputNV_mapping, { "mapping", "x11.glx.render.CombinerInputNV.mapping", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CombinerInputNV_componentUsage, { "componentUsage", "x11.glx.render.CombinerInputNV.componentUsage", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CombinerOutputNV_stage, { "stage", "x11.glx.render.CombinerOutputNV.stage", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CombinerOutputNV_portion, { "portion", "x11.glx.render.CombinerOutputNV.portion", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CombinerOutputNV_abOutput, { "abOutput", "x11.glx.render.CombinerOutputNV.abOutput", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CombinerOutputNV_cdOutput, { "cdOutput", "x11.glx.render.CombinerOutputNV.cdOutput", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CombinerOutputNV_sumOutput, { "sumOutput", "x11.glx.render.CombinerOutputNV.sumOutput", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CombinerOutputNV_scale, { "scale", "x11.glx.render.CombinerOutputNV.scale", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_CombinerOutputNV_bias, { "bias", "x11.glx.render.CombinerOutputNV.bias", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CombinerInputNV_stage, { "stage", "x11.glx.render.CombinerInputNV.stage", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CombinerInputNV_portion, { "portion", "x11.glx.render.CombinerInputNV.portion", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CombinerInputNV_variable, { "variable", "x11.glx.render.CombinerInputNV.variable", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CombinerInputNV_input, { "input", "x11.glx.render.CombinerInputNV.input", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CombinerInputNV_mapping, { "mapping", "x11.glx.render.CombinerInputNV.mapping", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CombinerInputNV_componentUsage, { "componentUsage", "x11.glx.render.CombinerInputNV.componentUsage", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CombinerOutputNV_stage, { "stage", "x11.glx.render.CombinerOutputNV.stage", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CombinerOutputNV_portion, { "portion", "x11.glx.render.CombinerOutputNV.portion", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CombinerOutputNV_abOutput, { "abOutput", "x11.glx.render.CombinerOutputNV.abOutput", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CombinerOutputNV_cdOutput, { "cdOutput", "x11.glx.render.CombinerOutputNV.cdOutput", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CombinerOutputNV_sumOutput, { "sumOutput", "x11.glx.render.CombinerOutputNV.sumOutput", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CombinerOutputNV_scale, { "scale", "x11.glx.render.CombinerOutputNV.scale", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_CombinerOutputNV_bias, { "bias", "x11.glx.render.CombinerOutputNV.bias", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CombinerOutputNV_abDotProduct, { "abDotProduct", "x11.glx.render.CombinerOutputNV.abDotProduct", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CombinerOutputNV_cdDotProduct, { "cdDotProduct", "x11.glx.render.CombinerOutputNV.cdDotProduct", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_CombinerOutputNV_muxSum, { "muxSum", "x11.glx.render.CombinerOutputNV.muxSum", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_FinalCombinerInputNV_variable, { "variable", "x11.glx.render.FinalCombinerInputNV.variable", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_FinalCombinerInputNV_input, { "input", "x11.glx.render.FinalCombinerInputNV.input", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_FinalCombinerInputNV_mapping, { "mapping", "x11.glx.render.FinalCombinerInputNV.mapping", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_FinalCombinerInputNV_componentUsage, { "componentUsage", "x11.glx.render.FinalCombinerInputNV.componentUsage", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_FinalCombinerInputNV_variable, { "variable", "x11.glx.render.FinalCombinerInputNV.variable", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_FinalCombinerInputNV_input, { "input", "x11.glx.render.FinalCombinerInputNV.input", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_FinalCombinerInputNV_mapping, { "mapping", "x11.glx.render.FinalCombinerInputNV.mapping", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_FinalCombinerInputNV_componentUsage, { "componentUsage", "x11.glx.render.FinalCombinerInputNV.componentUsage", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TextureColorMaskSGIS_red, { "red", "x11.glx.render.TextureColorMaskSGIS.red", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TextureColorMaskSGIS_green, { "green", "x11.glx.render.TextureColorMaskSGIS.green", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TextureColorMaskSGIS_blue, { "blue", "x11.glx.render.TextureColorMaskSGIS.blue", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TextureColorMaskSGIS_alpha, { "alpha", "x11.glx.render.TextureColorMaskSGIS.alpha", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ExecuteProgramNV_target, { "target", "x11.glx.render.ExecuteProgramNV.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ExecuteProgramNV_target, { "target", "x11.glx.render.ExecuteProgramNV.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ExecuteProgramNV_id, { "id", "x11.glx.render.ExecuteProgramNV.id", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ExecuteProgramNV_params, { "params", "x11.glx.render.ExecuteProgramNV.params", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ExecuteProgramNV_params_item, { "params", "x11.glx.render.ExecuteProgramNV.params", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_LoadProgramNV_target, { "target", "x11.glx.render.LoadProgramNV.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_LoadProgramNV_target, { "target", "x11.glx.render.LoadProgramNV.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_LoadProgramNV_id, { "id", "x11.glx.render.LoadProgramNV.id", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_LoadProgramNV_len, { "len", "x11.glx.render.LoadProgramNV.len", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_LoadProgramNV_program, { "program", "x11.glx.render.LoadProgramNV.program", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ProgramParameters4dvNV_target, { "target", "x11.glx.render.ProgramParameters4dvNV.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ProgramParameters4dvNV_target, { "target", "x11.glx.render.ProgramParameters4dvNV.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ProgramParameters4dvNV_index, { "index", "x11.glx.render.ProgramParameters4dvNV.index", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ProgramParameters4dvNV_num, { "num", "x11.glx.render.ProgramParameters4dvNV.num", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ProgramParameters4dvNV_params, { "params", "x11.glx.render.ProgramParameters4dvNV.params", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ProgramParameters4dvNV_params_item, { "params", "x11.glx.render.ProgramParameters4dvNV.params", FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ProgramParameters4fvNV_target, { "target", "x11.glx.render.ProgramParameters4fvNV.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ProgramParameters4fvNV_target, { "target", "x11.glx.render.ProgramParameters4fvNV.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ProgramParameters4fvNV_index, { "index", "x11.glx.render.ProgramParameters4fvNV.index", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ProgramParameters4fvNV_num, { "num", "x11.glx.render.ProgramParameters4fvNV.num", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ProgramParameters4fvNV_params, { "params", "x11.glx.render.ProgramParameters4fvNV.params", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -1622,10 +1622,10 @@
 { &hf_x11_glx_render_RequestResidentProgramsNV_n, { "n", "x11.glx.render.RequestResidentProgramsNV.n", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_RequestResidentProgramsNV_ids, { "ids", "x11.glx.render.RequestResidentProgramsNV.ids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_RequestResidentProgramsNV_ids_item, { "ids", "x11.glx.render.RequestResidentProgramsNV.ids", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TrackMatrixNV_target, { "target", "x11.glx.render.TrackMatrixNV.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TrackMatrixNV_target, { "target", "x11.glx.render.TrackMatrixNV.target", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TrackMatrixNV_address, { "address", "x11.glx.render.TrackMatrixNV.address", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TrackMatrixNV_matrix, { "matrix", "x11.glx.render.TrackMatrixNV.matrix", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_TrackMatrixNV_transform, { "transform", "x11.glx.render.TrackMatrixNV.transform", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TrackMatrixNV_matrix, { "matrix", "x11.glx.render.TrackMatrixNV.matrix", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
+{ &hf_x11_glx_render_TrackMatrixNV_transform, { "transform", "x11.glx.render.TrackMatrixNV.transform", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_VertexAttrib1svNV_index, { "index", "x11.glx.render.VertexAttrib1svNV.index", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_VertexAttrib1svNV_v, { "v", "x11.glx.render.VertexAttrib1svNV.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_VertexAttrib1svNV_v_item, { "v", "x11.glx.render.VertexAttrib1svNV.v", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }},
@@ -1715,7 +1715,7 @@
 { &hf_x11_glx_render_VertexAttribs4ubvNV_index, { "index", "x11.glx.render.VertexAttribs4ubvNV.index", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_VertexAttribs4ubvNV_n, { "n", "x11.glx.render.VertexAttribs4ubvNV.n", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_VertexAttribs4ubvNV_v, { "v", "x11.glx.render.VertexAttribs4ubvNV.v", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_ActiveStencilFaceEXT_face, { "face", "x11.glx.render.ActiveStencilFaceEXT.face", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
+{ &hf_x11_glx_render_ActiveStencilFaceEXT_face, { "face", "x11.glx.render.ActiveStencilFaceEXT.face", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &mesa_enum_ext, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ProgramNamedParameter4fvNV_id, { "id", "x11.glx.render.ProgramNamedParameter4fvNV.id", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ProgramNamedParameter4fvNV_len, { "len", "x11.glx.render.ProgramNamedParameter4fvNV.len", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_ProgramNamedParameter4fvNV_name, { "name", "x11.glx.render.ProgramNamedParameter4fvNV.name", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},