From b3e1e62c45f525cdd332073aaa34d8452cb23374 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 19 Nov 2012 10:47:23 +0100 Subject: git update 19 nov 2012 fontconfig: c20ac78b01df3f0919352bba16b5b48b3b5d4d6d libxcb: 76a2166de9c80b35f987fdc3f3a228bafa0de94e mesa: ddb901fbf4489ffcd85d3320f23913eb1d4fbdfe pixman: 44dd746bb68625b2f6be77c3f80292b45defe9d7 xserver: 6a6c3afe71ac82a93d9fd0034dd5bbdcf0eae1ea xkeyboard-config: 709e05c069428236ca2567e784c9971eecc8ca50 --- .../mapi/glapi/gen/APPLE_vertex_array_object.xml | 6 +- .../src/mapi/glapi/gen/ARB_color_buffer_float.xml | 3 +- mesalib/src/mapi/glapi/gen/ARB_draw_buffers.xml | 9 +- .../src/mapi/glapi/gen/ARB_draw_buffers_blend.xml | 9 +- .../src/mapi/glapi/gen/ARB_framebuffer_object.xml | 71 +- .../src/mapi/glapi/gen/ARB_geometry_shader4.xml | 2 +- .../src/mapi/glapi/gen/ARB_instanced_arrays.xml | 2 +- .../mapi/glapi/gen/ARB_texture_buffer_object.xml | 2 +- .../src/mapi/glapi/gen/ARB_vertex_array_object.xml | 6 +- mesalib/src/mapi/glapi/gen/EXT_draw_buffers2.xml | 12 +- .../src/mapi/glapi/gen/EXT_framebuffer_object.xml | 84 +- mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml | 46 +- .../src/mapi/glapi/gen/EXT_provoking_vertex.xml | 4 +- mesalib/src/mapi/glapi/gen/EXT_texture_array.xml | 5 +- mesalib/src/mapi/glapi/gen/EXT_texture_integer.xml | 8 +- .../src/mapi/glapi/gen/EXT_transform_feedback.xml | 14 +- mesalib/src/mapi/glapi/gen/GL3x.xml | 86 +- .../src/mapi/glapi/gen/NV_conditional_render.xml | 4 +- .../src/mapi/glapi/gen/NV_primitive_restart.xml | 2 +- mesalib/src/mapi/glapi/gen/OES_fixed_point.xml | 191 +- .../src/mapi/glapi/gen/OES_single_precision.xml | 20 +- mesalib/src/mapi/glapi/gen/es_EXT.xml | 73 +- mesalib/src/mapi/glapi/gen/gl_API.dtd | 3 +- mesalib/src/mapi/glapi/gen/gl_API.xml | 1946 ++++++++++---------- mesalib/src/mapi/glapi/gen/gl_XML.py | 52 +- mesalib/src/mapi/glapi/gen/gl_and_es_API.xml | 172 +- mesalib/src/mapi/glapi/gen/gl_genexec.py | 5 +- 27 files changed, 1351 insertions(+), 1486 deletions(-) (limited to 'mesalib/src/mapi/glapi') diff --git a/mesalib/src/mapi/glapi/gen/APPLE_vertex_array_object.xml b/mesalib/src/mapi/glapi/gen/APPLE_vertex_array_object.xml index 2bffc4e08..5eb53b14e 100644 --- a/mesalib/src/mapi/glapi/gen/APPLE_vertex_array_object.xml +++ b/mesalib/src/mapi/glapi/gen/APPLE_vertex_array_object.xml @@ -10,9 +10,9 @@ - + - + - + diff --git a/mesalib/src/mapi/glapi/gen/ARB_color_buffer_float.xml b/mesalib/src/mapi/glapi/gen/ARB_color_buffer_float.xml index 7acf27155..edc10436e 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_color_buffer_float.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_color_buffer_float.xml @@ -14,10 +14,9 @@ - + - diff --git a/mesalib/src/mapi/glapi/gen/ARB_draw_buffers.xml b/mesalib/src/mapi/glapi/gen/ARB_draw_buffers.xml index 3d4717267..45184eb04 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_draw_buffers.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_draw_buffers.xml @@ -55,10 +55,9 @@ - - - - + + + @@ -115,7 +114,7 @@ - + diff --git a/mesalib/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml b/mesalib/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml index c08017aa5..0b6947cc5 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml @@ -8,25 +8,24 @@ - + - + - + - + diff --git a/mesalib/src/mapi/glapi/gen/ARB_framebuffer_object.xml b/mesalib/src/mapi/glapi/gen/ARB_framebuffer_object.xml index c9649aced..87eda93eb 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_framebuffer_object.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_framebuffer_object.xml @@ -140,33 +140,38 @@ - + + - + + - + + - + + - + + @@ -178,91 +183,101 @@ - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + @@ -273,10 +288,12 @@ + - + + diff --git a/mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml b/mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml index 73f0a9c3d..e62047c9b 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml @@ -38,7 +38,7 @@ - + diff --git a/mesalib/src/mapi/glapi/gen/ARB_instanced_arrays.xml b/mesalib/src/mapi/glapi/gen/ARB_instanced_arrays.xml index 9a30b0c9e..907a9d4b8 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_instanced_arrays.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_instanced_arrays.xml @@ -10,7 +10,7 @@ - + diff --git a/mesalib/src/mapi/glapi/gen/ARB_texture_buffer_object.xml b/mesalib/src/mapi/glapi/gen/ARB_texture_buffer_object.xml index 8884591ca..ae0d689e5 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_texture_buffer_object.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_texture_buffer_object.xml @@ -11,7 +11,7 @@ - + diff --git a/mesalib/src/mapi/glapi/gen/ARB_vertex_array_object.xml b/mesalib/src/mapi/glapi/gen/ARB_vertex_array_object.xml index 872548d1a..f2277d2bc 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_vertex_array_object.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_vertex_array_object.xml @@ -14,9 +14,9 @@ - + - + @@ -24,7 +24,7 @@ - + diff --git a/mesalib/src/mapi/glapi/gen/EXT_draw_buffers2.xml b/mesalib/src/mapi/glapi/gen/EXT_draw_buffers2.xml index affd55a5f..7a22651c2 100644 --- a/mesalib/src/mapi/glapi/gen/EXT_draw_buffers2.xml +++ b/mesalib/src/mapi/glapi/gen/EXT_draw_buffers2.xml @@ -8,7 +8,7 @@ - + @@ -16,29 +16,29 @@ - + - + - + - + - + diff --git a/mesalib/src/mapi/glapi/gen/EXT_framebuffer_object.xml b/mesalib/src/mapi/glapi/gen/EXT_framebuffer_object.xml index 4f418f7b6..85a05f6ed 100644 --- a/mesalib/src/mapi/glapi/gen/EXT_framebuffer_object.xml +++ b/mesalib/src/mapi/glapi/gen/EXT_framebuffer_object.xml @@ -15,19 +15,19 @@ - + - + - + - + - + @@ -73,122 +73,105 @@ - + - - + - - - - - + + + - - - - + + + - + - - + - - + - + - - + - - - - - + + + - - - - + + + - + - - + - - + - - + - - + - - + - - + - + - @@ -201,7 +184,7 @@ - + @@ -212,7 +195,6 @@ - diff --git a/mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml b/mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml index b008f2e65..d204c3fc7 100644 --- a/mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml +++ b/mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml @@ -96,8 +96,7 @@ - + @@ -117,8 +116,7 @@ - + @@ -138,31 +136,27 @@ - + - + - + - + - + @@ -170,37 +164,37 @@ - + - + - + - + - + - + @@ -208,43 +202,43 @@ - + - + - + - + - + - + - + diff --git a/mesalib/src/mapi/glapi/gen/EXT_provoking_vertex.xml b/mesalib/src/mapi/glapi/gen/EXT_provoking_vertex.xml index 71d2c7290..eb872098d 100644 --- a/mesalib/src/mapi/glapi/gen/EXT_provoking_vertex.xml +++ b/mesalib/src/mapi/glapi/gen/EXT_provoking_vertex.xml @@ -13,7 +13,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/mesalib/src/mapi/glapi/gen/EXT_texture_array.xml b/mesalib/src/mapi/glapi/gen/EXT_texture_array.xml index b5b8bd406..c68c1fceb 100644 --- a/mesalib/src/mapi/glapi/gen/EXT_texture_array.xml +++ b/mesalib/src/mapi/glapi/gen/EXT_texture_array.xml @@ -26,16 +26,15 @@ - + - + - diff --git a/mesalib/src/mapi/glapi/gen/EXT_texture_integer.xml b/mesalib/src/mapi/glapi/gen/EXT_texture_integer.xml index dac399964..aca21f4b1 100644 --- a/mesalib/src/mapi/glapi/gen/EXT_texture_integer.xml +++ b/mesalib/src/mapi/glapi/gen/EXT_texture_integer.xml @@ -69,25 +69,25 @@ - + - + - + - + diff --git a/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml b/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml index e9b27582a..e4b310ec3 100644 --- a/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml +++ b/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml @@ -24,7 +24,7 @@ - + @@ -39,29 +39,27 @@ - + - + - + - + - + diff --git a/mesalib/src/mapi/glapi/gen/GL3x.xml b/mesalib/src/mapi/glapi/gen/GL3x.xml index ad12102c6..83b5d499a 100644 --- a/mesalib/src/mapi/glapi/gen/GL3x.xml +++ b/mesalib/src/mapi/glapi/gen/GL3x.xml @@ -150,14 +150,15 @@ - + + - + @@ -165,29 +166,29 @@ - + - + - + - + - + @@ -195,26 +196,26 @@ - + - + - + - + - + @@ -222,20 +223,20 @@ - + - + - + @@ -247,17 +248,17 @@ - + - + - + @@ -265,13 +266,13 @@ - + - + @@ -329,7 +330,7 @@ - + @@ -349,7 +350,7 @@ - + @@ -369,51 +370,51 @@ - + - + - + - + - + - + - + - + - + @@ -421,25 +422,25 @@ - + - + - + - + @@ -447,25 +448,25 @@ - + - + - + - + @@ -556,13 +557,13 @@ - + - + @@ -625,8 +626,7 @@ - + diff --git a/mesalib/src/mapi/glapi/gen/NV_conditional_render.xml b/mesalib/src/mapi/glapi/gen/NV_conditional_render.xml index 8bb5c22ca..926b26294 100644 --- a/mesalib/src/mapi/glapi/gen/NV_conditional_render.xml +++ b/mesalib/src/mapi/glapi/gen/NV_conditional_render.xml @@ -13,12 +13,12 @@ - + - + diff --git a/mesalib/src/mapi/glapi/gen/NV_primitive_restart.xml b/mesalib/src/mapi/glapi/gen/NV_primitive_restart.xml index d19fc8cf1..39edafe31 100644 --- a/mesalib/src/mapi/glapi/gen/NV_primitive_restart.xml +++ b/mesalib/src/mapi/glapi/gen/NV_primitive_restart.xml @@ -15,7 +15,7 @@ exec="dynamic"> - + diff --git a/mesalib/src/mapi/glapi/gen/OES_fixed_point.xml b/mesalib/src/mapi/glapi/gen/OES_fixed_point.xml index ad775728f..d62d6e2ec 100644 --- a/mesalib/src/mapi/glapi/gen/OES_fixed_point.xml +++ b/mesalib/src/mapi/glapi/gen/OES_fixed_point.xml @@ -13,53 +13,52 @@ - + - + - + - + - + - + - + - + - + @@ -68,63 +67,63 @@ - + - + - + - + - + - + - + - - + + - + - + - + - - + + - + @@ -132,15 +131,15 @@ - + - + @@ -149,149 +148,149 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + es1="1.0" desktop="false"> + es1="1.0" desktop="false"> + es1="1.0" desktop="false"> diff --git a/mesalib/src/mapi/glapi/gen/OES_single_precision.xml b/mesalib/src/mapi/glapi/gen/OES_single_precision.xml index 8a6c27194..8346b64ee 100644 --- a/mesalib/src/mapi/glapi/gen/OES_single_precision.xml +++ b/mesalib/src/mapi/glapi/gen/OES_single_precision.xml @@ -11,10 +11,10 @@ - + - + - + - + - + @@ -39,8 +39,8 @@ - + diff --git a/mesalib/src/mapi/glapi/gen/es_EXT.xml b/mesalib/src/mapi/glapi/gen/es_EXT.xml index c0bbbfae1..0f6746d2a 100644 --- a/mesalib/src/mapi/glapi/gen/es_EXT.xml +++ b/mesalib/src/mapi/glapi/gen/es_EXT.xml @@ -10,7 +10,7 @@ - @@ -24,7 +24,7 @@ - @@ -73,7 +73,7 @@ + es1="1.0" desktop="false"> @@ -82,12 +82,12 @@ + es1="1.0" desktop="false"> + es1="1.0" desktop="false"> @@ -96,12 +96,12 @@ + es1="1.0" desktop="false"> + es1="1.0" desktop="false"> @@ -110,12 +110,12 @@ + es1="1.0" desktop="false"> + es1="1.0" desktop="false"> @@ -124,7 +124,7 @@ + es1="1.0" desktop="false"> @@ -177,39 +177,39 @@ - - - - @@ -217,7 +217,7 @@ - @@ -226,25 +226,25 @@ - - - @@ -253,26 +253,26 @@ - - - @@ -343,8 +343,7 @@ + static_dispatch="false" es1="1.0" desktop="false"> @@ -360,7 +359,7 @@ + es1="1.0" desktop="false"> @@ -460,21 +459,21 @@ - - - @@ -506,7 +505,7 @@ - @@ -520,7 +519,7 @@ @@ -548,7 +547,7 @@ - @@ -680,7 +679,7 @@ - @@ -691,7 +690,7 @@ - + @@ -766,7 +765,7 @@ - + diff --git a/mesalib/src/mapi/glapi/gen/gl_API.dtd b/mesalib/src/mapi/glapi/gen/gl_API.dtd index 066d5da52..ab321fad0 100644 --- a/mesalib/src/mapi/glapi/gen/gl_API.dtd +++ b/mesalib/src/mapi/glapi/gen/gl_API.dtd @@ -40,8 +40,7 @@ es2 CDATA "none" deprecated CDATA "none" exec NMTOKEN #IMPLIED - desktop (true | false) "true" - mesa_name CDATA #IMPLIED> + desktop (true | false) "true"> diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml index 9645fdb81..a47316a83 100644 --- a/mesalib/src/mapi/glapi/gen/gl_API.xml +++ b/mesalib/src/mapi/glapi/gen/gl_API.xml @@ -1164,27 +1164,25 @@ + deprecated="3.1"> - + + deprecated="3.1"> - + @@ -1202,94 +1200,87 @@ + deprecated="3.1"> - + + deprecated="3.1"> - + + deprecated="3.1"> - + + deprecated="3.1"> - + + deprecated="3.1"> - + + deprecated="3.1"> - + + deprecated="3.1"> - + @@ -1308,71 +1299,66 @@ + deprecated="3.1"> - + + deprecated="3.1"> - + + deprecated="3.1"> - + + deprecated="3.1"> - + + deprecated="3.1"> - + @@ -1382,7 +1368,7 @@ - + @@ -1391,12 +1377,11 @@ - + - + @@ -1411,46 +1396,44 @@ - + - + - + - + + deprecated="3.1"> - + + deprecated="3.1"> - + @@ -1468,25 +1451,25 @@ + deprecated="3.1"> - + + deprecated="3.1"> - + @@ -1635,15 +1618,14 @@ - + - + @@ -1657,46 +1639,44 @@ - + - + - + - + - + + deprecated="3.1"> - + @@ -1713,32 +1693,32 @@ + deprecated="3.1"> - + + deprecated="3.1"> - + + deprecated="3.1"> - + @@ -1756,35 +1736,35 @@ + deprecated="3.1"> - + + deprecated="3.1"> - + + deprecated="3.1"> - + @@ -1803,38 +1783,38 @@ + deprecated="3.1"> - + + deprecated="3.1"> - + + deprecated="3.1"> - + @@ -1854,38 +1834,38 @@ + deprecated="3.1"> - + + deprecated="3.1"> - + + deprecated="3.1"> - + @@ -1903,35 +1883,35 @@ + deprecated="3.1"> - + + deprecated="3.1"> - + + deprecated="3.1"> - + @@ -1950,38 +1930,38 @@ + deprecated="3.1"> - + + deprecated="3.1"> - + + deprecated="3.1"> - + @@ -2001,27 +1981,27 @@ + deprecated="3.1"> - + + deprecated="3.1"> - + @@ -2141,8 +2121,7 @@ - + @@ -2157,14 +2136,14 @@ - + - + @@ -2545,12 +2524,11 @@ + deprecated="3.1"> - + @@ -2560,20 +2538,18 @@ - + + deprecated="3.1"> - + @@ -2584,8 +2560,7 @@ - + @@ -3439,11 +3414,11 @@ + deprecated="3.1"> - + @@ -4343,26 +4318,29 @@ - + + - + + - + - + - + + - + - + - + + - + - + - + + - + - + - + + - + - + - + + - + - + - + + - + - + - + + - + - + - + + - + - + - + + - + @@ -4518,10 +4504,11 @@ - + - + + - + @@ -4548,14 +4535,15 @@ - + - + + - + @@ -4563,39 +4551,45 @@ - + - + + - + + - + + - + + - + + - + + - + @@ -4603,33 +4597,36 @@ - - + + + - + - - + + + - + - - + + + - + @@ -4639,12 +4636,13 @@ - - + + + - + @@ -4652,24 +4650,27 @@ - - + + + - + - - + + + - + + @@ -4687,19 +4688,19 @@ - + - + - + - + @@ -4788,11 +4789,12 @@ - + + @@ -4803,26 +4805,29 @@ - + - - + + + - + + - + + @@ -4833,48 +4838,54 @@ - + + - + - + + - + + - + - + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + - - + + + - + + - + + - + + - + + @@ -5099,113 +5131,132 @@ - + + - + - - + + + - + - - + + + - - - + + + + - + + - + + - + + - + - - + + + - + + - + + - + + - + + - - - + + + + - + + - + + - + + - + + - + + - + + @@ -5295,8 +5346,8 @@ - - + + @@ -5304,15 +5355,17 @@ - + + - + + @@ -5343,17 +5396,19 @@ - + + - + + @@ -5383,19 +5438,20 @@ - + + - + + - + @@ -5404,9 +5460,10 @@ + - + @@ -5415,6 +5472,7 @@ + @@ -5425,11 +5483,12 @@ - + + @@ -5462,63 +5521,71 @@ - + + - + + - + + - + - + + - + + - + + - + + - + + @@ -5533,162 +5600,186 @@ - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + - + - + + @@ -5698,23 +5789,25 @@ - + - + - + + - + - + - + + @@ -5725,25 +5818,27 @@ - + - + - + + - + - + - + + @@ -5755,62 +5850,71 @@ - + - + - + + - + - + + - + - + + - + - + + - + - + - + + - + - + + - + - + + - + + - + - + - + + @@ -5823,42 +5927,48 @@ - + + - + - + - + + - + + - + + - + + - + + @@ -5983,26 +6093,23 @@ - + - - + - - + - + - - + - + - + - - + - + - + - - + - + - + - - + - + - + - - + - + - + - - + - + - + - - + - + - + - - + - + - + - - + - + @@ -6158,10 +6257,9 @@ - + - - + - + @@ -6188,14 +6286,13 @@ - + - - + - + @@ -6203,10 +6300,9 @@ - + - - + @@ -6218,24 +6314,20 @@ - + - - + - - + - - + - @@ -6268,10 +6360,9 @@ - + - @@ -6328,7 +6419,7 @@ - + @@ -6336,35 +6427,32 @@ - - - + + - + - - - + + - + - - - + + - + @@ -6372,14 +6460,13 @@ - - - - - + + + + - + @@ -6387,33 +6474,30 @@ - - - + + - + - - - + + - + - + - @@ -6423,25 +6507,25 @@ - + - + - + - + - + - + @@ -6771,79 +6855,79 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -6853,35 +6937,35 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -7026,37 +7110,33 @@ - + - - + - + - - + - + - - + - + - + - - + - + - + - - + - + - + - - + - + - + - - + - + - + - - + - + - + - - + - + @@ -7173,10 +7248,9 @@ - + - - + - + @@ -7203,14 +7277,13 @@ - + - - + - + @@ -7218,90 +7291,76 @@ - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - - + - @@ -7312,24 +7371,28 @@ - + + - - - + + + + - + + - + + - + @@ -7520,10 +7583,10 @@ - + - + @@ -7559,18 +7622,18 @@ - - - + + + - + - + @@ -7586,147 +7649,128 @@ - + - - + - - + + - - + - - - + + - - - - + + + - - - - + + + - + - - + - + - - + - + - - - + + - + - - + - - + - - + - + - - + + - - + + - - - - + + + - - - - + + + - + - - + - - + - - + - - + - + - - + - + - - + @@ -7784,17 +7828,15 @@ - + - - + - @@ -7808,159 +7850,137 @@ - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - @@ -7993,44 +8013,39 @@ - + - - + - - - - - + + + + - + - - + - + - - + - + - - - + + @@ -8043,29 +8058,26 @@ - + - - + - - - - - + + + + - + - @@ -8207,12 +8219,12 @@ - + - + @@ -9302,28 +9314,26 @@ - + - + - + - + - + - - + - - + @@ -10028,32 +10038,26 @@ - + - - - + + - + - - - + + @@ -10067,82 +10071,66 @@ - + - - - + + - + - - - + + - + - - - + + - + - - - + + - + - - - + + - + - @@ -10153,12 +10141,11 @@ - + - - + - - - + + - + - @@ -10788,12 +10772,11 @@ - + - @@ -11040,95 +11023,80 @@ - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - - + + - + - - + - - + - - + - @@ -11609,18 +11577,14 @@ - + - - - - - + + + - - - - + + + - + - + - + - + @@ -12493,21 +12428,19 @@ - - + + - + - - + - - + @@ -12684,10 +12617,9 @@ - + - @@ -12846,7 +12778,7 @@ - + @@ -12904,12 +12836,12 @@ - + - + @@ -12917,7 +12849,7 @@ - + @@ -12965,24 +12897,24 @@ - + - + - + - + - + - + diff --git a/mesalib/src/mapi/glapi/gen/gl_XML.py b/mesalib/src/mapi/glapi/gen/gl_XML.py index 47f8dd5b9..227e9fcd9 100644 --- a/mesalib/src/mapi/glapi/gen/gl_XML.py +++ b/mesalib/src/mapi/glapi/gen/gl_XML.py @@ -594,47 +594,6 @@ class gl_parameter(object): return self.type_expr.format_string() -# Regular expression used to parse "mesa_name" attributes. A -# mesa_name attribute describes how to adjust a GL function name -# suffix to obtain the name of the function in Mesa that implements -# the functionality. The attribute string consists of a part preceded -# by a "-", indicating the suffix to remove, and a part preceded by a -# "+" indicating the suffix to add. Either part is optional. -# -# For example: -# -# ... -# ... -# -# means that EnableIndexedEXT is implemented by a Mesa function called -# _mesa_EnableIndexed, and IsProgramNV is implemented by a Mesa function -# called _mesa_IsProgramARB. -# -# Note: the prefix "_mesa_" is handled separately, by the "exec" -# attribute. -name_modification_regexp = re.compile( - r'^(-(?P[a-zA-Z0-9_]+))?(\+(?P[a-zA-Z0-9_]+))?$') - - -# Interpret a "mesa_name" attribute (see above) to determine the -# appropriate suffix for the Mesa function implementing a piece of GL -# functionality, and return the properly suffixed name. -def interpret_name_modification(name, mod): - m = name_modification_regexp.match(mod) - if m is None: - raise Exception('Unintelligible mesa_name property: {0!r}'.format(mod)) - new_name = name - if m.group('minus'): - if not new_name.endswith(m.group('minus')): - raise Exception( - 'Cannot subtract suffix {0!r} from function {1}'.format( - m.group('minus'), name)) - new_name = new_name[:-len(m.group('minus'))] - if m.group('plus'): - new_name += m.group('plus') - return new_name - - class gl_function( gl_item ): def __init__(self, element, context): self.context = context @@ -649,7 +608,6 @@ class gl_function( gl_item ): self.exec_flavor = 'mesa' self.desktop = True self.deprecated = None - self.mesa_name = None # self.entry_point_api_map[name][api] is a decimal value # indicating the earliest version of the given API in which @@ -725,8 +683,8 @@ class gl_function( gl_item ): else: true_name = name - # Only try to set the offset and mesa_name when a - # non-alias entry-point is being processed. + # Only try to set the offset when a non-alias entry-point + # is being processed. offset = element.nsProp( "offset", None ) if offset: @@ -738,12 +696,6 @@ class gl_function( gl_item ): if offset == "assign": self.assign_offset = 1 - mesa_name = element.nsProp('mesa_name', None) - if mesa_name is None: - self.mesa_name = name - else: - self.mesa_name = interpret_name_modification(name, mesa_name) - if not self.name: self.name = true_name diff --git a/mesalib/src/mapi/glapi/gen/gl_and_es_API.xml b/mesalib/src/mapi/glapi/gen/gl_and_es_API.xml index 205f74fa9..18b0eb4ec 100644 --- a/mesalib/src/mapi/glapi/gen/gl_and_es_API.xml +++ b/mesalib/src/mapi/glapi/gen/gl_and_es_API.xml @@ -18,53 +18,53 @@ - + - + - + - + - + - + - + - + @@ -73,63 +73,63 @@ - + - + - + - + - + - + - + - + - + - + @@ -137,15 +137,15 @@ - + - + @@ -154,69 +154,69 @@ - + - + - + - + - + - + - + - + - + - + @@ -225,8 +225,8 @@ - + @@ -238,80 +238,80 @@ - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/mesalib/src/mapi/glapi/gen/gl_genexec.py b/mesalib/src/mapi/glapi/gen/gl_genexec.py index adfa5957e..9b716894c 100644 --- a/mesalib/src/mapi/glapi/gen/gl_genexec.py +++ b/mesalib/src/mapi/glapi/gen/gl_genexec.py @@ -32,10 +32,7 @@ import sys, getopt exec_flavor_map = { - 'check': '_check_', 'dynamic': None, - 'es': '_es_', - 'loopback': 'loopback_', 'mesa': '_mesa_', 'skip': None, } @@ -189,7 +186,7 @@ class PrintCode(gl_XML.gl_print_base): # dynamically. continue settings_by_condition[condition].append( - 'SET_{0}(exec, {1}{2});'.format(f.name, prefix, f.mesa_name)) + 'SET_{0}(exec, {1}{0});'.format(f.name, prefix, f.name)) # Print out an if statement for each unique condition, with # the SET_* calls nested inside it. for condition in sorted(settings_by_condition.keys()): -- cgit v1.2.3