X11: Revert mesa_enum_ext back to mesa_enum

Values aren't numerically sorted in the XML, so they aren't put
in the value_string in numerical order.  That's a problem for
value_string_ext.

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

3 files changed, 258 insertions, 260 deletions

diff --git a/epan/dissectors/x11-glx-render-enum.h b/epan/dissectors/x11-glx-render-enum.h
index 519740e565..98dc469e8a 100644
--- a/epan/dissectors/x11-glx-render-enum.h
+++ b/epan/dissectors/x11-glx-render-enum.h
@@ -1620,4 +1620,3 @@ static const value_string mesa_enum[] = {
 /* 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 ddee0891f5..ad7ce35bcd 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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|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_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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|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_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_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|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_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_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|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_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_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|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_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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|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_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_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|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_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_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|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_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_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|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_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_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|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_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_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|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_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_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|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_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_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|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_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_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|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_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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|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_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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|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_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_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|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_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_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|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_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_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|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_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_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|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_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_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|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_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_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|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_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_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|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_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_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|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_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_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|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_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_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|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_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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|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_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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|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_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_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|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_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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|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_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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|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_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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|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_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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|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_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_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|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_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_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|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_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_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|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_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_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|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_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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|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_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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|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_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_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|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_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_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|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_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_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|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_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_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|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_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_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|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_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_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|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_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_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|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_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_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|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_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_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|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_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_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|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_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_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|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_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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|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_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_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|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_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_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|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_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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|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_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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|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_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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|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_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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|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_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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|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_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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|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_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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|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_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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|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_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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|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_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_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|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_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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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|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_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_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|BASE_EXT_STRING, &mesa_enum_ext, 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_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 }},
diff --git a/tools/process-x11-xcb.pl b/tools/process-x11-xcb.pl
index 80e8fa22c8..6b322022e1 100755
--- a/tools/process-x11-xcb.pl
+++ b/tools/process-x11-xcb.pl
@@ -226,9 +226,9 @@ sub mesa_type {
 
     if($name eq 'enum') {
         # enum does not have a direct X equivalent
-        $gltype{'GLenum'} = { size => 4, encoding => 'byte_order', type => 'FT_UINT32', base => 'BASE_HEX|BASE_EXT_STRING',
+        $gltype{'GLenum'} = { size => 4, encoding => 'byte_order', type => 'FT_UINT32', base => 'BASE_HEX',
                               get => 'VALUE32', list => 'listOfCard32',
-                              val => '&mesa_enum_ext', };
+                              val => 'VALS(mesa_enum)', };
         return;
     }
 
@@ -1837,7 +1837,6 @@ if (-e "$mesadir/gl_API.xml") {
 
     print $enum "    { 0, NULL }\n";
     print $enum "};\n";
-    print $enum "static value_string_ext mesa_enum_ext = VALUE_STRING_EXT_INIT(mesa_enum);\n";
     $enum->close();
 
     print $decl "static int hf_x11_glx_render_op_name = -1;\n\n";