From 5a2307fae3fc197124c72ccaf4eb8c1c598e479a Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sat, 2 Apr 2022 12:15:09 +1000 Subject: [PATCH] Fix issue #355 - GL_NVX_progress_fence missing glCreateProgressFenceNVX --- auto/bin/filter_gl_ext.sh | 5 +++-- auto/bin/make.pl | 2 +- auto/bin/parse_spec.pl | 6 +++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/auto/bin/filter_gl_ext.sh b/auto/bin/filter_gl_ext.sh index 96a63b3..e295f65 100755 --- a/auto/bin/filter_gl_ext.sh +++ b/auto/bin/filter_gl_ext.sh @@ -481,8 +481,9 @@ EOT head -n4 $1/GL_AMD_gpu_shader_int64 > tmp mv tmp $1/GL_AMD_gpu_shader_int64 -# Filter out GL_NO_ERROR enum from GL_KHR_robustness - grep -v 'GL_NO_ERROR' $1/GL_KHR_robustness > tmp +# Filter out GL_NO_ERROR enum and glGetGraphicsResetStatus from GL_KHR_robustness + grep -v 'GL_NO_ERROR' $1/GL_KHR_robustness | + grep -v 'glGetGraphicsResetStatus' > tmp mv tmp $1/GL_KHR_robustness # Filter out all enums from GL_KHR_blend_equation_advanced_coherent diff --git a/auto/bin/make.pl b/auto/bin/make.pl index abd250e..e0b32ef 100755 --- a/auto/bin/make.pl +++ b/auto/bin/make.pl @@ -10,7 +10,7 @@ my %regex = ( extname => qr/^[A-Z][A-Za-z0-9_]+$/, exturl => qr/^http.+$/, - function => qr/^(.+) ([a-z][a-z0-9_]*) \((.+)\)$/i, + function => qr/^(.+) ([a-z][a-z0-9_]*) \((.*)\)$/i, token => qr/^([A-Z][A-Z0-9_x]*)\s+((?:0x)?[0-9A-Fa-f]+(u(ll)?)?|[A-Z][A-Z0-9_]*)$/, type => qr/^typedef\s+(.+)$/, exact => qr/.*;$/, diff --git a/auto/bin/parse_spec.pl b/auto/bin/parse_spec.pl index b9c3281..5e12f60 100755 --- a/auto/bin/parse_spec.pl +++ b/auto/bin/parse_spec.pl @@ -158,7 +158,7 @@ my %regex = ( eofnc => qr/(?:\);?$|^$)/, # )$ | );$ | ^$ extname => qr/^[A-Z][A-Za-z0-9_]+$/, none => qr/^\(none\)$/, - function => qr/^(.+) ([a-z][a-z0-9_]*) \((.+)\)$/i, + function => qr/^(.+) ([a-z][a-z0-9_]*) \((.*)\)$/i, prefix => qr/^(?:[aw]?gl|glX|egl)/, # gl | agl | wgl | glX tprefix => qr/^(?:[AW]?GL|GLX|EGL)_/, # GL_ | AGL_ | WGL_ | GLX_ section => compile_regex('^(', join('|', @sections), ')$'), # sections in spec @@ -258,6 +258,10 @@ sub parse_spec($) $parms =~ s/$regex{voidtype}/$voidtypemap{$1}/og; $parms =~ s/GLvoid/void/og; $parms =~ s/ void\* / void */og; + if ($parms eq "") + { + $parms = "void"; # NVX_progress_fence and others + } } # add to functions hash $functions{$name} = {