osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Mann 2016-12-13 04:40:55 -05:00
parent ef9150acee
commit f9b8e64e15
3 changed files with 258 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
epan/dissectors/x11-glx-render-enum.h
View File

@ -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);

512
epan/dissectors/x11-register-info.h
View File

File diff suppressed because it is too large Load Diff

5
tools/process-x11-xcb.pl
View File

@ -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";