python: Better sort dictionary keys/values

[mesa.git] / src / mapi / glapi / gen / gl_API.dtd

diff --git a/src/mapi/glapi/gen/gl_API.dtd b/src/mapi/glapi/gen/gl_API.dtd
index 30c646c9244a467fc8ac3283f1ee3f8a3a7cd2ac..b464250777c08c3807836f12655a2c4ba2feefc9 100644 (file)
--- a/src/mapi/glapi/gen/gl_API.dtd
+++ b/src/mapi/glapi/gen/gl_API.dtd
@@ -26,15 +26,21 @@
                    size                NMTOKEN #REQUIRED
                   float               (true | false) "false"
                   unsigned            (true | false) "false"
+                  pointer             (true | false) "false"
                    glx_name            NMTOKEN #IMPLIED>
 <!ATTLIST enum     name                NMTOKEN #REQUIRED
                    count               CDATA   #IMPLIED
                    value               NMTOKEN #REQUIRED>
 <!ATTLIST function name                NMTOKEN #REQUIRED
                    alias               NMTOKEN #IMPLIED
-                   offset              CDATA   #IMPLIED
-                   static_dispatch     (true | false) "true"
-                   vectorequiv         NMTOKEN #IMPLIED>
+                   vectorequiv         NMTOKEN #IMPLIED
+                   es1                 CDATA   "none"
+                   es2                 CDATA   "none"
+                   deprecated          CDATA   "none"
+                   exec                NMTOKEN #IMPLIED
+                   desktop             (true | false) "true"
+                   marshal             NMTOKEN #IMPLIED
+                   marshal_fail        CDATA #IMPLIED>
 <!ATTLIST size     name                NMTOKEN #REQUIRED
                    count               NMTOKEN #IMPLIED
                    mode                (get | set) "set">
@@ -86,7 +92,7 @@ param:
         the stride parameters to Map1f, etc.)
      count - for counted arrays (e.g., the 'lists' parameter to glCallLists),
          the parameter or literal that represents the count.  For functions
-         like glVertex3fv it will be a litteral, for others it will be one of
+         like glVertex3fv it will be a literal, for others it will be one of
          the parameters.
      counter - this parameter is a counter that will be referenced by the
          'count' attribute in another parameter.
@@ -116,6 +122,18 @@ param:
         offset data should be padded to the next even number of dimensions.
         For example, this will insert an empty "height" field after the
         "width" field in the protocol for TexImage1D.
+     marshal - One of "sync", "async", "draw", or "custom", defaulting to
+        async unless one of the arguments is something we know we can't
+        codegen for.  If "sync", we finish any queued glthread work and call
+        the Mesa implementation directly.  If "async", we queue the function
+        call to be performed by glthread.  If "custom", the prototype will be
+        generated but a custom implementation will be present in marshal.c.
+        If "draw", it will follow the "async" rules except that "indices" are
+        ignored (since they may come from a VBO).
+     marshal_fail - an expression that, if it evaluates true, causes glthread
+        to switch back to the Mesa implementation and call it directly.  Used
+        to disable glthread for GL compatibility interactions that we don't
+        want to track state for.
 
 glx:
      rop - Opcode value for "render" commands