Some patches from Peter Harris to make it possible to build the X11 dissector

again (and some various other improvements):

Rebuild the dissector with the latest xcbproto and mesa.


Subject: [PATCH 01/11] X11 dissector: Support CARD64 and INT64 types
These types are used by the new Present extension.

Subject: [PATCH 02/11] X11 dissector: Un-blacklist a few structures
The xinput structs are used by the latest xcb/proto, and the xkb
struct has been removed.

Subject: [PATCH 03/11] X11 dissector: Add hack for xinput:ChangeProperty
xinput:ChangeProperty should use switch/case, but only switch/bitcase
is supported at the moment. Add (hopefully temporary) hack.

Subject: [PATCH 04/11] X11 dissector: Use namespace for types
In particular, the name of the xsync struct 'INT64' collides with a
basic type of the same name.

Subject: [PATCH 05/11] X11 dissector: Add support for "Generic" events
All new extensions are using the new "Generic" events instead of
traditional events, because there aren't enough traditional event
numbers.

Denoted by <event xge="true"> in xcb/proto.

Subject: [PATCH 06/11] X11 dissector: Blacklist unused structures

Subject: [PATCH 07/11] X11 dissector: Support multiple enumref in a bitcase
XKB is weird.

Subject: [PATCH 08/11] X11 dissector: Support sumof

Subject: [PATCH 09/11] X11 dissector: Stop generating unused-but-set variables
(This patch also reverts r53298/r53299.)

svn path=/trunk/; revision=53531

1 files changed, 41 insertions, 5 deletions

diff --git a/epan/dissectors/x11-glx-render-enum.h b/epan/dissectors/x11-glx-render-enum.h
index c7e4c9da8f..b5990d1556 100644
--- a/epan/dissectors/x11-glx-render-enum.h
+++ b/epan/dissectors/x11-glx-render-enum.h
@@ -1,6 +1,6 @@
 /* Do not modify this file. */
 /* It was automatically generated by ../../tools/process-x11-xcb.pl
-   using mesa version snb-magic-14719-g2fa9e4c */
+   using mesa version snb-magic-19333-gbd00c66 */
 /* $Id$ */
 
 /*
@@ -1308,6 +1308,46 @@ static const value_string mesa_enum[] = {
 /* OpenGL extension GL_ARB_transform_feedback_instanced */
 /* OpenGL extension GL_ARB_map_buffer_alignment */
   { 0x90BC, "MIN_MAP_BUFFER_ALIGNMENT" },
+/* OpenGL extension GL_KHR_debug */
+  { 0x92E0, "DEBUG_OUTPUT" },
+  { 0x8242, "DEBUG_OUTPUT_SYNCHRONOUS" },
+  { 0x9143, "MAX_DEBUG_MESSAGE_LENGTH" },
+  { 0x9144, "MAX_DEBUG_LOGGED_MESSAGES" },
+  { 0x9145, "DEBUG_LOGGED_MESSAGES" },
+  { 0x8243, "DEBUG_NEXT_LOGGED_MESSAGE_LENGTH" },
+  { 0x826C, "MAX_DEBUG_GROUP_STACK_DEPTH" },
+  { 0x826D, "DEBUG_GROUP_STACK_DEPTH" },
+  { 0x82E8, "MAX_LABEL_LENGTH" },
+  { 0x8244, "DEBUG_CALLBACK_FUNCTION" },
+  { 0x8245, "DEBUG_CALLBACK_USER_PARAM" },
+  { 0x8246, "DEBUG_SOURCE_API" },
+  { 0x8247, "DEBUG_SOURCE_WINDOW_SYSTEM" },
+  { 0x8248, "DEBUG_SOURCE_SHADER_COMPILER" },
+  { 0x8249, "DEBUG_SOURCE_THIRD_PARTY" },
+  { 0x824A, "DEBUG_SOURCE_APPLICATION" },
+  { 0x824B, "DEBUG_SOURCE_OTHER" },
+  { 0x824C, "DEBUG_TYPE_ERROR" },
+  { 0x824D, "DEBUG_TYPE_DEPRECATED_BEHAVIOR" },
+  { 0x824E, "DEBUG_TYPE_UNDEFINED_BEHAVIOR" },
+  { 0x824F, "DEBUG_TYPE_PORTABILITY" },
+  { 0x8250, "DEBUG_TYPE_PERFORMANCE" },
+  { 0x8251, "DEBUG_TYPE_OTHER" },
+  { 0x8268, "DEBUG_TYPE_MARKER" },
+  { 0x8269, "DEBUG_TYPE_PUSH_GROUP" },
+  { 0x826A, "DEBUG_TYPE_POP_GROUP" },
+  { 0x9146, "DEBUG_SEVERITY_HIGH" },
+  { 0x9147, "DEBUG_SEVERITY_MEDIUM" },
+  { 0x9148, "DEBUG_SEVERITY_LOW" },
+  { 0x826B, "DEBUG_SEVERITY_NOTIFICATION" },
+  { 0x0504, "STACK_UNDERFLOW" },
+  { 0x0503, "STACK_OVERFLOW" },
+  { 0x82E0, "BUFFER" },
+  { 0x82E1, "SHADER" },
+  { 0x82E2, "PROGRAM" },
+  { 0x82E3, "QUERY" },
+  { 0x82E4, "PROGRAM_PIPELINE" },
+  { 0x82E6, "SAMPLER" },
+  { 0x82E7, "DISPLAY_LIST" },
 /* OpenGL extension GL_EXT_blend_color */
   { 0x8001, "CONSTANT_COLOR_EXT" },
   { 0x8002, "ONE_MINUS_CONSTANT_COLOR_EXT" },
@@ -1978,10 +2018,6 @@ static const value_string mesa_enum[] = {
   { 0x8F9C, "SIGNED_NORMALIZED" },
   { 0x8F93, "RGBA_SNORM" },
   { 0x8F97, "RGBA8_SNORM" },
-/* OpenGL extension GL_MESA_shader_debug */
-  { 0x8759, "DEBUG_OBJECT_MESA" },
-  { 0x875A, "DEBUG_PRINT_MESA" },
-  { 0x875B, "DEBUG_ASSERT_MESA" },
 /* OpenGL extension GL_SGIS_point_parameters */
   { 0x8126, "POINT_SIZE_MIN_SGIS" },
   { 0x8127, "POINT_SIZE_MAX_SGIS" },