diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2016-06-15 13:25:44 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-06-16 03:29:45 +0000 |
| commit | a38db78f7da431e12d2ee3b995ff68f9c4f50a35 (patch) | |
| tree | 8b58e74ab0933ccc116ea22867fa353b832811b8 /epan/dissectors/x11-glx-render-enum.h | |
| parent | d1d27bd95aa04044dcfb4e72437d9319bfc7c930 (diff) | |
Update the X11 dissector to use the latest mesa and xcbproto.
Change-Id: Ia1395cffaebbcf6585b9167861d8c3b4d86cf821
Reviewed-on: https://code.wireshark.org/review/15923
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/x11-glx-render-enum.h')
| -rw-r--r-- | epan/dissectors/x11-glx-render-enum.h | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/epan/dissectors/x11-glx-render-enum.h b/epan/dissectors/x11-glx-render-enum.h index 70e1bfa6a7..29ebb7e660 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 11.0-branchpoint-1379-g6f39546 */ + using mesa version 12.0-branchpoint-413-g44e0c0e */ /* * Copyright 2008, 2009, 2013, 2014 Open Text Corporation <pharris[AT]opentext.com> * @@ -1318,11 +1318,18 @@ static const value_string mesa_enum[] = { { 0x821F, "BUFFER_IMMUTABLE_STORAGE" }, { 0x8220, "BUFFER_STORAGE_FLAGS" }, { 0x4000, "CLIENT_MAPPED_BUFFER_BARRIER_BIT" }, +/* OpenGL extension GL_ARB_query_buffer_object */ + { 0x9194, "QUERY_RESULT_NO_WAIT" }, + { 0x9192, "QUERY_BUFFER" }, + { 0x9193, "QUERY_BUFFER_BINDING" }, /* OpenGL extension GL_ARB_conditional_render_inverted */ { 0x8E17, "QUERY_WAIT_INVERTED" }, { 0x8E18, "QUERY_NO_WAIT_INVERTED" }, { 0x8E19, "QUERY_BY_REGION_WAIT_INVERTED" }, { 0x8E1A, "QUERY_BY_REGION_NO_WAIT_INVERTED" }, +/* OpenGL extension ARB_cull_distance */ + { 0x82F9, "MAX_CULL_DISTANCES" }, + { 0x82FA, "MAX_COMBINED_CLIP_AND_CULL_DISTANCES" }, /* OpenGL extension GL_EXT_blend_color */ { 0x8001, "CONSTANT_COLOR_EXT" }, { 0x8002, "ONE_MINUS_CONSTANT_COLOR_EXT" }, @@ -1544,8 +1551,8 @@ static const value_string mesa_enum[] = { { 0x81A9, "ARRAY_ELEMENT_LOCK_COUNT_EXT" }, /* OpenGL extension GL_EXT_cull_vertex */ { 0x81AA, "CULL_VERTEX_EXT" }, - { 0x81AB, "CULL_VERTEX_OBJECT_POSITION_EXT" }, - { 0x81AC, "CULL_VERTEX_EYE_POSITION_EXT" }, + { 0x81AB, "CULL_VERTEX_EYE_POSITION_EXT" }, + { 0x81AC, "CULL_VERTEX_OBJECT_POSITION_EXT" }, /* OpenGL extension GL_SGIX_fragment_lighting */ /* OpenGL extension GL_IBM_rasterpos_clip */ { 0x19262, "RASTER_POSITION_UNCLIPPED_IBM" }, @@ -1968,6 +1975,10 @@ static const value_string mesa_enum[] = { /* OpenGL extension GL_EXT_framebuffer_sRGB */ { 0x8DB9, "FRAMEBUFFER_SRGB_EXT" }, { 0x8DBA, "FRAMEBUFFER_SRGB_CAPABLE_EXT" }, +/* OpenGL extension GL_ATI_meminfo */ + { 0x87FB, "VBO_FREE_MEMORY_ATI" }, + { 0x87FC, "TEXTURE_FREE_MEMORY_ATI" }, + { 0x87FD, "RENDERBUFFER_FREE_MEMORY_ATI" }, /* OpenGL extension GL_APPLE_texture_range */ { 0x85BC, "TEXTURE_STORAGE_HINT_APPLE" }, { 0x85BD, "STORAGE_PRIVATE_APPLE" }, @@ -1981,6 +1992,12 @@ static const value_string mesa_enum[] = { { 0x8A4A, "SKIP_DECODE_EXT" }, /* OpenGL extension GL_AMD_pinned_memory */ { 0x9160, "EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD" }, +/* OpenGL extension GL_NVX_gpu_memory_info */ + { 0x9047, "GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX" }, + { 0x9048, "GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX" }, + { 0x9049, "GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX" }, + { 0x904A, "GPU_MEMORY_INFO_EVICTION_COUNT_NVX" }, + { 0x904B, "GPU_MEMORY_INFO_EVICTED_MEMORY_NVX" }, /* OpenGL extension GL_EXT_polygon_offset_clamp */ { 0x8E1B, "POLYGON_OFFSET_CLAMP_EXT" }, /* OpenGL extension GL_ATI_blend_equation_separate */ |