Update x11-dissectors with last mesa trunk ( snb-magic-14719-g2fa9e4c ) and xcbproto trunk ( 1.8-2-gc0d65da )

svn path=/trunk/; revision=47837

1 files changed, 130 insertions, 3 deletions

diff --git a/epan/dissectors/x11-glx-render-enum.h b/epan/dissectors/x11-glx-render-enum.h
index 155a00f835..c7e4c9da8f 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-10072-g9d6b46b */
+   using mesa version snb-magic-14719-g2fa9e4c */
 /* $Id$ */
 
 /*
@@ -457,7 +457,6 @@ static const value_string mesa_enum[] = {
   { 0x2A2D, "T4F_C4F_N3F_V4F" },
   { 0x8037, "POLYGON_OFFSET_FILL" },
   { 0x8038, "POLYGON_OFFSET_FACTOR" },
-  { 0x8039, "POLYGON_OFFSET_BIAS" },
   { 0x803B, "ALPHA4" },
   { 0x803C, "ALPHA8" },
   { 0x803D, "ALPHA12" },
@@ -1298,6 +1297,17 @@ static const value_string mesa_enum[] = {
   { 0x84F6, "TEXTURE_BINDING_RECTANGLE_ARB" },
   { 0x84F7, "PROXY_TEXTURE_RECTANGLE_ARB" },
   { 0x84F8, "MAX_RECTANGLE_TEXTURE_SIZE_ARB" },
+/* OpenGL extension GL_ARB_occlusion_query2 */
+  { 0x8C2F, "ANY_SAMPLES_PASSED" },
+/* OpenGL extension GL_ARB_timer_query */
+  { 0x88BF, "TIME_ELAPSED" },
+  { 0x8E28, "TIMESTAMP" },
+/* OpenGL extension GL_ARB_transform_feedback3 */
+  { 0x8E70, "MAX_TRANSFORM_FEEDBACK_BUFFERS" },
+  { 0x8E71, "MAX_VERTEX_STREAMS" },
+/* OpenGL extension GL_ARB_transform_feedback_instanced */
+/* OpenGL extension GL_ARB_map_buffer_alignment */
+  { 0x90BC, "MIN_MAP_BUFFER_ALIGNMENT" },
 /* OpenGL extension GL_EXT_blend_color */
   { 0x8001, "CONSTANT_COLOR_EXT" },
   { 0x8002, "ONE_MINUS_CONSTANT_COLOR_EXT" },
