From b63fe7d6e2ada405c845346a8c94ae2d6a820d14 Mon Sep 17 00:00:00 2001 From: Jeff Morriss Date: Mon, 24 Sep 2018 10:34:18 -0400 Subject: Update the X11 dissector to use the latest mesa and xcbproto. Change-Id: I6a72ec73c31c851723ba93e85cab3173d72c6a6b Reviewed-on: https://code.wireshark.org/review/29806 Petri-Dish: Jeff Morriss Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- epan/dissectors/packet-x11.c | 2 +- epan/dissectors/x11-declarations.h | 76 +++++- epan/dissectors/x11-enum.h | 4 +- epan/dissectors/x11-extension-errors.h | 2 +- epan/dissectors/x11-extension-implementation.h | 307 ++++++++++++++++++++----- epan/dissectors/x11-glx-render-enum.h | 27 ++- epan/dissectors/x11-register-info.h | 78 ++++++- 7 files changed, 416 insertions(+), 80 deletions(-) diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c index e75d1c5f3f..c5731ce019 100644 --- a/epan/dissectors/packet-x11.c +++ b/epan/dissectors/packet-x11.c @@ -1456,7 +1456,6 @@ static void listOfInt32(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf, } } -#if 0 /* Not yet used by any extension */ static void listOfCard64(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf, int hf_item, int length, guint byte_order) { @@ -1468,6 +1467,7 @@ static void listOfCard64(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf, } } +#if 0 /* Not yet used by any extension */ static void listOfInt64(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf, int hf_item, int length, guint byte_order) { diff --git a/epan/dissectors/x11-declarations.h b/epan/dissectors/x11-declarations.h index 563796c8e7..3cb726606b 100644 --- a/epan/dissectors/x11-declarations.h +++ b/epan/dissectors/x11-declarations.h @@ -1487,8 +1487,6 @@ static int hf_x11_glx_render_ProgramLocalParameter4fvARB_target = -1; static int hf_x11_glx_render_ProgramLocalParameter4fvARB_index = -1; static int hf_x11_glx_render_ProgramLocalParameter4fvARB_params = -1; static int hf_x11_glx_render_ProgramLocalParameter4fvARB_params_item = -1; -static int hf_x11_glx_render_PolygonOffsetEXT_factor = -1; -static int hf_x11_glx_render_PolygonOffsetEXT_bias = -1; static int hf_x11_glx_render_TexFilterFuncSGIS_target = -1; static int hf_x11_glx_render_TexFilterFuncSGIS_filter = -1; static int hf_x11_glx_render_TexFilterFuncSGIS_n = -1; @@ -1985,6 +1983,44 @@ static int hf_x11_dri3_FenceFromFD_initially_triggered = -1; static int hf_x11_dri3_FDFromFence_drawable = -1; static int hf_x11_dri3_FDFromFence_fence = -1; static int hf_x11_dri3_FDFromFence_reply_nfd = -1; +static int hf_x11_dri3_GetSupportedModifiers_window = -1; +static int hf_x11_dri3_GetSupportedModifiers_depth = -1; +static int hf_x11_dri3_GetSupportedModifiers_bpp = -1; +static int hf_x11_dri3_GetSupportedModifiers_reply_num_window_modifiers = -1; +static int hf_x11_dri3_GetSupportedModifiers_reply_num_screen_modifiers = -1; +static int hf_x11_dri3_GetSupportedModifiers_reply_window_modifiers = -1; +static int hf_x11_dri3_GetSupportedModifiers_reply_window_modifiers_item = -1; +static int hf_x11_dri3_GetSupportedModifiers_reply_screen_modifiers = -1; +static int hf_x11_dri3_GetSupportedModifiers_reply_screen_modifiers_item = -1; +static int hf_x11_dri3_PixmapFromBuffers_pixmap = -1; +static int hf_x11_dri3_PixmapFromBuffers_window = -1; +static int hf_x11_dri3_PixmapFromBuffers_num_buffers = -1; +static int hf_x11_dri3_PixmapFromBuffers_width = -1; +static int hf_x11_dri3_PixmapFromBuffers_height = -1; +static int hf_x11_dri3_PixmapFromBuffers_stride0 = -1; +static int hf_x11_dri3_PixmapFromBuffers_offset0 = -1; +static int hf_x11_dri3_PixmapFromBuffers_stride1 = -1; +static int hf_x11_dri3_PixmapFromBuffers_offset1 = -1; +static int hf_x11_dri3_PixmapFromBuffers_stride2 = -1; +static int hf_x11_dri3_PixmapFromBuffers_offset2 = -1; +static int hf_x11_dri3_PixmapFromBuffers_stride3 = -1; +static int hf_x11_dri3_PixmapFromBuffers_offset3 = -1; +static int hf_x11_dri3_PixmapFromBuffers_depth = -1; +static int hf_x11_dri3_PixmapFromBuffers_bpp = -1; +static int hf_x11_dri3_PixmapFromBuffers_modifier = -1; +static int hf_x11_dri3_PixmapFromBuffers_buffers = -1; +static int hf_x11_dri3_BuffersFromPixmap_pixmap = -1; +static int hf_x11_dri3_BuffersFromPixmap_reply_nfd = -1; +static int hf_x11_dri3_BuffersFromPixmap_reply_width = -1; +static int hf_x11_dri3_BuffersFromPixmap_reply_height = -1; +static int hf_x11_dri3_BuffersFromPixmap_reply_modifier = -1; +static int hf_x11_dri3_BuffersFromPixmap_reply_depth = -1; +static int hf_x11_dri3_BuffersFromPixmap_reply_bpp = -1; +static int hf_x11_dri3_BuffersFromPixmap_reply_strides = -1; +static int hf_x11_dri3_BuffersFromPixmap_reply_strides_item = -1; +static int hf_x11_dri3_BuffersFromPixmap_reply_offsets = -1; +static int hf_x11_dri3_BuffersFromPixmap_reply_offsets_item = -1; +static int hf_x11_dri3_BuffersFromPixmap_reply_buffers = -1; static int hf_x11_dri3_extension_minor = -1; static int hf_x11_ge_QueryVersion_client_major_version = -1; @@ -2617,6 +2653,11 @@ static int hf_x11_struct_randr_MonitorInfo_width_in_millimeters = -1; static int hf_x11_struct_randr_MonitorInfo_height_in_millimeters = -1; static int hf_x11_struct_randr_MonitorInfo_outputs = -1; static int hf_x11_struct_randr_MonitorInfo_outputs_item = -1; +static int hf_x11_struct_randr_LeaseNotify = -1; +static int hf_x11_struct_randr_LeaseNotify_timestamp = -1; +static int hf_x11_struct_randr_LeaseNotify_window = -1; +static int hf_x11_struct_randr_LeaseNotify_lease = -1; +static int hf_x11_struct_randr_LeaseNotify_created = -1; static int hf_x11_struct_sync_INT64 = -1; static int hf_x11_struct_sync_INT64_hi = -1; static int hf_x11_struct_sync_INT64_lo = -1; @@ -2734,6 +2775,7 @@ static int hf_x11_randr_SelectInput_enable_mask_OutputProperty = -1; static int hf_x11_randr_SelectInput_enable_mask_ProviderChange = -1; static int hf_x11_randr_SelectInput_enable_mask_ProviderProperty = -1; static int hf_x11_randr_SelectInput_enable_mask_ResourceChange = -1; +static int hf_x11_randr_SelectInput_enable_mask_Lease = -1; static int hf_x11_randr_SelectInput_enable = -1; static int hf_x11_randr_GetScreenInfo_window = -1; static int hf_x11_randr_GetScreenInfo_reply_rotations_mask_Rotate_0 = -1; @@ -3056,15 +3098,6 @@ static int hf_x11_randr_GetProviderProperty_reply_type = -1; static int hf_x11_randr_GetProviderProperty_reply_bytes_after = -1; static int hf_x11_randr_GetProviderProperty_reply_num_items = -1; static int hf_x11_randr_GetProviderProperty_reply_data = -1; -static int hf_x11_union_randr_NotifyData = -1; -static int hf_x11_union_randr_NotifyData_cc = -1; -static int hf_x11_union_randr_NotifyData_oc = -1; -static int hf_x11_union_randr_NotifyData_op = -1; -static int hf_x11_union_randr_NotifyData_pc = -1; -static int hf_x11_union_randr_NotifyData_pp = -1; -static int hf_x11_union_randr_NotifyData_rc = -1; -static int hf_x11_randr_Notify_subCode = -1; -static int hf_x11_randr_Notify_u = -1; static int hf_x11_randr_GetMonitors_window = -1; static int hf_x11_randr_GetMonitors_get_active = -1; static int hf_x11_randr_GetMonitors_reply_timestamp = -1; @@ -3075,6 +3108,27 @@ static int hf_x11_randr_SetMonitor_window = -1; static int hf_x11_randr_SetMonitor_monitorinfo = -1; static int hf_x11_randr_DeleteMonitor_window = -1; static int hf_x11_randr_DeleteMonitor_name = -1; +static int hf_x11_randr_CreateLease_window = -1; +static int hf_x11_randr_CreateLease_lid = -1; +static int hf_x11_randr_CreateLease_num_crtcs = -1; +static int hf_x11_randr_CreateLease_num_outputs = -1; +static int hf_x11_randr_CreateLease_crtcs = -1; +static int hf_x11_randr_CreateLease_crtcs_item = -1; +static int hf_x11_randr_CreateLease_outputs = -1; +static int hf_x11_randr_CreateLease_outputs_item = -1; +static int hf_x11_randr_CreateLease_reply_nfd = -1; +static int hf_x11_randr_FreeLease_lid = -1; +static int hf_x11_randr_FreeLease_terminate = -1; +static int hf_x11_union_randr_NotifyData = -1; +static int hf_x11_union_randr_NotifyData_cc = -1; +static int hf_x11_union_randr_NotifyData_oc = -1; +static int hf_x11_union_randr_NotifyData_op = -1; +static int hf_x11_union_randr_NotifyData_pc = -1; +static int hf_x11_union_randr_NotifyData_pp = -1; +static int hf_x11_union_randr_NotifyData_rc = -1; +static int hf_x11_union_randr_NotifyData_lc = -1; +static int hf_x11_randr_Notify_subCode = -1; +static int hf_x11_randr_Notify_u = -1; static int hf_x11_randr_extension_minor = -1; static int hf_x11_struct_record_Range8 = -1; diff --git a/epan/dissectors/x11-enum.h b/epan/dissectors/x11-enum.h index f7ec730ce9..4e7e4f4fb3 100644 --- a/epan/dissectors/x11-enum.h +++ b/epan/dissectors/x11-enum.h @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It was automatically generated by ../../tools/process-x11-xcb.pl - using xcbproto version 1.12-9-g97fbba2 */ + using xcbproto version xcb-proto-1.13-1-g55c7baa */ /* * Copyright 2008, 2009, 2013, 2014 Open Text Corporation * @@ -112,6 +112,7 @@ static const value_string x11_enum_present_CompleteMode[] = { { 0, "Copy" }, { 1, "Flip" }, { 2, "Skip" }, + { 3, "SuboptimalCopy" }, { 0, NULL }, }; @@ -215,6 +216,7 @@ static const value_string x11_enum_randr_Notify[] = { { 3, "ProviderChange" }, { 4, "ProviderProperty" }, { 5, "ResourceChange" }, + { 6, "Lease" }, { 0, NULL }, }; diff --git a/epan/dissectors/x11-extension-errors.h b/epan/dissectors/x11-extension-errors.h index bb5474532e..46e98c293b 100644 --- a/epan/dissectors/x11-extension-errors.h +++ b/epan/dissectors/x11-extension-errors.h @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It was automatically generated by ../../tools/process-x11-xcb.pl - using xcbproto version 1.12-9-g97fbba2 */ + using xcbproto version xcb-proto-1.13-1-g55c7baa */ /* * Copyright 2008, 2009, 2013, 2014 Open Text Corporation * diff --git a/epan/dissectors/x11-extension-implementation.h b/epan/dissectors/x11-extension-implementation.h index f773024b7b..bff9a4e77e 100644 --- a/epan/dissectors/x11-extension-implementation.h +++ b/epan/dissectors/x11-extension-implementation.h @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It was automatically generated by ../../tools/process-x11-xcb.pl - using xcbproto version 1.12-9-g97fbba2 */ + using xcbproto version xcb-proto-1.13-1-g55c7baa */ /* * Copyright 2008, 2009, 2013, 2014 Open Text Corporation * @@ -2767,14 +2767,6 @@ static void mesa_ProgramLocalParameter4fvARB(tvbuff_t *tvb, int *offsetp, proto_ listOfFloat(tvb, offsetp, t, hf_x11_glx_render_ProgramLocalParameter4fvARB_params, hf_x11_glx_render_ProgramLocalParameter4fvARB_params_item, 4, byte_order); } -static void mesa_PolygonOffsetEXT(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order, int length _U_) -{ - proto_tree_add_item(t, hf_x11_glx_render_PolygonOffsetEXT_factor, tvb, *offsetp, 4, byte_order); - *offsetp += 4; - proto_tree_add_item(t, hf_x11_glx_render_PolygonOffsetEXT_bias, tvb, *offsetp, 4, byte_order); - *offsetp += 4; -} - static void mesa_TexFilterFuncSGIS(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order, int length _U_) { int n; @@ -3633,7 +3625,6 @@ static const value_string glx_render_op_name[] = { { 2082, "glTextureColorMaskSGIS" }, { 4096, "glBlendColor" }, { 4097, "glBlendEquation" }, - { 4098, "glPolygonOffsetEXT" }, { 4099, "glTexSubImage1D" }, { 4100, "glTexSubImage2D" }, { 4101, "glConvolutionFilter1D" }, @@ -4516,9 +4507,6 @@ static void dispatch_glx_render(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, case 4097: mesa_BlendEquation(tvb, offsetp, tt, byte_order, len); break; - case 4098: - mesa_PolygonOffsetEXT(tvb, offsetp, tt, byte_order, len); - break; case 4099: mesa_TexSubImage1D(tvb, offsetp, tt, byte_order, len); break; @@ -6488,6 +6476,129 @@ static void dri3FDFromFence_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 24, ENC_NA); *offsetp += 24; } + +static void dri3GetSupportedModifiers(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) +{ + proto_tree_add_item(t, hf_x11_dri3_GetSupportedModifiers_window, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_dri3_GetSupportedModifiers_depth, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + proto_tree_add_item(t, hf_x11_dri3_GetSupportedModifiers_bpp, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA); + *offsetp += 2; +} +static void dri3GetSupportedModifiers_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order) +{ + int sequence_number; + int f_num_window_modifiers; + int f_num_screen_modifiers; + + col_append_fstr(pinfo->cinfo, COL_INFO, "-GetSupportedModifiers"); + + REPLY(reply); + proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA); + *offsetp += 1; + sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order); + proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number, + "%d (dri3-GetSupportedModifiers)", sequence_number); + *offsetp += 2; + proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + f_num_window_modifiers = tvb_get_guint32(tvb, *offsetp, byte_order); + proto_tree_add_item(t, hf_x11_dri3_GetSupportedModifiers_reply_num_window_modifiers, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + f_num_screen_modifiers = tvb_get_guint32(tvb, *offsetp, byte_order); + proto_tree_add_item(t, hf_x11_dri3_GetSupportedModifiers_reply_num_screen_modifiers, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 16, ENC_NA); + *offsetp += 16; + listOfCard64(tvb, offsetp, t, hf_x11_dri3_GetSupportedModifiers_reply_window_modifiers, hf_x11_dri3_GetSupportedModifiers_reply_window_modifiers_item, f_num_window_modifiers, byte_order); + listOfCard64(tvb, offsetp, t, hf_x11_dri3_GetSupportedModifiers_reply_screen_modifiers, hf_x11_dri3_GetSupportedModifiers_reply_screen_modifiers_item, f_num_screen_modifiers, byte_order); +} + +static void dri3PixmapFromBuffers(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) +{ + int f_num_buffers; + proto_tree_add_item(t, hf_x11_dri3_PixmapFromBuffers_pixmap, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_dri3_PixmapFromBuffers_window, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + f_num_buffers = tvb_get_guint8(tvb, *offsetp); + proto_tree_add_item(t, hf_x11_dri3_PixmapFromBuffers_num_buffers, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 3, ENC_NA); + *offsetp += 3; + proto_tree_add_item(t, hf_x11_dri3_PixmapFromBuffers_width, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + proto_tree_add_item(t, hf_x11_dri3_PixmapFromBuffers_height, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + proto_tree_add_item(t, hf_x11_dri3_PixmapFromBuffers_stride0, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_dri3_PixmapFromBuffers_offset0, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_dri3_PixmapFromBuffers_stride1, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_dri3_PixmapFromBuffers_offset1, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_dri3_PixmapFromBuffers_stride2, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_dri3_PixmapFromBuffers_offset2, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_dri3_PixmapFromBuffers_stride3, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_dri3_PixmapFromBuffers_offset3, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_dri3_PixmapFromBuffers_depth, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + proto_tree_add_item(t, hf_x11_dri3_PixmapFromBuffers_bpp, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA); + *offsetp += 2; + proto_tree_add_item(t, hf_x11_dri3_PixmapFromBuffers_modifier, tvb, *offsetp, 8, byte_order); + *offsetp += 8; + length -= f_num_buffers * 1; +} + +static void dri3BuffersFromPixmap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) +{ + proto_tree_add_item(t, hf_x11_dri3_BuffersFromPixmap_pixmap, tvb, *offsetp, 4, byte_order); + *offsetp += 4; +} +static void dri3BuffersFromPixmap_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order) +{ + int sequence_number; + int f_nfd; + + col_append_fstr(pinfo->cinfo, COL_INFO, "-BuffersFromPixmap"); + + REPLY(reply); + f_nfd = tvb_get_guint8(tvb, *offsetp); + proto_tree_add_item(t, hf_x11_dri3_BuffersFromPixmap_reply_nfd, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order); + proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number, + "%d (dri3-BuffersFromPixmap)", sequence_number); + *offsetp += 2; + proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_dri3_BuffersFromPixmap_reply_width, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + proto_tree_add_item(t, hf_x11_dri3_BuffersFromPixmap_reply_height, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_dri3_BuffersFromPixmap_reply_modifier, tvb, *offsetp, 8, byte_order); + *offsetp += 8; + proto_tree_add_item(t, hf_x11_dri3_BuffersFromPixmap_reply_depth, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + proto_tree_add_item(t, hf_x11_dri3_BuffersFromPixmap_reply_bpp, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 6, ENC_NA); + *offsetp += 6; + listOfCard32(tvb, offsetp, t, hf_x11_dri3_BuffersFromPixmap_reply_strides, hf_x11_dri3_BuffersFromPixmap_reply_strides_item, f_nfd, byte_order); + listOfCard32(tvb, offsetp, t, hf_x11_dri3_BuffersFromPixmap_reply_offsets, hf_x11_dri3_BuffersFromPixmap_reply_offsets_item, f_nfd, byte_order); +} static const value_string dri3_extension_minor[] = { { 0, "QueryVersion" }, { 1, "Open" }, @@ -6495,6 +6606,9 @@ static const value_string dri3_extension_minor[] = { { 3, "BufferFromPixmap" }, { 4, "FenceFromFD" }, { 5, "FDFromFence" }, + { 6, "GetSupportedModifiers" }, + { 7, "PixmapFromBuffers" }, + { 8, "BuffersFromPixmap" }, { 0, NULL } }; const x11_event_info dri3_events[] = { @@ -6505,6 +6619,8 @@ static x11_reply_info dri3_replies[] = { { 1, dri3Open_Reply }, { 3, dri3BufferFromPixmap_Reply }, { 5, dri3FDFromFence_Reply }, + { 6, dri3GetSupportedModifiers_Reply }, + { 8, dri3BuffersFromPixmap_Reply }, { 0, NULL } }; @@ -6536,6 +6652,15 @@ static void dispatch_dri3(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto case 5: dri3FDFromFence(tvb, pinfo, offsetp, t, byte_order, length); break; + case 6: + dri3GetSupportedModifiers(tvb, pinfo, offsetp, t, byte_order, length); + break; + case 7: + dri3PixmapFromBuffers(tvb, pinfo, offsetp, t, byte_order, length); + break; + case 8: + dri3BuffersFromPixmap(tvb, pinfo, offsetp, t, byte_order, length); + break; /* No need for a default case here, since Unknown is printed above, and UNDECODED() is taken care of by dissect_x11_request */ } @@ -10144,6 +10269,28 @@ static void struct_randr_MonitorInfo(tvbuff_t *tvb, int *offsetp, proto_tree *ro } } +static void struct_randr_LeaseNotify(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count) +{ + int i; + for (i = 0; i < count; i++) { + proto_item *item; + proto_tree *t; + + item = proto_tree_add_item(root, hf_x11_struct_randr_LeaseNotify, tvb, *offsetp, 28, ENC_NA); + t = proto_item_add_subtree(item, ett_x11_rectangle); + proto_tree_add_item(t, hf_x11_struct_randr_LeaseNotify_timestamp, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_randr_LeaseNotify_window, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_randr_LeaseNotify_lease, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_randr_LeaseNotify_created, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 15, ENC_NA); + *offsetp += 15; + } +} + static void struct_sync_INT64(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count) { int i; @@ -10603,6 +10750,7 @@ static void randrSelectInput(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp &hf_x11_randr_SelectInput_enable_mask_ProviderChange, &hf_x11_randr_SelectInput_enable_mask_ProviderProperty, &hf_x11_randr_SelectInput_enable_mask_ResourceChange, + &hf_x11_randr_SelectInput_enable_mask_Lease, NULL }; proto_tree_add_bitmask(t, tvb, *offsetp, hf_x11_randr_SelectInput_enable, ett_x11_rectangle, enable_bits, byte_order); @@ -11759,41 +11907,6 @@ static void randrGetProviderProperty_Reply(tvbuff_t *tvb, packet_info *pinfo, in listOfByte(tvb, offsetp, t, hf_x11_randr_GetProviderProperty_reply_data, (f_num_items * (f_format / 8)), byte_order); } -static void struct_randr_NotifyData(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order, int count) -{ - int i; - int base = *offsetp; - for (i = 0; i < count; i++) { - proto_item *item; - proto_tree *t; - item = proto_tree_add_item(root, hf_x11_union_randr_NotifyData, tvb, base, 28, ENC_NA); - t = proto_item_add_subtree(item, ett_x11_rectangle); - - *offsetp = base; - struct_randr_CrtcChange(tvb, offsetp, t, byte_order, 1); - *offsetp = base; - struct_randr_OutputChange(tvb, offsetp, t, byte_order, 1); - *offsetp = base; - struct_randr_OutputProperty(tvb, offsetp, t, byte_order, 1); - *offsetp = base; - struct_randr_ProviderChange(tvb, offsetp, t, byte_order, 1); - *offsetp = base; - struct_randr_ProviderProperty(tvb, offsetp, t, byte_order, 1); - *offsetp = base; - struct_randr_ResourceChange(tvb, offsetp, t, byte_order, 1); - base += 28; - } - *offsetp = base; -} - -static void randrNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order) -{ - field8(tvb, offsetp, t, hf_x11_randr_Notify_subCode, byte_order); - CARD16(event_sequencenumber); - struct_randr_NotifyData(tvb, offsetp, t, byte_order, 1); -} - - static void randrGetMonitors(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) { proto_tree_add_item(t, hf_x11_randr_GetMonitors_window, tvb, *offsetp, 4, byte_order); @@ -11843,6 +11956,89 @@ static void randrDeleteMonitor(tvbuff_t *tvb, packet_info *pinfo _U_, int *offse proto_tree_add_item(t, hf_x11_randr_DeleteMonitor_name, tvb, *offsetp, 4, byte_order); *offsetp += 4; } + +static void randrCreateLease(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) +{ + int f_num_crtcs; + int f_num_outputs; + proto_tree_add_item(t, hf_x11_randr_CreateLease_window, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_randr_CreateLease_lid, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + f_num_crtcs = tvb_get_guint16(tvb, *offsetp, byte_order); + proto_tree_add_item(t, hf_x11_randr_CreateLease_num_crtcs, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + f_num_outputs = tvb_get_guint16(tvb, *offsetp, byte_order); + proto_tree_add_item(t, hf_x11_randr_CreateLease_num_outputs, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + listOfCard32(tvb, offsetp, t, hf_x11_randr_CreateLease_crtcs, hf_x11_randr_CreateLease_crtcs_item, f_num_crtcs, byte_order); + length -= f_num_crtcs * 4; + listOfCard32(tvb, offsetp, t, hf_x11_randr_CreateLease_outputs, hf_x11_randr_CreateLease_outputs_item, f_num_outputs, byte_order); + length -= f_num_outputs * 4; +} +static void randrCreateLease_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order) +{ + int sequence_number; + + col_append_fstr(pinfo->cinfo, COL_INFO, "-CreateLease"); + + REPLY(reply); + proto_tree_add_item(t, hf_x11_randr_CreateLease_reply_nfd, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order); + proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number, + "%d (randr-CreateLease)", sequence_number); + *offsetp += 2; + proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 24, ENC_NA); + *offsetp += 24; +} + +static void randrFreeLease(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) +{ + proto_tree_add_item(t, hf_x11_randr_FreeLease_lid, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_randr_FreeLease_terminate, tvb, *offsetp, 1, ENC_NA); + *offsetp += 1; +} + +static void struct_randr_NotifyData(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order, int count) +{ + int i; + int base = *offsetp; + for (i = 0; i < count; i++) { + proto_item *item; + proto_tree *t; + item = proto_tree_add_item(root, hf_x11_union_randr_NotifyData, tvb, base, 28, ENC_NA); + t = proto_item_add_subtree(item, ett_x11_rectangle); + + *offsetp = base; + struct_randr_CrtcChange(tvb, offsetp, t, byte_order, 1); + *offsetp = base; + struct_randr_OutputChange(tvb, offsetp, t, byte_order, 1); + *offsetp = base; + struct_randr_OutputProperty(tvb, offsetp, t, byte_order, 1); + *offsetp = base; + struct_randr_ProviderChange(tvb, offsetp, t, byte_order, 1); + *offsetp = base; + struct_randr_ProviderProperty(tvb, offsetp, t, byte_order, 1); + *offsetp = base; + struct_randr_ResourceChange(tvb, offsetp, t, byte_order, 1); + *offsetp = base; + struct_randr_LeaseNotify(tvb, offsetp, t, byte_order, 1); + base += 28; + } + *offsetp = base; +} + +static void randrNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order) +{ + field8(tvb, offsetp, t, hf_x11_randr_Notify_subCode, byte_order); + CARD16(event_sequencenumber); + struct_randr_NotifyData(tvb, offsetp, t, byte_order, 1); +} + static const value_string randr_extension_minor[] = { { 0, "QueryVersion" }, { 2, "SetScreenConfig" }, @@ -11887,6 +12083,8 @@ static const value_string randr_extension_minor[] = { { 42, "GetMonitors" }, { 43, "SetMonitor" }, { 44, "DeleteMonitor" }, + { 45, "CreateLease" }, + { 46, "FreeLease" }, { 0, NULL } }; const x11_event_info randr_events[] = { @@ -11919,6 +12117,7 @@ static x11_reply_info randr_replies[] = { { 37, randrQueryProviderProperty_Reply }, { 41, randrGetProviderProperty_Reply }, { 42, randrGetMonitors_Reply }, + { 45, randrCreateLease_Reply }, { 0, NULL } }; @@ -12061,6 +12260,12 @@ static void dispatch_randr(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, prot case 44: randrDeleteMonitor(tvb, pinfo, offsetp, t, byte_order, length); break; + case 45: + randrCreateLease(tvb, pinfo, offsetp, t, byte_order, length); + break; + case 46: + randrFreeLease(tvb, pinfo, offsetp, t, byte_order, length); + break; /* No need for a default case here, since Unknown is printed above, and UNDECODED() is taken care of by dissect_x11_request */ } @@ -13823,10 +14028,8 @@ static void screensaverUnsetAttributes(tvbuff_t *tvb, packet_info *pinfo _U_, in static void screensaverSuspend(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) { - proto_tree_add_item(t, hf_x11_screensaver_Suspend_suspend, tvb, *offsetp, 1, byte_order); - *offsetp += 1; - proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 3, ENC_NA); - *offsetp += 3; + proto_tree_add_item(t, hf_x11_screensaver_Suspend_suspend, tvb, *offsetp, 4, byte_order); + *offsetp += 4; } static const value_string screensaver_extension_minor[] = { { 0, "QueryVersion" }, diff --git a/epan/dissectors/x11-glx-render-enum.h b/epan/dissectors/x11-glx-render-enum.h index d2c4bc0713..c2552a3f34 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 17.3-branchpoint-3917-g370e356eba */ + using mesa version 18.2-branchpoint-961-g3e7b5e5 */ /* * Copyright 2008, 2009, 2013, 2014 Open Text Corporation * @@ -494,7 +494,6 @@ static const value_string mesa_enum[] = { { 0x8036, "UNSIGNED_INT_10_10_10_2" }, { 0x8037, "POLYGON_OFFSET_FILL" }, { 0x8038, "POLYGON_OFFSET_FACTOR" }, - { 0x8039, "POLYGON_OFFSET_BIAS_EXT" }, { 0x803a, "RESCALE_NORMAL" }, { 0x803b, "ALPHA4" }, { 0x803c, "ALPHA8" }, @@ -1370,6 +1369,7 @@ static const value_string mesa_enum[] = { { 0x8e1a, "QUERY_BY_REGION_NO_WAIT_INVERTED" }, { 0x8e1b, "POLYGON_OFFSET_CLAMP_EXT" }, { 0x8e28, "TIMESTAMP" }, + { 0x8e50, "SAMPLE_LOCATION_ARB" }, { 0x8e70, "MAX_TRANSFORM_FEEDBACK_BUFFERS" }, { 0x8e71, "MAX_VERTEX_STREAMS" }, { 0x8f93, "RGBA_SNORM" }, @@ -1385,6 +1385,12 @@ static const value_string mesa_enum[] = { { 0x9192, "QUERY_BUFFER" }, { 0x9193, "QUERY_BUFFER_BINDING" }, { 0x9194, "QUERY_RESULT_NO_WAIT" }, + { 0x91b2, "RENDERBUFFER_STORAGE_SAMPLES_AMD" }, + { 0x91b3, "MAX_COLOR_FRAMEBUFFER_SAMPLES_AMD" }, + { 0x91b4, "MAX_COLOR_FRAMEBUFFER_STORAGE_SAMPLES_AMD" }, + { 0x91b5, "MAX_DEPTH_STENCIL_FRAMEBUFFER_SAMPLES_AMD" }, + { 0x91b6, "NUM_SUPPORTED_MULTISAMPLE_MODES_AMD" }, + { 0x91b7, "SUPPORTED_MULTISAMPLE_MODES_AMD" }, { 0x9285, "BLEND_ADVANCED_COHERENT_KHR" }, { 0x9294, "MULTIPLY_KHR" }, { 0x9295, "SCREEN_KHR" }, @@ -1403,8 +1409,25 @@ static const value_string mesa_enum[] = { { 0x92b0, "HSL_LUMINOSITY_KHR" }, { 0x92be, "PRIMITIVE_BOUNDING_BOX_ARB" }, { 0x933c, "FILL_RECTANGLE_NV" }, + { 0x933d, "SAMPLE_LOCATION_SUBPIXEL_BITS_ARB" }, + { 0x933e, "SAMPLE_LOCATION_PIXEL_GRID_WIDTH_ARB" }, + { 0x933f, "SAMPLE_LOCATION_PIXEL_GRID_HEIGHT_ARB" }, + { 0x9340, "PROGRAMMABLE_SAMPLE_LOCATION_TABLE_SIZE_ARB" }, + { 0x9341, "PROGRAMMABLE_SAMPLE_LOCATION_ARB" }, + { 0x9342, "FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS_ARB" }, + { 0x9343, "FRAMEBUFFER_SAMPLE_LOCATION_PIXEL_GRID_ARB" }, + { 0x9346, "CONSERVATIVE_RASTERIZATION_NV" }, + { 0x9347, "SUBPIXEL_PRECISION_BIAS_X_BITS_NV" }, + { 0x9348, "SUBPIXEL_PRECISION_BIAS_Y_BITS_NV" }, + { 0x9349, "MAX_SUBPIXEL_PRECISION_BIAS_BITS_NV" }, + { 0x9379, "CONSERVATIVE_RASTER_DILATE_NV" }, + { 0x937a, "CONSERVATIVE_RASTER_DILATE_RANGE_NV" }, + { 0x937b, "CONSERVATIVE_RASTER_DILATE_GRANULARITY_NV" }, { 0x9381, "MULTISAMPLE_LINE_WIDTH_RANGE_ARB" }, { 0x9382, "MULTISAMPLE_LINE_WIDTH_GRANULARITY_ARB" }, + { 0x954d, "CONSERVATIVE_RASTER_MODE_NV" }, + { 0x954e, "CONSERVATIVE_RASTER_MODE_POST_SNAP_NV" }, + { 0x954f, "CONSERVATIVE_RASTER_MODE_PRE_SNAP_TRIANGLES_NV" }, { 0x10000, "EVAL_BIT" }, { 0x19262, "RASTER_POSITION_UNCLIPPED_IBM" }, { 0x20000, "LIST_BIT" }, diff --git a/epan/dissectors/x11-register-info.h b/epan/dissectors/x11-register-info.h index 41004ed070..b498dbce46 100644 --- a/epan/dissectors/x11-register-info.h +++ b/epan/dissectors/x11-register-info.h @@ -1487,8 +1487,6 @@ { &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.list", 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_n, { "n", "x11.glx.render.TexFilterFuncSGIS.n", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -1985,6 +1983,44 @@ { &hf_x11_dri3_FDFromFence_drawable, { "drawable", "x11.dri3.FDFromFence.drawable", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_dri3_FDFromFence_fence, { "fence", "x11.dri3.FDFromFence.fence", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_dri3_FDFromFence_reply_nfd, { "nfd", "x11.dri3.FDFromFence.reply.nfd", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_GetSupportedModifiers_window, { "window", "x11.dri3.GetSupportedModifiers.window", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_GetSupportedModifiers_depth, { "depth", "x11.dri3.GetSupportedModifiers.depth", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_GetSupportedModifiers_bpp, { "bpp", "x11.dri3.GetSupportedModifiers.bpp", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_GetSupportedModifiers_reply_num_window_modifiers, { "num_window_modifiers", "x11.dri3.GetSupportedModifiers.reply.num_window_modifiers", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_GetSupportedModifiers_reply_num_screen_modifiers, { "num_screen_modifiers", "x11.dri3.GetSupportedModifiers.reply.num_screen_modifiers", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_GetSupportedModifiers_reply_window_modifiers, { "window_modifiers", "x11.dri3.GetSupportedModifiers.reply.window_modifiers.list", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_GetSupportedModifiers_reply_window_modifiers_item, { "window_modifiers", "x11.dri3.GetSupportedModifiers.reply.window_modifiers", FT_UINT64, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_GetSupportedModifiers_reply_screen_modifiers, { "screen_modifiers", "x11.dri3.GetSupportedModifiers.reply.screen_modifiers.list", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_GetSupportedModifiers_reply_screen_modifiers_item, { "screen_modifiers", "x11.dri3.GetSupportedModifiers.reply.screen_modifiers", FT_UINT64, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_PixmapFromBuffers_pixmap, { "pixmap", "x11.dri3.PixmapFromBuffers.pixmap", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_PixmapFromBuffers_window, { "window", "x11.dri3.PixmapFromBuffers.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_PixmapFromBuffers_num_buffers, { "num_buffers", "x11.dri3.PixmapFromBuffers.num_buffers", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_PixmapFromBuffers_width, { "width", "x11.dri3.PixmapFromBuffers.width", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_PixmapFromBuffers_height, { "height", "x11.dri3.PixmapFromBuffers.height", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_PixmapFromBuffers_stride0, { "stride0", "x11.dri3.PixmapFromBuffers.stride0", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_PixmapFromBuffers_offset0, { "offset0", "x11.dri3.PixmapFromBuffers.offset0", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_PixmapFromBuffers_stride1, { "stride1", "x11.dri3.PixmapFromBuffers.stride1", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_PixmapFromBuffers_offset1, { "offset1", "x11.dri3.PixmapFromBuffers.offset1", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_PixmapFromBuffers_stride2, { "stride2", "x11.dri3.PixmapFromBuffers.stride2", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_PixmapFromBuffers_offset2, { "offset2", "x11.dri3.PixmapFromBuffers.offset2", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_PixmapFromBuffers_stride3, { "stride3", "x11.dri3.PixmapFromBuffers.stride3", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_PixmapFromBuffers_offset3, { "offset3", "x11.dri3.PixmapFromBuffers.offset3", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_PixmapFromBuffers_depth, { "depth", "x11.dri3.PixmapFromBuffers.depth", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_PixmapFromBuffers_bpp, { "bpp", "x11.dri3.PixmapFromBuffers.bpp", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_PixmapFromBuffers_modifier, { "modifier", "x11.dri3.PixmapFromBuffers.modifier", FT_UINT64, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_PixmapFromBuffers_buffers, { "buffers", "x11.dri3.PixmapFromBuffers.buffers", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_BuffersFromPixmap_pixmap, { "pixmap", "x11.dri3.BuffersFromPixmap.pixmap", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_BuffersFromPixmap_reply_nfd, { "nfd", "x11.dri3.BuffersFromPixmap.reply.nfd", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_BuffersFromPixmap_reply_width, { "width", "x11.dri3.BuffersFromPixmap.reply.width", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_BuffersFromPixmap_reply_height, { "height", "x11.dri3.BuffersFromPixmap.reply.height", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_BuffersFromPixmap_reply_modifier, { "modifier", "x11.dri3.BuffersFromPixmap.reply.modifier", FT_UINT64, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_BuffersFromPixmap_reply_depth, { "depth", "x11.dri3.BuffersFromPixmap.reply.depth", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_BuffersFromPixmap_reply_bpp, { "bpp", "x11.dri3.BuffersFromPixmap.reply.bpp", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_BuffersFromPixmap_reply_strides, { "strides", "x11.dri3.BuffersFromPixmap.reply.strides.list", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_BuffersFromPixmap_reply_strides_item, { "strides", "x11.dri3.BuffersFromPixmap.reply.strides", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_BuffersFromPixmap_reply_offsets, { "offsets", "x11.dri3.BuffersFromPixmap.reply.offsets.list", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_BuffersFromPixmap_reply_offsets_item, { "offsets", "x11.dri3.BuffersFromPixmap.reply.offsets", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri3_BuffersFromPixmap_reply_buffers, { "buffers", "x11.dri3.BuffersFromPixmap.reply.buffers", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_dri3_extension_minor, { "extension-minor", "x11.extension-minor", FT_UINT8, BASE_DEC, VALS(dri3_extension_minor), 0, "minor opcode", HFILL }}, { &hf_x11_ge_QueryVersion_client_major_version, { "client_major_version", "x11.ge.QueryVersion.client_major_version", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -2617,6 +2653,11 @@ { &hf_x11_struct_randr_MonitorInfo_height_in_millimeters, { "height_in_millimeters", "x11.struct.randr_MonitorInfo.height_in_millimeters", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_randr_MonitorInfo_outputs, { "outputs", "x11.struct.randr_MonitorInfo.outputs.list", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_randr_MonitorInfo_outputs_item, { "outputs", "x11.struct.randr_MonitorInfo.outputs", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_randr_LeaseNotify, { "randr_LeaseNotify", "x11.struct.randr_LeaseNotify", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_randr_LeaseNotify_timestamp, { "timestamp", "x11.struct.randr_LeaseNotify.timestamp", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_randr_LeaseNotify_window, { "window", "x11.struct.randr_LeaseNotify.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_randr_LeaseNotify_lease, { "lease", "x11.struct.randr_LeaseNotify.lease", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_randr_LeaseNotify_created, { "created", "x11.struct.randr_LeaseNotify.created", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_sync_INT64, { "sync_INT64", "x11.struct.sync_INT64", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_sync_INT64_hi, { "hi", "x11.struct.sync_INT64.hi", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_sync_INT64_lo, { "lo", "x11.struct.sync_INT64.lo", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -2734,6 +2775,7 @@ { &hf_x11_randr_SelectInput_enable_mask_ProviderChange, { "ProviderChange", "x11.randr.SelectInput.enable.ProviderChange", FT_BOOLEAN, 16, NULL, 1U << 4, NULL, HFILL }}, { &hf_x11_randr_SelectInput_enable_mask_ProviderProperty, { "ProviderProperty", "x11.randr.SelectInput.enable.ProviderProperty", FT_BOOLEAN, 16, NULL, 1U << 5, NULL, HFILL }}, { &hf_x11_randr_SelectInput_enable_mask_ResourceChange, { "ResourceChange", "x11.randr.SelectInput.enable.ResourceChange", FT_BOOLEAN, 16, NULL, 1U << 6, NULL, HFILL }}, +{ &hf_x11_randr_SelectInput_enable_mask_Lease, { "Lease", "x11.randr.SelectInput.enable.Lease", FT_BOOLEAN, 16, NULL, 1U << 7, NULL, HFILL }}, { &hf_x11_randr_SelectInput_enable, { "enable", "x11.randr.SelectInput.enable", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetScreenInfo_window, { "window", "x11.randr.GetScreenInfo.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetScreenInfo_reply_rotations_mask_Rotate_0, { "Rotate_0", "x11.randr.GetScreenInfo.reply.rotations.Rotate_0", FT_BOOLEAN, 8, NULL, 1U << 0, NULL, HFILL }}, @@ -3056,15 +3098,6 @@ { &hf_x11_randr_GetProviderProperty_reply_bytes_after, { "bytes_after", "x11.randr.GetProviderProperty.reply.bytes_after", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetProviderProperty_reply_num_items, { "num_items", "x11.randr.GetProviderProperty.reply.num_items", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetProviderProperty_reply_data, { "data", "x11.randr.GetProviderProperty.reply.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_union_randr_NotifyData, { "randr_NotifyData", "x11.union.randr_NotifyData", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_union_randr_NotifyData_cc, { "cc", "x11.union.randr_NotifyData.cc", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_union_randr_NotifyData_oc, { "oc", "x11.union.randr_NotifyData.oc", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_union_randr_NotifyData_op, { "op", "x11.union.randr_NotifyData.op", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_union_randr_NotifyData_pc, { "pc", "x11.union.randr_NotifyData.pc", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_union_randr_NotifyData_pp, { "pp", "x11.union.randr_NotifyData.pp", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_union_randr_NotifyData_rc, { "rc", "x11.union.randr_NotifyData.rc", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_randr_Notify_subCode, { "subCode", "x11.randr.Notify.subCode", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_randr_Notify), 0, NULL, HFILL }}, -{ &hf_x11_randr_Notify_u, { "u", "x11.randr.Notify.u", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetMonitors_window, { "window", "x11.randr.GetMonitors.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetMonitors_get_active, { "get_active", "x11.randr.GetMonitors.get_active", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetMonitors_reply_timestamp, { "timestamp", "x11.randr.GetMonitors.reply.timestamp", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -3075,6 +3108,27 @@ { &hf_x11_randr_SetMonitor_monitorinfo, { "monitorinfo", "x11.randr.SetMonitor.monitorinfo", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_DeleteMonitor_window, { "window", "x11.randr.DeleteMonitor.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_DeleteMonitor_name, { "name", "x11.randr.DeleteMonitor.name", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_CreateLease_window, { "window", "x11.randr.CreateLease.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_CreateLease_lid, { "lid", "x11.randr.CreateLease.lid", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_CreateLease_num_crtcs, { "num_crtcs", "x11.randr.CreateLease.num_crtcs", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_CreateLease_num_outputs, { "num_outputs", "x11.randr.CreateLease.num_outputs", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_CreateLease_crtcs, { "crtcs", "x11.randr.CreateLease.crtcs.list", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_CreateLease_crtcs_item, { "crtcs", "x11.randr.CreateLease.crtcs", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_CreateLease_outputs, { "outputs", "x11.randr.CreateLease.outputs.list", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_CreateLease_outputs_item, { "outputs", "x11.randr.CreateLease.outputs", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_CreateLease_reply_nfd, { "nfd", "x11.randr.CreateLease.reply.nfd", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_FreeLease_lid, { "lid", "x11.randr.FreeLease.lid", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_FreeLease_terminate, { "terminate", "x11.randr.FreeLease.terminate", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_union_randr_NotifyData, { "randr_NotifyData", "x11.union.randr_NotifyData", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_union_randr_NotifyData_cc, { "cc", "x11.union.randr_NotifyData.cc", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_union_randr_NotifyData_oc, { "oc", "x11.union.randr_NotifyData.oc", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_union_randr_NotifyData_op, { "op", "x11.union.randr_NotifyData.op", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_union_randr_NotifyData_pc, { "pc", "x11.union.randr_NotifyData.pc", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_union_randr_NotifyData_pp, { "pp", "x11.union.randr_NotifyData.pp", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_union_randr_NotifyData_rc, { "rc", "x11.union.randr_NotifyData.rc", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_union_randr_NotifyData_lc, { "lc", "x11.union.randr_NotifyData.lc", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_Notify_subCode, { "subCode", "x11.randr.Notify.subCode", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_randr_Notify), 0, NULL, HFILL }}, +{ &hf_x11_randr_Notify_u, { "u", "x11.randr.Notify.u", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_extension_minor, { "extension-minor", "x11.extension-minor", FT_UINT8, BASE_DEC, VALS(randr_extension_minor), 0, "minor opcode", HFILL }}, { &hf_x11_struct_record_Range8, { "record_Range8", "x11.struct.record_Range8", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -3529,7 +3583,7 @@ { &hf_x11_screensaver_SetAttributes_Colormap_colormap, { "colormap", "x11.screensaver.SetAttributes.Colormap.colormap", FT_UINT32, BASE_HEX, VALS(x11_enum_xproto_Colormap), 0, NULL, HFILL }}, { &hf_x11_screensaver_SetAttributes_Cursor_cursor, { "cursor", "x11.screensaver.SetAttributes.Cursor.cursor", FT_UINT32, BASE_HEX, VALS(x11_enum_xproto_Cursor), 0, NULL, HFILL }}, { &hf_x11_screensaver_UnsetAttributes_drawable, { "drawable", "x11.screensaver.UnsetAttributes.drawable", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_screensaver_Suspend_suspend, { "suspend", "x11.screensaver.Suspend.suspend", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_screensaver_Suspend_suspend, { "suspend", "x11.screensaver.Suspend.suspend", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_screensaver_extension_minor, { "extension-minor", "x11.extension-minor", FT_UINT8, BASE_DEC, VALS(screensaver_extension_minor), 0, "minor opcode", HFILL }}, { &hf_x11_shape_QueryVersion_reply_major_version, { "major_version", "x11.shape.QueryVersion.reply.major_version", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -- cgit v1.2.3