From 4b298d2227db6bbd27d49e0ecf4cfc31fa6d806b Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sat, 23 Apr 2011 15:37:52 -0500 Subject: [PATCH 01/88] Subset patch for subset branch only. --- auto/bin/make_def_fun.pl | 2 ++ auto/bin/make_header.pl | 5 ++++- auto/bin/make_struct_fun.pl | 2 ++ auto/src/glew_head.h | 14 ++++++++++++++ 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/auto/bin/make_def_fun.pl b/auto/bin/make_def_fun.pl index 40e67d5..d6915e8 100755 --- a/auto/bin/make_def_fun.pl +++ b/auto/bin/make_def_fun.pl @@ -30,6 +30,8 @@ if (@ARGV) foreach my $ext (sort @extlist) { my ($extname, $exturl, $extstring, $types, $tokens, $functions, $exacts) = parse_ext($ext); + print "\n#if !defined(GLEW_SUBSET) || defined(GLEW_SUBSET_$extname)\n"; output_decls($functions, \&make_pfn_decl); + print "\n#endif /* GLEW_SUBSET_$extname */\n"; } } diff --git a/auto/bin/make_header.pl b/auto/bin/make_header.pl index 934ef77..5ee101a 100755 --- a/auto/bin/make_header.pl +++ b/auto/bin/make_header.pl @@ -55,12 +55,15 @@ if (@ARGV) my ($extname, $exturl, $extstring, $types, $tokens, $functions, $exacts) = parse_ext($ext); make_separator($extname); - print "#ifndef $extname\n#define $extname 1\n"; + print "#ifndef $extname\n"; output_tokens($tokens, \&make_define); output_types($types, \&make_type); output_exacts($exacts, \&make_exact); output_decls($functions, \&make_pfn_type); + print "\n#if !defined(GLEW_SUBSET) || defined(GLEW_SUBSET_$extname)\n"; + print "#define $extname 1\n"; output_decls($functions, \&make_pfn_alias); + print "\n#endif /* GLEW_SUBSET_$extname */\n"; my $extvar = $extname; $extvar =~ s/GL(X*)_/GL$1EW_/; diff --git a/auto/bin/make_struct_fun.pl b/auto/bin/make_struct_fun.pl index c885960..139ad18 100755 --- a/auto/bin/make_struct_fun.pl +++ b/auto/bin/make_struct_fun.pl @@ -31,6 +31,8 @@ if (@ARGV) foreach my $ext (sort @extlist) { my ($extname, $exturl, $extstring, $types, $tokens, $functions, $exacts) = parse_ext($ext); + print "\n#if !defined(GLEW_SUBSET) || defined(GLEW_SUBSET_$extname)\n"; output_decls($functions, \&make_pfn_decl); + print "\n#endif /* GLEW_SUBSET_$extname */\n"; } } diff --git a/auto/src/glew_head.h b/auto/src/glew_head.h index ac72d63..b72904e 100644 --- a/auto/src/glew_head.h +++ b/auto/src/glew_head.h @@ -172,6 +172,20 @@ typedef _W64 int ptrdiff_t; #endif /* _WIN32 */ +/* GLEW depends on extension string entry points for internal purposes */ + +#ifdef GLEW_SUBSET +#ifndef GLEW_SUBSET_WGL_ARB_extensions_string +#define GLEW_SUBSET_WGL_ARB_extensions_string +#endif +#ifndef GLEW_SUBSET_WGL_EXT_extensions_string +#define GLEW_SUBSET_WGL_EXT_extensions_string +#endif +#ifndef GLEW_SUBSET_GLX_VERSION_1_2 +#define GLEW_SUBSET_GLX_VERSION_1_2 +#endif +#endif + #ifdef __cplusplus extern "C" { #endif From 62616c381a8d156b2024ab7cde31780fe8ad4a70 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sun, 12 Aug 2012 20:21:27 -0500 Subject: [PATCH 02/88] Update GL_REGAL_log to support a callback function. --- auto/core/GL_REGAL_log | 2 ++ 1 file changed, 2 insertions(+) diff --git a/auto/core/GL_REGAL_log b/auto/core/GL_REGAL_log index 7f0ca4d..62b1295 100644 --- a/auto/core/GL_REGAL_log +++ b/auto/core/GL_REGAL_log @@ -10,3 +10,5 @@ GL_REGAL_log GL_LOG_DEBUG_REGAL 0x931F GL_LOG_STATUS_REGAL 0x9320 GL_LOG_HTTP_REGAL 0x9321 + void glLogMessageCallbackREGAL (GLLOGPROCREGAL callback) + typedef void (APIENTRY *GLLOGPROCREGAL)(GLenum stream, GLsizei length, const GLchar *message, GLvoid *context) From 19a563a6fd76ca4530c7f89c28f49385157dee42 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Mon, 13 Aug 2012 12:01:41 -0500 Subject: [PATCH 03/88] Add OpenGL 4.3 links. --- auto/doc/log.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/auto/doc/log.html b/auto/doc/log.html index 718dc32..4823375 100644 --- a/auto/doc/log.html +++ b/auto/doc/log.html @@ -6,7 +6,9 @@ @@ -625,7 +678,7 @@ width="88" height="32" border="0" alt="Support This Project"> -->
  • Missing tokens in GL_VERSION_2_1
  • Missing functions in GL_VERSION_1_4
  • Incorrect parameter type for glXCopyContext - +
    @@ -647,7 +700,7 @@ corruption of their values
  • Incorrect function names in GL_EXT_gpu_program_parameters
  • Missing tokens in GL_EXT_framebuffer_multisample
  • GLEW_MX initialization problem for WGL_{ARB,EXT}_extensions_string - +
    @@ -895,7 +948,7 @@ corruption of their values