simplify logic of incorporating aliasing into Registry

Author: mohawk2

lib/OpenGL/Modern.pm

@@ -5363,8 +5363,7 @@ our %EXPORT_TAGS_GL = (
   ],
   'GL_ARB_ES3_2_compatibility' => [
     'glPrimitiveBoundingBox',
-    'glPrimitiveBoundingBoxARB',
-    'glPrimitiveBoundingBoxEXT'
+    'glPrimitiveBoundingBoxARB'
   ],
   'GL_ARB_base_instance' => [
     'glDrawArraysInstancedBaseInstance',
@@ -7795,8 +7794,7 @@ our %EXPORT_TAGS_GL = (
   ],
   'GL_KHR_blend_equation_advanced' => [
     'glBlendBarrier',
-    'glBlendBarrierKHR',
-    'glBlendBarrierNV'
+    'glBlendBarrierKHR'
   ],
   'GL_KHR_debug' => [
     'glDebugMessageCallback_c',

lib/OpenGL/Modern.pod

@@ -1484,10 +1484,10 @@ Exported under tag C<:GL_VERSION_1_1>.
 Not available in a 'future-compatible' profile as removed in 3.2.
 See L<https://registry.khronos.org/OpenGL-Refpages/gl2.1/xhtml/glBitmap.xml>
 
-=head2 glBlendBarrierKHR
+=head2 glBlendBarrier
 
- glBlendBarrierKHR();
  glBlendBarrier();
+ glBlendBarrierKHR();
  glBlendBarrierNV();
 
 Exported under tag C<:GL_KHR_blend_equation_advanced>.
@@ -11739,10 +11739,10 @@ Exported under tag C<:GL_NV_present_video>.
 
 Exported under tag C<:GL_NV_present_video>.
 
-=head2 glPrimitiveBoundingBoxARB
+=head2 glPrimitiveBoundingBox
 
- glPrimitiveBoundingBoxARB($minX, $minY, $minZ, $minW, $maxX, $maxY, $maxZ, $maxW);
  glPrimitiveBoundingBox($minX, $minY, $minZ, $minW, $maxX, $maxY, $maxZ, $maxW);
+ glPrimitiveBoundingBoxARB($minX, $minY, $minZ, $minW, $maxX, $maxY, $maxZ, $maxW);
  glPrimitiveBoundingBoxEXT($minX, $minY, $minZ, $minW, $maxX, $maxY, $maxZ, $maxW);
 
 Exported under tag C<:GL_ARB_ES3_2_compatibility>.

lib/OpenGL/Modern/Registry.pm

@@ -6930,9 +6930,9 @@ our %registry = (
     'glewtype' => 'fun',
     'restype' => 'void'
   },
-  'glBlendBarrierKHR' => {
+  'glBlendBarrier' => {
     'aliases' => {
-      'glBlendBarrier' => 'GL_KHR_blend_equation_advanced',
+      'glBlendBarrierKHR' => 'GL_KHR_blend_equation_advanced',
       'glBlendBarrierNV' => 'GL_NV_blend_equation_advanced'
     },
     'feature' => 'GL_KHR_blend_equation_advanced',
@@ -47016,9 +47016,9 @@ our %registry = (
     'glewtype' => 'fun',
     'restype' => 'void'
   },
-  'glPrimitiveBoundingBoxARB' => {
+  'glPrimitiveBoundingBox' => {
     'aliases' => {
-      'glPrimitiveBoundingBox' => 'GL_ARB_ES3_2_compatibility',
+      'glPrimitiveBoundingBoxARB' => 'GL_ARB_ES3_2_compatibility',
       'glPrimitiveBoundingBoxEXT' => 'GL_EXT_primitive_bounding_box'
     },
     'argdata' => [

utils/generate-registry.pl

@@ -282,22 +282,24 @@ =head1 PURPOSE
 }
 @features{keys %features} = map [sort keys %$_], values %features;
 
-my %nonglew2alias;
+{
+my %alias2real;
 for (grep $_, split /\n/, slurp('utils/aliases.txt')) {
   my ($to, $from) = split ' ';
-  my $alias_feature = $signature{$from}{feature};
-  if (exists $signature{$to}) {
-    # do nothing
-  } elsif (exists $nonglew2alias{$to}) {
-    $to = $nonglew2alias{$to};
-  } else {
-    $nonglew2alias{$to} = $from;
-    $signature{$to} = $signature{$from};
-    ($to, $from) = ($from, $to);
-  }
-  $signature{$to}{aliases}{$from} = $alias_feature;
+  $alias2real{$from} = $to;
+}
+my %nonglew2alias;
+for (grep !exists $signature{$alias2real{$_}}, sort keys %alias2real) {
+  next if exists $nonglew2alias{$alias2real{$_}};
+  $nonglew2alias{$alias2real{$_}} = $_;
+  $signature{$alias2real{$_}} = $signature{$_};
+}
+for (sort keys %alias2real) {
+  my ($to, $from) = ($alias2real{$_}, $_);
+  $signature{$to}{aliases}{$from} = $signature{$from}{feature};
   delete $signature{$from};
 }
+}
 
 my @version_features = grep /^GL_VERSION/, keys %features;
 my (@version_31, @version_core);