diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-12-13 04:40:55 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-04-16 16:19:32 +0000 |
| commit | f9b8e64e15226c1cf27cc1edc91c057c76e38090 (patch) | |
| tree | e6130099ecc46adefe2108dfc988604c3a4e3acf /tools | |
| parent | ef9150acee2131ee31e851ff7fff42c369a16893 (diff) | |
| download | wireshark-f9b8e64e15226c1cf27cc1edc91c057c76e38090.tar.gz | |
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>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/process-x11-xcb.pl | 5 |
1 files changed, 2 insertions, 3 deletions
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"; |