Modify the DTD to use NMTOKEN, enumerants, and explicit default values

wherever possible.  Correct a couple mis-uses of the 'counter' attribute
when 'count' was intended.  Fix some errors in the DTD and in the data with
'doubles_in_order'.
This commit is contained in:
Ian Romanick
2005-04-14 22:59:46 +00:00
parent 6cae4f3bc9
commit a3deff2404

View File

@@ -10,54 +10,53 @@
<!ELEMENT return EMPTY> <!ELEMENT return EMPTY>
<!ELEMENT glx EMPTY> <!ELEMENT glx EMPTY>
<!ATTLIST category name CDATA #REQUIRED <!ATTLIST category name NMTOKEN #REQUIRED
number CDATA #IMPLIED> number NMTOKEN #IMPLIED>
<!ATTLIST type name CDATA #REQUIRED <!ATTLIST type name NMTOKEN #REQUIRED
size CDATA #REQUIRED size NMTOKEN #REQUIRED
glx_name CDATA #IMPLIED> glx_name NMTOKEN #IMPLIED>
<!ATTLIST enum name CDATA #REQUIRED <!ATTLIST enum name NMTOKEN #REQUIRED
count CDATA #IMPLIED count CDATA #IMPLIED
value CDATA #REQUIRED> value NMTOKEN #REQUIRED>
<!ATTLIST function name CDATA #REQUIRED <!ATTLIST function name NMTOKEN #REQUIRED
alias CDATA #IMPLIED alias NMTOKEN #IMPLIED
offset CDATA #IMPLIED offset CDATA #IMPLIED
vectorequiv CDATA #IMPLIED> vectorequiv NMTOKEN #IMPLIED>
<!ATTLIST size name CDATA #REQUIRED <!ATTLIST size name NMTOKEN #REQUIRED
count CDATA #IMPLIED count NMTOKEN #IMPLIED
mode CDATA #IMPLIED> mode NMTOKEN #IMPLIED>
<!ATTLIST param name CDATA #REQUIRED <!ATTLIST param name NMTOKEN #REQUIRED
type CDATA #REQUIRED type CDATA #REQUIRED
count CDATA #IMPLIED count NMTOKEN #IMPLIED
counter CDATA #IMPLIED counter (true | false) "false"
count_scale CDATA #IMPLIED count_scale NMTOKEN #IMPLIED
output CDATA #IMPLIED output (true | false) "false"
img_width CDATA #IMPLIED img_width NMTOKEN #IMPLIED
img_height CDATA #IMPLIED img_height NMTOKEN #IMPLIED
img_depth CDATA #IMPLIED img_depth NMTOKEN #IMPLIED
img_extent CDATA #IMPLIED img_extent NMTOKEN #IMPLIED
img_xoff CDATA #IMPLIED img_xoff NMTOKEN #IMPLIED
img_yoff CDATA #IMPLIED img_yoff NMTOKEN #IMPLIED
img_zoff CDATA #IMPLIED img_zoff NMTOKEN #IMPLIED
img_woff CDATA #IMPLIED img_woff NMTOKEN #IMPLIED
img_format CDATA #IMPLIED img_format NMTOKEN #IMPLIED
img_type CDATA #IMPLIED img_type NMTOKEN #IMPLIED
img_target CDATA #IMPLIED img_target NMTOKEN #IMPLIED
img_send_null CDATA #IMPLIED img_send_null (true | false) "false"
img_null_flag CDATA #IMPLIED img_null_flag (true | false) "false"
img_pad_dimensions CDATA #IMPLIED img_pad_dimensions (true | false) "false"
doubles_in_order CDATA #IMPLIED variable_param CDATA #IMPLIED>
variable_param CDATA #IMPLIED> <!ATTLIST return type CDATA "void">
<!ATTLIST return type CDATA #REQUIRED> <!ATTLIST glx rop NMTOKEN #IMPLIED
<!ATTLIST glx rop CDATA #IMPLIED sop NMTOKEN #IMPLIED
sop CDATA #IMPLIED vendorpriv NMTOKEN #IMPLIED
vendorpriv CDATA #IMPLIED large (true | false) "false"
large CDATA #IMPLIED doubles_in_order (true | false) "false"
doubles_in_order CDATA #IMPLIED always_array (true | false) "false"
always_array CDATA #IMPLIED handcode (true | false | client | server) "false"
handcode CDATA #IMPLIED img_reset NMTOKEN #IMPLIED
img_reset CDATA #IMPLIED dimensions_in_reply (true | false) "false"
dimensions_in_reply CDATA #IMPLIED ignore (true | false) "false">
ignore CDATA #IMPLIED>
]> ]>
<!-- <!--
@@ -8044,7 +8043,7 @@ glx:
<function name="SharpenTexFuncSGIS" offset="444"> <function name="SharpenTexFuncSGIS" offset="444">
<param name="target" type="GLenum"/> <param name="target" type="GLenum"/>
<param name="n" type="GLsizei" counter="true"/> <param name="n" type="GLsizei" counter="true"/>
<param name="points" type="const GLfloat *" counter="n" count_scale="2"/> <param name="points" type="const GLfloat *" count="n" count_scale="2"/>
<glx rop="2052" ignore="true"/> <glx rop="2052" ignore="true"/>
</function> </function>
@@ -8391,7 +8390,7 @@ glx:
<category name="GL_SGIS_fog_function" number="64"> <category name="GL_SGIS_fog_function" number="64">
<function name="FogFuncSGIS" offset="?"> <function name="FogFuncSGIS" offset="?">
<param name="n" type="GLsizei" counter="true"/> <param name="n" type="GLsizei" counter="true"/>
<param name="points" type="const GLfloat *" counter="n" count_scale="2"/> <param name="points" type="const GLfloat *" count="n" count_scale="2"/>
<glx rop="2067" ignore="true"/> <glx rop="2067" ignore="true"/>
</function> </function>
@@ -10287,7 +10286,7 @@ glx:
<function name="GenFencesNV" offset="648"> <function name="GenFencesNV" offset="648">
<param name="n" type="GLsizei" counter="true"/> <param name="n" type="GLsizei" counter="true"/>
<param name="fences" type="GLuint *" output="true" counter="n"/> <param name="fences" type="GLuint *" output="true" count="n"/>
<glx ignore="true"/> <glx ignore="true"/>
</function> </function>
@@ -10959,22 +10958,22 @@ glx:
<function name="VertexAttribs2dvNV" offset="632"> <function name="VertexAttribs2dvNV" offset="632">
<param name="index" type="GLuint"/> <param name="index" type="GLuint"/>
<param name="n" type="GLsizei" counter="true"/> <param name="n" type="GLsizei" counter="true"/>
<param name="v" type="const GLdouble *" doubles_in_order="true" count="n" count_scale="2"/> <param name="v" type="const GLdouble *" count="n" count_scale="2"/>
<glx rop="4211"/> <glx rop="4211" doubles_in_order="true"/>
</function> </function>
<function name="VertexAttribs3dvNV" offset="635"> <function name="VertexAttribs3dvNV" offset="635">
<param name="index" type="GLuint"/> <param name="index" type="GLuint"/>
<param name="n" type="GLsizei" counter="true"/> <param name="n" type="GLsizei" counter="true"/>
<param name="v" type="const GLdouble *" doubles_in_order="true" count="n" count_scale="3"/> <param name="v" type="const GLdouble *" count="n" count_scale="3"/>
<glx rop="4212"/> <glx rop="4212" doubles_in_order="true"/>
</function> </function>
<function name="VertexAttribs4dvNV" offset="638"> <function name="VertexAttribs4dvNV" offset="638">
<param name="index" type="GLuint"/> <param name="index" type="GLuint"/>
<param name="n" type="GLsizei" counter="true"/> <param name="n" type="GLsizei" counter="true"/>
<param name="v" type="const GLdouble *" doubles_in_order="true" count="n" count_scale="4"/> <param name="v" type="const GLdouble *" count="n" count_scale="4"/>
<glx rop="4213"/> <glx rop="4213" doubles_in_order="true"/>
</function> </function>
<function name="VertexAttribs4ubvNV" offset="641"> <function name="VertexAttribs4ubvNV" offset="641">