[Mesa-dev] [PATCH 04/17] glapi: Annotate XML with deprecated="3.1" for deprecated functions.
Paul Berry
stereotype441 at gmail.com
Thu Nov 1 15:19:10 PDT 2012
Future patches will use this annotation when code generating
_mesa_create_exec_table(), to determine which functions should be
skipped in core contexts.
--
This patch is very large and repetitive, so to make it fit on the
mailing list I've left out the file with the most changes
(gl_API.xml). To see the entire patch in context, please check out
branch "code-gen-api-exec" from
git://github.com/stereotype441/mesa.git.
src/mapi/glapi/gen/APPLE_vertex_array_object.xml | 6 +-
src/mapi/glapi/gen/ARB_robustness.xml | 22 +-
.../glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml | 60 +-
src/mapi/glapi/gen/NV_primitive_restart.xml | 2 +-
src/mapi/glapi/gen/gl_API.dtd | 3 +-
src/mapi/glapi/gen/gl_API.xml | 1159 +++++++++++---------
6 files changed, 707 insertions(+), 545 deletions(-)
diff --git a/src/mapi/glapi/gen/APPLE_vertex_array_object.xml b/src/mapi/glapi/gen/APPLE_vertex_array_object.xml
index bd8427e..2bffc4e 100644
--- a/src/mapi/glapi/gen/APPLE_vertex_array_object.xml
+++ b/src/mapi/glapi/gen/APPLE_vertex_array_object.xml
@@ -5,7 +5,8 @@
<category name="GL_APPLE_vertex_array_object" number="273">
<enum name="VERTEX_ARRAY_BINDING_APPLE" value="0x85B5"/>
- <function name="BindVertexArrayAPPLE" offset="assign" static_dispatch="false">
+ <function name="BindVertexArrayAPPLE" offset="assign"
+ static_dispatch="false" deprecated="3.1">
<param name="array" type="GLuint"/>
</function>
@@ -14,7 +15,8 @@
<param name="arrays" type="const GLuint *" count="n"/>
</function>
- <function name="GenVertexArraysAPPLE" offset="assign" static_dispatch="false">
+ <function name="GenVertexArraysAPPLE" offset="assign"
+ static_dispatch="false" deprecated="3.1">
<param name="n" type="GLsizei"/>
<param name="arrays" type="GLuint *" count="n" output="true"/>
</function>
diff --git a/src/mapi/glapi/gen/ARB_robustness.xml b/src/mapi/glapi/gen/ARB_robustness.xml
index b347ef3..14048bf 100644
--- a/src/mapi/glapi/gen/ARB_robustness.xml
+++ b/src/mapi/glapi/gen/ARB_robustness.xml
@@ -25,21 +25,21 @@
</function>
<!-- OpenGL 1.0 sized buffer queries -->
- <function name="GetnMapdvARB" offset="assign">
+ <function name="GetnMapdvARB" offset="assign" deprecated="3.1">
<param name="target" type="GLenum"/>
<param name="query" type="GLenum"/>
<param name="bufSize" type="GLsizei"/>
<param name="v" type="GLdouble *" output="true"/>
</function>
- <function name="GetnMapfvARB" offset="assign">
+ <function name="GetnMapfvARB" offset="assign" deprecated="3.1">
<param name="target" type="GLenum"/>
<param name="query" type="GLenum"/>
<param name="bufSize" type="GLsizei"/>
<param name="v" type="GLfloat *" output="true"/>
</function>
- <function name="GetnMapivARB" offset="assign">
+ <function name="GetnMapivARB" offset="assign" deprecated="3.1">
<param name="target" type="GLenum"/>
<param name="query" type="GLenum"/>
<param name="bufSize" type="GLsizei"/>
@@ -48,19 +48,19 @@
- <function name="GetnPixelMapfvARB" offset="assign">
+ <function name="GetnPixelMapfvARB" offset="assign" deprecated="3.1">
<param name="map" type="GLenum"/>
<param name="bufSize" type="GLsizei"/>
<param name="values" type="GLfloat *" output="true"/>
</function>
- <function name="GetnPixelMapuivARB" offset="assign">
+ <function name="GetnPixelMapuivARB" offset="assign" deprecated="3.1">
<param name="map" type="GLenum"/>
<param name="bufSize" type="GLsizei"/>
<param name="values" type="GLuint *" output="true"/>
</function>
- <function name="GetnPixelMapusvARB" offset="assign">
+ <function name="GetnPixelMapusvARB" offset="assign" deprecated="3.1">
<param name="map" type="GLenum"/>
<param name="bufSize" type="GLsizei"/>
<param name="values" type="GLushort *" output="true"/>
@@ -95,7 +95,7 @@
<!-- ARB_imaging sized buffer queries -->
- <function name="GetnColorTableARB" offset="assign">
+ <function name="GetnColorTableARB" offset="assign" deprecated="3.1">
<param name="target" type="GLenum"/>
<param name="format" type="GLenum"/>
<param name="type" type="GLenum"/>
@@ -103,7 +103,7 @@
<param name="table" type="GLvoid *" output="true"/>
</function>
- <function name="GetnConvolutionFilterARB" offset="assign">
+ <function name="GetnConvolutionFilterARB" offset="assign" deprecated="3.1">
<param name="target" type="GLenum"/>
<param name="format" type="GLenum"/>
<param name="type" type="GLenum"/>
@@ -111,7 +111,7 @@
<param name="image" type="GLvoid *" output="true"/>
</function>
- <function name="GetnSeparableFilterARB" offset="assign">
+ <function name="GetnSeparableFilterARB" offset="assign" deprecated="3.1">
<param name="target" type="GLenum"/>
<param name="format" type="GLenum"/>
<param name="type" type="GLenum"/>
@@ -122,7 +122,7 @@
<param name="span" type="GLvoid *" output="true"/>
</function>
- <function name="GetnHistogramARB" offset="assign">
+ <function name="GetnHistogramARB" offset="assign" deprecated="3.1">
<param name="target" type="GLenum"/>
<param name="reset" type="GLboolean"/>
<param name="format" type="GLenum"/>
@@ -131,7 +131,7 @@
<param name="values" type="GLvoid *" output="true"/>
</function>
- <function name="GetnMinmaxARB" offset="assign">
+ <function name="GetnMinmaxARB" offset="assign" deprecated="3.1">
<param name="target" type="GLenum"/>
<param name="reset" type="GLboolean"/>
<param name="format" type="GLenum"/>
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 7d12d97..2fa207a 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,160 +7,160 @@
<enum name="INT_2_10_10_10_REV" value = "0x8D9F"/>
- <function name="VertexP2ui" offset="assign">
+ <function name="VertexP2ui" offset="assign" deprecated="3.1">
<param name="type" type="GLenum"/>
<param name="value" type="GLuint"/>
</function>
- <function name="VertexP3ui" offset="assign">
+ <function name="VertexP3ui" offset="assign" deprecated="3.1">
<param name="type" type="GLenum"/>
<param name="value" type="GLuint"/>
</function>
- <function name="VertexP4ui" offset="assign">
+ <function name="VertexP4ui" offset="assign" deprecated="3.1">
<param name="type" type="GLenum"/>
<param name="value" type="GLuint"/>
</function>
- <function name="VertexP2uiv" offset="assign">
+ <function name="VertexP2uiv" offset="assign" deprecated="3.1">
<param name="type" type="GLenum"/>
<param name="value" type="const GLuint *"/>
</function>
- <function name="VertexP3uiv" offset="assign">
+ <function name="VertexP3uiv" offset="assign" deprecated="3.1">
<param name="type" type="GLenum"/>
<param name="value" type="const GLuint *"/>
</function>
- <function name="VertexP4uiv" offset="assign">
+ <function name="VertexP4uiv" offset="assign" deprecated="3.1">
<param name="type" type="GLenum"/>
<param name="value" type="const GLuint *"/>
</function>
- <function name="TexCoordP1ui" offset="assign">
+ <function name="TexCoordP1ui" offset="assign" deprecated="3.1">
<param name="type" type="GLenum"/>
<param name="coords" type="GLuint"/>
</function>
- <function name="TexCoordP2ui" offset="assign">
+ <function name="TexCoordP2ui" offset="assign" deprecated="3.1">
<param name="type" type="GLenum"/>
<param name="coords" type="GLuint"/>
</function>
- <function name="TexCoordP3ui" offset="assign">
+ <function name="TexCoordP3ui" offset="assign" deprecated="3.1">
<param name="type" type="GLenum"/>
<param name="coords" type="GLuint"/>
</function>
- <function name="TexCoordP4ui" offset="assign">
+ <function name="TexCoordP4ui" offset="assign" deprecated="3.1">
<param name="type" type="GLenum"/>
<param name="coords" type="GLuint"/>
</function>
- <function name="TexCoordP1uiv" offset="assign">
+ <function name="TexCoordP1uiv" offset="assign" deprecated="3.1">
<param name="type" type="GLenum"/>
<param name="coords" type="const GLuint *"/>
</function>
- <function name="TexCoordP2uiv" offset="assign">
+ <function name="TexCoordP2uiv" offset="assign" deprecated="3.1">
<param name="type" type="GLenum"/>
<param name="coords" type="const GLuint *"/>
</function>
- <function name="TexCoordP3uiv" offset="assign">
+ <function name="TexCoordP3uiv" offset="assign" deprecated="3.1">
<param name="type" type="GLenum"/>
<param name="coords" type="const GLuint *"/>
</function>
- <function name="TexCoordP4uiv" offset="assign">
+ <function name="TexCoordP4uiv" offset="assign" deprecated="3.1">
<param name="type" type="GLenum"/>
<param name="coords" type="const GLuint *"/>
</function>
- <function name="MultiTexCoordP1ui" offset="assign">
+ <function name="MultiTexCoordP1ui" offset="assign" deprecated="3.1">
<param name="texture" type="GLenum"/>
<param name="type" type="GLenum"/>
<param name="coords" type="GLuint"/>
</function>
- <function name="MultiTexCoordP2ui" offset="assign">
+ <function name="MultiTexCoordP2ui" offset="assign" deprecated="3.1">
<param name="texture" type="GLenum"/>
<param name="type" type="GLenum"/>
<param name="coords" type="GLuint"/>
</function>
- <function name="MultiTexCoordP3ui" offset="assign">
+ <function name="MultiTexCoordP3ui" offset="assign" deprecated="3.1">
<param name="texture" type="GLenum"/>
<param name="type" type="GLenum"/>
<param name="coords" type="GLuint"/>
</function>
- <function name="MultiTexCoordP4ui" offset="assign">
+ <function name="MultiTexCoordP4ui" offset="assign" deprecated="3.1">
<param name="texture" type="GLenum"/>
<param name="type" type="GLenum"/>
<param name="coords" type="GLuint"/>
</function>
- <function name="MultiTexCoordP1uiv" offset="assign">
+ <function name="MultiTexCoordP1uiv" offset="assign" deprecated="3.1">
<param name="texture" type="GLenum"/>
<param name="type" type="GLenum"/>
<param name="coords" type="const GLuint *"/>
</function>
- <function name="MultiTexCoordP2uiv" offset="assign">
+ <function name="MultiTexCoordP2uiv" offset="assign" deprecated="3.1">
<param name="texture" type="GLenum"/>
<param name="type" type="GLenum"/>
<param name="coords" type="const GLuint *"/>
</function>
- <function name="MultiTexCoordP3uiv" offset="assign">
+ <function name="MultiTexCoordP3uiv" offset="assign" deprecated="3.1">
<param name="texture" type="GLenum"/>
<param name="type" type="GLenum"/>
<param name="coords" type="const GLuint *"/>
</function>
- <function name="MultiTexCoordP4uiv" offset="assign">
+ <function name="MultiTexCoordP4uiv" offset="assign" deprecated="3.1">
<param name="texture" type="GLenum"/>
<param name="type" type="GLenum"/>
<param name="coords" type="const GLuint *"/>
</function>
- <function name="NormalP3ui" offset="assign">
+ <function name="NormalP3ui" offset="assign" deprecated="3.1">
<param name="type" type="GLenum"/>
<param name="coords" type="GLuint"/>
</function>
- <function name="NormalP3uiv" offset="assign">
+ <function name="NormalP3uiv" offset="assign" deprecated="3.1">
<param name="type" type="GLenum"/>
<param name="coords" type="const GLuint *"/>
</function>
- <function name="ColorP3ui" offset="assign">
+ <function name="ColorP3ui" offset="assign" deprecated="3.1">
<param name="type" type="GLenum"/>
<param name="color" type="GLuint"/>
</function>
- <function name="ColorP4ui" offset="assign">
+ <function name="ColorP4ui" offset="assign" deprecated="3.1">
<param name="type" type="GLenum"/>
<param name="color" type="GLuint"/>
</function>
- <function name="ColorP3uiv" offset="assign">
+ <function name="ColorP3uiv" offset="assign" deprecated="3.1">
<param name="type" type="GLenum"/>
<param name="color" type="const GLuint *"/>
</function>
- <function name="ColorP4uiv" offset="assign">
+ <function name="ColorP4uiv" offset="assign" deprecated="3.1">
<param name="type" type="GLenum"/>
<param name="color" type="const GLuint *"/>
</function>
- <function name="SecondaryColorP3ui" offset="assign">
+ <function name="SecondaryColorP3ui" offset="assign" deprecated="3.1">
<param name="type" type="GLenum"/>
<param name="color" type="GLuint"/>
</function>
- <function name="SecondaryColorP3uiv" offset="assign">
+ <function name="SecondaryColorP3uiv" offset="assign" deprecated="3.1">
<param name="type" type="GLenum"/>
<param name="color" type="const GLuint *"/>
</function>
diff --git a/src/mapi/glapi/gen/NV_primitive_restart.xml b/src/mapi/glapi/gen/NV_primitive_restart.xml
index abe7dda..aeaa03d 100644
--- a/src/mapi/glapi/gen/NV_primitive_restart.xml
+++ b/src/mapi/glapi/gen/NV_primitive_restart.xml
@@ -11,7 +11,7 @@
<enum name="PRIMITIVE_RESTART_NV" value="0x8558"/>
<enum name="PRIMITIVE_RESTART_INDEX_NV" value="0x8559"/>
- <function name="PrimitiveRestartNV" offset="assign">
+ <function name="PrimitiveRestartNV" offset="assign" deprecated="3.1">
</function>
<function name="PrimitiveRestartIndexNV" offset="assign">
diff --git a/src/mapi/glapi/gen/gl_API.dtd b/src/mapi/glapi/gen/gl_API.dtd
index db33500..194a2fc 100644
--- a/src/mapi/glapi/gen/gl_API.dtd
+++ b/src/mapi/glapi/gen/gl_API.dtd
@@ -37,7 +37,8 @@
static_dispatch (true | false) "true"
vectorequiv NMTOKEN #IMPLIED
es1 CDATA "none"
- es2 CDATA "none">
+ es2 CDATA "none"
+ deprecated CDATA "none">
<!ATTLIST size name NMTOKEN #REQUIRED
count NMTOKEN #IMPLIED
mode (get | set) "set">
--
1.8.0
More information about the mesa-dev
mailing list