glapi: Annotate XML with deprecated="3.1" for deprecated functions.

Future patches will use this annotation when code generating
_mesa_create_exec_table(), to determine which functions should be
skipped in core contexts.

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Paul Berry 2012-10-15 10:52:13 -07:00
parent 11e9d8dd05
commit 89a577080f
7 changed files with 710 additions and 548 deletions

View file

@ -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>

View file

@ -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"/>

View file

@ -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>

View file

@ -8,16 +8,16 @@
<!-- Alias of CURRENT_PROGRAM -->
<enum name="ACTIVE_PROGRAM_EXT" value="0x8B8D"/>
<function name="UseShaderProgramEXT" offset="assign">
<function name="UseShaderProgramEXT" deprecated="3.1" offset="assign">
<param name="type" type="GLenum"/>
<param name="program" type="GLuint"/>
</function>
<function name="ActiveProgramEXT" offset="assign">
<function name="ActiveProgramEXT" deprecated="3.1" offset="assign">
<param name="program" type="GLuint"/>
</function>
<function name="CreateShaderProgramEXT" offset="assign">
<function name="CreateShaderProgramEXT" deprecated="3.1" offset="assign">
<param name="type" type="GLenum"/>
<param name="string" type="const GLchar *"/>
<return type="GLuint"/>

View file

@ -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">

View file

@ -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">

File diff suppressed because it is too large Load diff