diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2012-03-13 00:07:34 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2012-03-13 00:07:34 +0000 |
| commit | 9c3bbf44c14a9d2822704c1114b07a2ce8cf4110 (patch) | |
| tree | fcde4a2027137e06644d97b9f235660578ffe155 /epan/dissectors/x11-glx-render-enum.h | |
| parent | 20a52095aaf4d007d123547190927048849aaf82 (diff) | |
From Peter Harris:
An enum name collision was recently added to the upstream XCB/proto.
Avoid the collision by putting enum names into their proper namespace.
After applying that, regenerate the X11 dissector.
svn path=/trunk/; revision=41514
Diffstat (limited to 'epan/dissectors/x11-glx-render-enum.h')
| -rw-r--r-- | epan/dissectors/x11-glx-render-enum.h | 38 |
1 files changed, 1 insertions, 37 deletions
diff --git a/epan/dissectors/x11-glx-render-enum.h b/epan/dissectors/x11-glx-render-enum.h index b62572216f..c6bd012cac 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-3282-g51095f7 */ + using mesa version snb-magic-9264-gcc5b0ff */ /* $Id$ */ /* @@ -1293,24 +1293,6 @@ static const value_string mesa_enum[] = { { 0x8861, "POINT_SPRITE_ARB" }, { 0x8862, "COORD_REPLACE_ARB" }, /* OpenGL extension GL_ARB_fragment_program_shadow */ -/* OpenGL extension GL_ARB_draw_buffers */ - { 0x8824, "MAX_DRAW_BUFFERS_ARB" }, - { 0x8825, "DRAW_BUFFER0_ARB" }, - { 0x8826, "DRAW_BUFFER1_ARB" }, - { 0x8827, "DRAW_BUFFER2_ARB" }, - { 0x8828, "DRAW_BUFFER3_ARB" }, - { 0x8829, "DRAW_BUFFER4_ARB" }, - { 0x882A, "DRAW_BUFFER5_ARB" }, - { 0x882B, "DRAW_BUFFER6_ARB" }, - { 0x882C, "DRAW_BUFFER7_ARB" }, - { 0x882D, "DRAW_BUFFER8_ARB" }, - { 0x882E, "DRAW_BUFFER9_ARB" }, - { 0x882F, "DRAW_BUFFER10_ARB" }, - { 0x8830, "DRAW_BUFFER11_ARB" }, - { 0x8831, "DRAW_BUFFER12_ARB" }, - { 0x8832, "DRAW_BUFFER13_ARB" }, - { 0x8833, "DRAW_BUFFER14_ARB" }, - { 0x8834, "DRAW_BUFFER15_ARB" }, /* OpenGL extension GL_ARB_texture_rectangle */ { 0x84F5, "TEXTURE_RECTANGLE_ARB" }, { 0x84F6, "TEXTURE_BINDING_RECTANGLE_ARB" }, @@ -1788,24 +1770,6 @@ static const value_string mesa_enum[] = { { 0x83A3, "RGBA4_S3TC" }, { 0x83A4, "RGBA_DXT5_S3TC" }, { 0x83A5, "RGBA4_DXT5_S3TC" }, -/* OpenGL extension GL_ATI_draw_buffers */ - { 0x8824, "MAX_DRAW_BUFFERS_ATI" }, - { 0x8825, "DRAW_BUFFER0_ATI" }, - { 0x8826, "DRAW_BUFFER1_ATI" }, - { 0x8827, "DRAW_BUFFER2_ATI" }, - { 0x8828, "DRAW_BUFFER3_ATI" }, - { 0x8829, "DRAW_BUFFER4_ATI" }, - { 0x882A, "DRAW_BUFFER5_ATI" }, - { 0x882B, "DRAW_BUFFER6_ATI" }, - { 0x882C, "DRAW_BUFFER7_ATI" }, - { 0x882D, "DRAW_BUFFER8_ATI" }, - { 0x882E, "DRAW_BUFFER9_ATI" }, - { 0x882F, "DRAW_BUFFER10_ATI" }, - { 0x8830, "DRAW_BUFFER11_ATI" }, - { 0x8831, "DRAW_BUFFER12_ATI" }, - { 0x8832, "DRAW_BUFFER13_ATI" }, - { 0x8833, "DRAW_BUFFER14_ATI" }, - { 0x8834, "DRAW_BUFFER15_ATI" }, /* OpenGL extension GL_ATI_texture_env_combine3 */ { 0x8744, "MODULATE_ADD_ATI" }, { 0x8745, "MODULATE_SIGNED_ADD_ATI" }, |