@@ -13,6 +13,12 @@ appropriate each line is in a widely supported format, usable with e.g.

 -q`][]` <(glregistry audit)`) and [GNU Emacs][]' [Compilation Mode][] ([`M-x

 compile`][]` glregistry audit`).

+The vendors `KHR` (Khronos), `ARB` (Architecture Review Board), and `EXT`

+(Extension) are treated specially and are sorted before other vendors. When

+querying for enums, either directly or indirectly, enums with the same name,

+except for one of these vendors added as a suffix, and the same value is

+matched as well.

+

 Note that only the OpenGL (not OpenGL ES) API, and only the core (not

 compatibility) [profile][] is considered.

@@ -52,7 +58,9 @@ Usage:

   glregistry exts

   glregistry exts-download

   glregistry exts-all       <name>

+  glregistry vendors

   glregistry type           <type>

+  glregistry aliases        <enum>

   glregistry value          <enum>

   glregistry enum           <value>

   glregistry supports       <name>

@@ -83,8 +91,12 @@ Commands:

     Download all extension specs.

   exts-all <name>

     Print all downloaded extensions that mention <name>.

+  vendors

+    Print all vendor abbreviations.

   type <type>

     Print the definition of <type>.

+  aliases <enum>

+    Print the KHR, ARB, and EXT aliases of <enum>.

   value <enum>

     Print the value of <enum>.

   enum <value>

@@ -15,7 +15,9 @@ Usage:

   glregistry exts

   glregistry exts-download

   glregistry exts-all       <name>

+  glregistry vendors

   glregistry type           <type>

+  glregistry aliases        <enum>

   glregistry value          <enum>

   glregistry enum           <value>

   glregistry supports       <name>

@@ -46,8 +48,12 @@ Commands:

     Download all extension specs.

   exts-all <name>

     Print all downloaded extensions that mention <name>.

+  vendors

+    Print all vendor abbreviations.

   type <type>

     Print the definition of <type>.

+  aliases <enum>

+    Print the KHR, ARB, and EXT aliases of <enum>.

   value <enum>

     Print the value of <enum>.

   enum <value>

@@ -166,8 +172,11 @@ CHANGE_PREFIXES = [

     [REQUIRE, '' ],

     [REMOVE,  '<'],

 ]

+VENDORS = ['KHR', 'ARB', 'EXT']

 KEY_SUBS = [

-    *[[f'^{prefix}', f''] for _, prefix in CHANGE_PREFIXES],

+    *[[f'^{   prefix}',  f''       ] for _, prefix in CHANGE_PREFIXES],

+    *[[f'{    vendor}$', f'{   i}' ] for i, vendor in enumerate(VENDORS)],

+    *[[f'^GL_{vendor}_', f'GL_{i}_'] for i, vendor in enumerate(VENDORS)],

 ]

@@ -295,7 +304,7 @@ def ext(extension):

 def exts(xml):

     category, attrib = CATEGORY_ATTRIBS['EXTENSION']

     exts = xml.xpath(f"{category}/@{attrib}")

-    return sorted(exts)

+    return sorted(exts, key=key)

 ### `exts_download`

@@ -318,7 +327,13 @@ def exts_all(xml, name):

         for file, *_ in

         grep(os.path.join(CACHE, 'extensions'), rf'\b{name}\b', [], [])

     )

-    return sorted(exts_all)

+    return sorted(exts_all, key=key)

+

+

+### `vendors`

+def vendors(xml):

+    vendors = set(extension.split('_')[1] for extension in exts(xml))

+    return sorted(vendors, key=key)

 ### `type`

@@ -326,6 +341,29 @@ def type(xml, type):

     return [xml.xpath(f"string({TYPES}/type/name[text()='{type}']/..)")]

+### `aliases`

+def aliases(xml, name, supports_=None, vendors_=[]):

+    if not vendors_:

+        vendors_[:] = vendors(xml)

+    for vendor in vendors_:

+        if name.endswith(f'_{vendor}'):

+            return []

+    value_  = value(xml, name)

+    if not value_:

+        return []

+    if not supports_:

+        supports_ = supports(xml, name, False)

+    if not supports_:

+        return []

+    aliases = []

+    # for vendor in vendors_:

+    for vendor in VENDORS:

+        alias = f'{name}_{vendor}'

+        if supports(xml, alias, False) and value(xml, alias) == value_:

+            aliases.append(alias)

+    return sorted(aliases, key=key)

+

+

 ### `value`

 def value(xml, enum):

     return xml.xpath(f"{ENUMS}/enum[@name='{enum}']/@value")

@@ -334,11 +372,11 @@ def value(xml, enum):

 ### `enum`

 def enum(xml, value):

     enum = xml.xpath(f"{ENUMS}/enum[@value='{value}']/@name")

-    return sorted(enum)

+    return sorted(enum, key=key)

 ### `supports`

-def supports(xml, name):

+def supports(xml, name, use_aliases=True):

     category, attrib = CATEGORY_ATTRIBS['EXTENSION']

     if xml.xpath(f"{category}[@{attrib}='{name}']"):

         return ['EXTENSION']

@@ -349,6 +387,12 @@ def supports(xml, name):

         for support in

         xml.xpath(f"{category}/{change}/*[@name='{name}']/../../@{attrib}")

     ]

+    if supports_ and use_aliases:

+        supports_.extend(

+            support

+            for alias   in aliases (xml, name, supports_)

+            for support in supports(xml, alias, False)

+        )

     return sorted(supports_, key=key)

@@ -375,7 +419,7 @@ def names(xml, support=None):

         for name in

         xml.xpath(f"{category}{attrib}/{REQUIRE}/*/@name")

     )

-    return sorted(names)

+    return sorted(names, key=key)

 ### `groups`

@@ -406,7 +450,7 @@ def enums(xml, group=None):

         for _, enums in enums_(xml, group).items()

         for enum     in enums

     ]

-    return sorted(enums)

+    return sorted(enums, key=key)

 ### `enums_tree`

@@ -548,7 +592,9 @@ def main():

     if args['exts']:          page(exts         (xml_()))

     if args['exts-download']: page(exts_download(xml_()))

     if args['exts-all']:      page(exts_all     (xml_(), args['<name>']))

+    if args['vendors']:       page(vendors      (xml_()))

     if args['type']:          page(type         (xml_(), args['<type>']))

+    if args['aliases']:       page(aliases      (xml_(), args['<enum>']))

     if args['value']:         page(value        (xml_(), args['<enum>']))

     if args['enum']:          page(enum         (xml_(), args['<value>']))

     if args['supports']:      page(supports     (xml_(), args['<name>']))