@@ -1305,6 +1315,7 @@ static const value_string mesa_enum[] = {
   { 0x8004, "ONE_MINUS_CONSTANT_ALPHA_EXT" },
   { 0x8005, "BLEND_COLOR_EXT" },
 /* OpenGL extension GL_EXT_polygon_offset */
+  { 0x8039, "POLYGON_OFFSET_BIAS_EXT" },
 /* OpenGL extension GL_EXT_texture */
   { 0x803B, "ALPHA4_EXT" },
   { 0x803C, "ALPHA8_EXT" },
@@ -1421,6 +1432,12 @@ static const value_string mesa_enum[] = {
 /* OpenGL extension GL_EXT_rescale_normal */
   { 0x803A, "RESCALE_NORMAL_EXT" },
 /* OpenGL extension GL_EXT_vertex_array */
+  { 0x807D, "VERTEX_ARRAY_COUNT_EXT" },
+  { 0x8080, "NORMAL_ARRAY_COUNT_EXT" },
+  { 0x8084, "COLOR_ARRAY_COUNT_EXT" },
+  { 0x8087, "INDEX_ARRAY_COUNT_EXT" },
+  { 0x808B, "TEXTURE_COORD_ARRAY_COUNT_EXT" },
+  { 0x808D, "EDGE_FLAG_ARRAY_COUNT_EXT" },
 /* OpenGL extension GL_SGIS_generate_mipmap */
   { 0x8191, "GENERATE_MIPMAP_SGIS" },
   { 0x8192, "GENERATE_MIPMAP_HINT_SGIS" },
@@ -1508,6 +1525,8 @@ static const value_string mesa_enum[] = {
 /* OpenGL extension GL_EXT_index_material */
 /* OpenGL extension GL_EXT_index_func */
 /* OpenGL extension GL_EXT_compiled_vertex_array */
+  { 0x81A8, "ARRAY_ELEMENT_LOCK_FIRST_EXT" },
+  { 0x81A9, "ARRAY_ELEMENT_LOCK_COUNT_EXT" },
 /* OpenGL extension GL_EXT_cull_vertex */
   { 0x81AA, "CULL_VERTEX_EXT" },
   { 0x81AB, "CULL_VERTEX_OBJECT_POSITION_EXT" },
@@ -1588,7 +1607,7 @@ static const value_string mesa_enum[] = {
   { 0x855C, "EYE_PLANE_ABSOLUTE_NV" },
 /* OpenGL extension GL_NV_blend_square */
 /* OpenGL extension GL_NV_texture_env_combine4 */
-  { 0x8503, "COMBINE4" },
+  { 0x8503, "COMBINE4_NV" },
   { 0x8583, "SOURCE3_RGB_NV" },
   { 0x858B, "SOURCE3_ALPHA_NV" },
   { 0x8593, "OPERAND3_RGB_NV" },
@@ -1738,6 +1757,97 @@ static const value_string mesa_enum[] = {
   { 0x877B, "BUMP_ENVMAP_ATI" },
   { 0x877C, "BUMP_TARGET_ATI" },
 /* OpenGL extension GL_ATI_fragment_shader */
+  { 0x8920, "FRAGMENT_SHADER_ATI" },
+  { 0x8921, "REG_0_ATI" },
+  { 0x8922, "REG_1_ATI" },
+  { 0x8923, "REG_2_ATI" },
+  { 0x8924, "REG_3_ATI" },
+  { 0x8925, "REG_4_ATI" },
+  { 0x8926, "REG_5_ATI" },
+  { 0x8927, "REG_6_ATI" },
+  { 0x8928, "REG_7_ATI" },
+  { 0x8929, "REG_8_ATI" },
+  { 0x892A, "REG_9_ATI" },
+  { 0x892B, "REG_10_ATI" },
+  { 0x892C, "REG_11_ATI" },
+  { 0x892D, "REG_12_ATI" },
+  { 0x892E, "REG_13_ATI" },
+  { 0x892F, "REG_14_ATI" },
+  { 0x8930, "REG_15_ATI" },
+  { 0x8931, "REG_16_ATI" },
+  { 0x8932, "REG_17_ATI" },
+  { 0x8933, "REG_18_ATI" },
+  { 0x8934, "REG_19_ATI" },
+  { 0x8935, "REG_20_ATI" },
+  { 0x8936, "REG_21_ATI" },
+  { 0x8937, "REG_22_ATI" },
+  { 0x8938, "REG_23_ATI" },
+  { 0x8939, "REG_24_ATI" },
+  { 0x893A, "REG_25_ATI" },
+  { 0x893B, "REG_26_ATI" },
+  { 0x893C, "REG_27_ATI" },
+  { 0x893D, "REG_28_ATI" },
+  { 0x893E, "REG_29_ATI" },
+  { 0x893F, "REG_30_ATI" },
+  { 0x8940, "REG_31_ATI" },
+  { 0x8941, "CON_0_ATI" },
+  { 0x8942, "CON_1_ATI" },
+  { 0x8943, "CON_2_ATI" },
+  { 0x8944, "CON_3_ATI" },
+  { 0x8945, "CON_4_ATI" },
+  { 0x8946, "CON_5_ATI" },
+  { 0x8947, "CON_6_ATI" },
+  { 0x8948, "CON_7_ATI" },
+  { 0x8949, "CON_8_ATI" },
+  { 0x894A, "CON_9_ATI" },
+  { 0x894B, "CON_10_ATI" },
+  { 0x894C, "CON_11_ATI" },
+  { 0x894D, "CON_12_ATI" },
+  { 0x894E, "CON_13_ATI" },
+  { 0x894F, "CON_14_ATI" },
+  { 0x8950, "CON_15_ATI" },
+  { 0x8951, "CON_16_ATI" },
+  { 0x8952, "CON_17_ATI" },
+  { 0x8953, "CON_18_ATI" },
+  { 0x8954, "CON_19_ATI" },
+  { 0x8955, "CON_20_ATI" },
+  { 0x8956, "CON_21_ATI" },
+  { 0x8957, "CON_22_ATI" },
+  { 0x8958, "CON_23_ATI" },
+  { 0x8959, "CON_24_ATI" },
+  { 0x895A, "CON_25_ATI" },
+  { 0x895B, "CON_26_ATI" },
+  { 0x895C, "CON_27_ATI" },
+  { 0x895D, "CON_28_ATI" },
+  { 0x895E, "CON_29_ATI" },
+  { 0x895F, "CON_30_ATI" },
+  { 0x8960, "CON_31_ATI" },
+  { 0x8961, "MOV_ATI" },
+  { 0x8963, "ADD_ATI" },
+  { 0x8964, "MUL_ATI" },
+  { 0x8965, "SUB_ATI" },
+  { 0x8966, "DOT3_ATI" },
+  { 0x8967, "DOT4_ATI" },
+  { 0x8968, "MAD_ATI" },
+  { 0x8969, "LERP_ATI" },
+  { 0x896A, "CND_ATI" },
+  { 0x896B, "CND0_ATI" },
+  { 0x896C, "DOT2_ADD_ATI" },
+  { 0x896D, "SECONDARY_INTERPOLATOR_ATI" },
+  { 0x896E, "NUM_FRAGMENT_REGISTERS_ATI" },
+  { 0x896F, "NUM_FRAGMENT_CONSTANTS_ATI" },
+  { 0x8970, "NUM_PASSES_ATI" },
+  { 0x8971, "NUM_INSTRUCTIONS_PER_PASS_ATI" },
+  { 0x8972, "NUM_INSTRUCTIONS_TOTAL_ATI" },
+  { 0x8973, "NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI" },
+  { 0x8974, "NUM_LOOPBACK_COMPONENTS_ATI" },
+  { 0x8975, "COLOR_ALPHA_PAIRING_ATI" },
+  { 0x8976, "SWIZZLE_STR_ATI" },
+  { 0x8977, "SWIZZLE_STQ_ATI" },
+  { 0x8978, "SWIZZLE_STR_DR_ATI" },
+  { 0x8979, "SWIZZLE_STQ_DQ_ATI" },
+  { 0x897A, "SWIZZLE_STRQ_ATI" },
+  { 0x897B, "SWIZZLE_STRQ_DQ_ATI" },
 /* OpenGL extension GL_SUN_mesh_array */
   { 0x8614, "QUAD_MESH_SUN" },
   { 0x8615, "TRIANGLE_MESH_SUN" },
@@ -1775,6 +1885,12 @@ static const value_string mesa_enum[] = {
   { 0x8745, "MODULATE_SIGNED_ADD_ATI" },
   { 0x8746, "MODULATE_SUBTRACT_ATI" },
 /* OpenGL extension GL_NV_fragment_program */
+  { 0x8870, "FRAGMENT_PROGRAM_NV" },
+  { 0x8871, "MAX_TEXTURE_COORDS_NV" },
+  { 0x8872, "MAX_TEXTURE_IMAGE_UNITS_NV" },
+  { 0x8873, "FRAGMENT_PROGRAM_BINDING_NV" },
+  { 0x8868, "MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV" },
+  { 0x8874, "PROGRAM_ERROR_STRING_NV" },
 /* OpenGL extension GL_NV_texture_expand_normal */
   { 0x888F, "TEXTURE_UNSIGNED_REMAP_MODE_NV" },
 /* OpenGL extension GL_OES_compressed_paletted_texture */
@@ -1830,6 +1946,13 @@ static const value_string mesa_enum[] = {
 /* OpenGL extension GL_APPLE_flush_buffer_range */
   { 0x8A12, "BUFFER_SERIALIZED_MODIFY_APPLE" },
   { 0x8A13, "BUFFER_FLUSHING_UNMAP_APPLE" },
+/* OpenGL extension GL_EXT_packed_float */
+  { 0x8C3A, "R11F_G11F_B10F_EXT" },
+  { 0x8C3B, "UNSIGNED_INT_10F_11F_11F_REV" },
+  { 0x8C3C, "RGBA_SIGNED_COMPONENTS_EXT" },
+/* OpenGL extension GL_EXT_framebuffer_sRGB */
+  { 0x8DB9, "FRAMEBUFFER_SRGB_EXT" },
+  { 0x8DBA, "FRAMEBUFFER_SRGB_CAPABLE_EXT" },
 /* OpenGL extension GL_APPLE_texture_range */
   { 0x85BC, "TEXTURE_STORAGE_HINT_APPLE" },
   { 0x85BD, "STORAGE_PRIVATE_APPLE" },
@@ -1837,6 +1960,10 @@ static const value_string mesa_enum[] = {
   { 0x85BF, "STORAGE_SHARED_APPLE" },
   { 0x85B7, "TEXTURE_RANGE_LENGTH_APPLE" },
   { 0x85B8, "TEXTURE_RANGE_POINTER_APPLE" },
+/* OpenGL extension GL_EXT_texture_sRGB_decode */
+  { 0x8A48, "TEXTURE_SRGB_DECODE_EXT" },
+  { 0x8A49, "DECODE_EXT" },
+  { 0x8A4A, "SKIP_DECODE_EXT" },
 /* OpenGL extension GL_ATI_blend_equation_separate */
 /* OpenGL extension GL_ATI_separate_stencil */
   { 0x8800, "STENCIL_BACK_FUNC_ATI" },