From 784d2f303cbc4fe58843ad0c4fe855cfb441f9e3 Mon Sep 17 00:00:00 2001 From: Paul Berry Date: Thu, 18 Oct 2012 20:58:29 -0700 Subject: [PATCH] glapi: Annotate XML with exec="dynamic" for dynamic functions. Future patches will use this annotation when code generating _mesa_create_exec_table(), to determine which functions should be skipped because Mesa dispatches them differently depending on GL state. Reviewed-by: Jordan Justen Reviewed-by: Matt Turner --- src/mapi/glapi/gen/ARB_base_instance.xml | 9 +- .../gen/ARB_draw_elements_base_vertex.xml | 11 +- src/mapi/glapi/gen/ARB_draw_instanced.xml | 4 +- .../gen/ARB_vertex_type_2_10_10_10_rev.xml | 106 +++++++---- src/mapi/glapi/gen/EXT_gpu_shader4.xml | 28 +-- src/mapi/glapi/gen/EXT_transform_feedback.xml | 2 +- src/mapi/glapi/gen/NV_primitive_restart.xml | 3 +- src/mapi/glapi/gen/gl_API.xml | 177 +++++++++++------- 8 files changed, 208 insertions(+), 132 deletions(-) diff --git a/src/mapi/glapi/gen/ARB_base_instance.xml b/src/mapi/glapi/gen/ARB_base_instance.xml index 8e81553f622..1478e39700c 100644 --- a/src/mapi/glapi/gen/ARB_base_instance.xml +++ b/src/mapi/glapi/gen/ARB_base_instance.xml @@ -8,7 +8,8 @@ - + @@ -16,7 +17,8 @@ - + @@ -25,7 +27,8 @@ - + diff --git a/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml b/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml index 851f1faec81..986654848ca 100644 --- a/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml +++ b/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml @@ -8,7 +8,7 @@ - + @@ -16,7 +16,8 @@ - + @@ -26,7 +27,8 @@ - + @@ -35,7 +37,8 @@ - + diff --git a/src/mapi/glapi/gen/ARB_draw_instanced.xml b/src/mapi/glapi/gen/ARB_draw_instanced.xml index 57bb776ac2e..7ee7629c706 100644 --- a/src/mapi/glapi/gen/ARB_draw_instanced.xml +++ b/src/mapi/glapi/gen/ARB_draw_instanced.xml @@ -8,14 +8,14 @@ - + - + diff --git a/src/mapi/glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml b/src/mapi/glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml index 2fa207a2405..6c6090c1cf0 100644 --- a/src/mapi/glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml +++ b/src/mapi/glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml @@ -7,214 +7,244 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/src/mapi/glapi/gen/EXT_gpu_shader4.xml b/src/mapi/glapi/gen/EXT_gpu_shader4.xml index bf2f6a3ed21..d48d242ff97 100644 --- a/src/mapi/glapi/gen/EXT_gpu_shader4.xml +++ b/src/mapi/glapi/gen/EXT_gpu_shader4.xml @@ -44,25 +44,25 @@ - + - + - + - + @@ -70,25 +70,25 @@ - + - + - + - + @@ -101,17 +101,17 @@ - + - + - + @@ -121,17 +121,17 @@ - + - + - + diff --git a/src/mapi/glapi/gen/EXT_transform_feedback.xml b/src/mapi/glapi/gen/EXT_transform_feedback.xml index dbd7513c7dd..c9b1c532151 100644 --- a/src/mapi/glapi/gen/EXT_transform_feedback.xml +++ b/src/mapi/glapi/gen/EXT_transform_feedback.xml @@ -108,7 +108,7 @@ - + diff --git a/src/mapi/glapi/gen/NV_primitive_restart.xml b/src/mapi/glapi/gen/NV_primitive_restart.xml index aeaa03dd1b1..ba71c5c8e2d 100644 --- a/src/mapi/glapi/gen/NV_primitive_restart.xml +++ b/src/mapi/glapi/gen/NV_primitive_restart.xml @@ -11,7 +11,8 @@ - + diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index 249f956f6bf..7529b9f4a15 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -1147,7 +1147,7 @@ - + @@ -1188,13 +1188,13 @@ + deprecated="3.1" exec="dynamic"> - + @@ -1286,14 +1286,14 @@ + deprecated="3.1" exec="dynamic"> - + @@ -1364,7 +1364,7 @@ + deprecated="3.1" exec="dynamic"> @@ -1373,7 +1373,7 @@ - + @@ -1386,11 +1386,12 @@ - + - + @@ -1438,13 +1439,13 @@ + deprecated="3.1" exec="dynamic"> - + @@ -1630,7 +1631,8 @@ - + @@ -1680,11 +1682,12 @@ + deprecated="3.1" exec="dynamic"> - + @@ -1721,12 +1724,13 @@ + deprecated="3.1" exec="dynamic"> - + @@ -1766,13 +1770,14 @@ + deprecated="3.1" exec="dynamic"> - + @@ -1815,14 +1820,15 @@ + deprecated="3.1" exec="dynamic"> - + @@ -1865,12 +1871,13 @@ + deprecated="3.1" exec="dynamic"> - + @@ -1910,13 +1917,14 @@ + deprecated="3.1" exec="dynamic"> - + @@ -1959,14 +1967,15 @@ + deprecated="3.1" exec="dynamic"> - + @@ -2119,7 +2128,8 @@ - + @@ -2524,7 +2534,7 @@ + deprecated="3.1" exec="dynamic"> @@ -2545,7 +2555,7 @@ + deprecated="3.1" exec="dynamic"> @@ -2555,19 +2565,22 @@ - + - + - + @@ -2576,7 +2589,8 @@ - + @@ -3192,7 +3206,8 @@ - + @@ -3211,14 +3226,16 @@ - + - + @@ -3776,7 +3793,8 @@ - + @@ -4835,14 +4853,14 @@ + deprecated="3.1" exec="dynamic"> + deprecated="3.1" exec="dynamic"> @@ -5961,12 +5979,13 @@ - + - + @@ -6006,13 +6025,14 @@ - + - + @@ -6055,14 +6075,15 @@ - + - + @@ -6108,7 +6129,8 @@ - + @@ -6116,7 +6138,7 @@ - + @@ -6999,12 +7021,13 @@ - + - + @@ -7033,13 +7056,14 @@ - + - + @@ -7070,14 +7094,15 @@ - + - + @@ -7110,7 +7135,8 @@ - + @@ -7118,7 +7144,7 @@ - + @@ -8159,7 +8185,8 @@ - + @@ -8195,13 +8222,15 @@ - + - + @@ -10065,7 +10094,8 @@ - + @@ -10076,11 +10106,12 @@ - + - + @@ -11760,46 +11791,53 @@ + vectorequiv="VertexAttrib1fvNV" deprecated="3.1" + exec="dynamic"> - + + vectorequiv="VertexAttrib2fvNV" deprecated="3.1" + exec="dynamic"> - + + vectorequiv="VertexAttrib3fvNV" deprecated="3.1" + exec="dynamic"> - + + vectorequiv="VertexAttrib4fvNV" deprecated="3.1" + exec="dynamic"> @@ -11807,7 +11845,8 @@ - + -- 2.30.2