From 03ab91f7892e69e70f70ba3bbf4c11fce8a2889e Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sat, 1 Jan 2011 11:04:18 -0600 Subject: [PATCH 01/18] Subset patch/branch for GLEW as used for NVIDIA Cg Toolkit purposes --- 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 f6d39ff..9c6a9bb 100644 --- a/auto/src/glew_head.h +++ b/auto/src/glew_head.h @@ -142,6 +142,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 91bcbcec13745727f5a0befdea24d3ecfc8ea6c0 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sat, 1 Jan 2011 11:04:18 -0600 Subject: [PATCH 02/18] Subset patch/branch for GLEW as used for NVIDIA Cg Toolkit purposes --- 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 f6d39ff..9c6a9bb 100644 --- a/auto/src/glew_head.h +++ b/auto/src/glew_head.h @@ -142,6 +142,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 141ad169ff565c4361acdfb19981894ab9508fe4 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sat, 1 Jan 2011 11:04:18 -0600 Subject: [PATCH 03/18] Subset patch/branch for GLEW as used for NVIDIA Cg Toolkit purposes --- 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 9f2cf2f..3f70ce8 100644 --- a/auto/src/glew_head.h +++ b/auto/src/glew_head.h @@ -158,6 +158,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 9bc3b6e7f0743a14c2e64994b325f782f547f826 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sat, 1 Jan 2011 11:04:18 -0600 Subject: [PATCH 04/18] Subset patch/branch for GLEW as used for NVIDIA Cg Toolkit purposes --- 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 26b8808..e54d640 100644 --- a/auto/src/glew_head.h +++ b/auto/src/glew_head.h @@ -158,6 +158,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 d7caf51f8ef0eb983e199f650d9a88d3c50ffd3b Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sat, 1 Jan 2011 11:04:18 -0600 Subject: [PATCH 05/18] Subset patch/branch for GLEW as used for NVIDIA Cg Toolkit purposes --- 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 26b8808..e54d640 100644 --- a/auto/src/glew_head.h +++ b/auto/src/glew_head.h @@ -158,6 +158,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 000f2fb129a860f79c8242b3d1da501770d06c85 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sat, 1 Jan 2011 11:04:18 -0600 Subject: [PATCH 06/18] Subset patch/branch for GLEW as used for NVIDIA Cg Toolkit purposes --- 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 26b8808..e54d640 100644 --- a/auto/src/glew_head.h +++ b/auto/src/glew_head.h @@ -158,6 +158,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 52424757345144e215034d8455b15290d9ef6e02 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sat, 23 Apr 2011 14:50:46 -0500 Subject: [PATCH 07/18] For ID: 3200597 - glDraw*InstancedARB are NULL with ARB_instanced --- auto/core/GL_ARB_draw_instanced | 3 +++ auto/core/GL_ARB_instanced_arrays | 7 +++++++ 2 files changed, 10 insertions(+) create mode 100644 auto/core/GL_ARB_draw_instanced create mode 100644 auto/core/GL_ARB_instanced_arrays diff --git a/auto/core/GL_ARB_draw_instanced b/auto/core/GL_ARB_draw_instanced new file mode 100644 index 0000000..4140bea --- /dev/null +++ b/auto/core/GL_ARB_draw_instanced @@ -0,0 +1,3 @@ +GL_ARB_draw_instanced +http://www.opengl.org/registry/specs/ARB/draw_instanced.txt +GL_ARB_draw_instanced diff --git a/auto/core/GL_ARB_instanced_arrays b/auto/core/GL_ARB_instanced_arrays new file mode 100644 index 0000000..b1c8873 --- /dev/null +++ b/auto/core/GL_ARB_instanced_arrays @@ -0,0 +1,7 @@ +GL_ARB_instanced_arrays +http://www.opengl.org/registry/specs/ARB/instanced_arrays.txt +GL_ARB_instanced_arrays + GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB 0x88FE + void glVertexAttribDivisorARB (GLuint index, GLuint divisor) + void glDrawArraysInstancedARB (GLenum mode, GLint first, GLsizei count, GLsizei primcount) + void glDrawElementsInstancedARB (GLenum mode, GLsizei count, GLenum type, const void* indices, GLsizei primcount) From aee2c56008aaa8de082061242eb2efe8cd85ec9c Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sat, 1 Jan 2011 11:04:18 -0600 Subject: [PATCH 08/18] Subset patch/branch for GLEW as used for NVIDIA Cg Toolkit purposes --- 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 26b8808..e54d640 100644 --- a/auto/src/glew_head.h +++ b/auto/src/glew_head.h @@ -158,6 +158,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 a89b304a8cc6a015984b50c870e21b5ef0e457f5 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sat, 23 Apr 2011 15:14:41 -0500 Subject: [PATCH 09/18] For ID: 3193028 - glFramebufferTextureLayerEXT from EXT_texture_array --- auto/core/GL_EXT_geometry_shader4 | 1 - auto/core/GL_EXT_texture_array | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/auto/core/GL_EXT_geometry_shader4 b/auto/core/GL_EXT_geometry_shader4 index 888e500..f6f6785 100644 --- a/auto/core/GL_EXT_geometry_shader4 +++ b/auto/core/GL_EXT_geometry_shader4 @@ -23,5 +23,4 @@ GL_EXT_geometry_shader4 GL_PROGRAM_POINT_SIZE_EXT 0x8642 void glProgramParameteriEXT (GLuint program, GLenum pname, GLint value) void glFramebufferTextureEXT (GLenum target, GLenum attachment, GLuint texture, GLint level) - void glFramebufferTextureLayerEXT (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer) void glFramebufferTextureFaceEXT (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face) diff --git a/auto/core/GL_EXT_texture_array b/auto/core/GL_EXT_texture_array index f61e72e..11877f0 100644 --- a/auto/core/GL_EXT_texture_array +++ b/auto/core/GL_EXT_texture_array @@ -9,3 +9,4 @@ GL_EXT_texture_array GL_TEXTURE_BINDING_2D_ARRAY_EXT 0x8C1D GL_MAX_ARRAY_TEXTURE_LAYERS_EXT 0x88FF GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT 0x884E + void glFramebufferTextureLayerEXT (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer) From e2dffd8dd772de9edc547904195bd53d96b8a013 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sat, 23 Apr 2011 15:24:04 -0500 Subject: [PATCH 10/18] Ooops, subset patch is supposed to be in 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, 1 insertion(+), 22 deletions(-) diff --git a/auto/bin/make_def_fun.pl b/auto/bin/make_def_fun.pl index d6915e8..40e67d5 100755 --- a/auto/bin/make_def_fun.pl +++ b/auto/bin/make_def_fun.pl @@ -30,8 +30,6 @@ 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 5ee101a..934ef77 100755 --- a/auto/bin/make_header.pl +++ b/auto/bin/make_header.pl @@ -55,15 +55,12 @@ if (@ARGV) my ($extname, $exturl, $extstring, $types, $tokens, $functions, $exacts) = parse_ext($ext); make_separator($extname); - print "#ifndef $extname\n"; + print "#ifndef $extname\n#define $extname 1\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 139ad18..c885960 100755 --- a/auto/bin/make_struct_fun.pl +++ b/auto/bin/make_struct_fun.pl @@ -31,8 +31,6 @@ 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 e54d640..26b8808 100644 --- a/auto/src/glew_head.h +++ b/auto/src/glew_head.h @@ -158,20 +158,6 @@ 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 bb3e79792930b5948b081c94d8ae4d0fd1b4c7dd Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sat, 23 Apr 2011 15:32:06 -0500 Subject: [PATCH 11/18] For ID: 3287530 - Fix auto/ build for BSD platforms --- auto/Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/auto/Makefile b/auto/Makefile index 7ec6bcd..36debba 100644 --- a/auto/Makefile +++ b/auto/Makefile @@ -22,11 +22,11 @@ BLACKLIST = blacklist GL_CORE_SPEC := $(CORE)/GL_VERSION* GLX_CORE_SPEC := $(CORE)/GLX_VERSION* ifeq (custom,$(MAKECMDGOALS)) -#GL_CORE_SPEC := $(shell grep GL_VERSION custom.txt | sed -e 's/\(.*\)/$(CORE)\/\1/g;') -GL_EXT_SPEC := $(shell grep "^[ \t]*GL_" custom.txt | grep -v GL_VERSION | sed -e 's/\(.*\)/$(EXT)\/\1/g;') -WGL_EXT_SPEC := $(shell grep "^[ \t]*WGL_" custom.txt | sed -e 's/\(.*\)/$(EXT)\/\1/g;') -#GLX_CORE_SPEC := $(shell grep GLX_VERSION custom.txt | sed -e 's/\(.*\)/$(CORE)\/\1/g;') -GLX_EXT_SPEC := $(shell grep "^[ \t]*GLX_" custom.txt | grep -v GLX_VERSION | sed -e 's/\(.*\)/$(EXT)\/\1/g;') +#GL_CORE_SPEC := $(shell grep GL_VERSION custom.txt | perl -e 's/\(.*\)/$(CORE)\/\1/g;') +GL_EXT_SPEC := $(shell grep "^[ \t]*GL_" custom.txt | grep -v GL_VERSION | perl -e 's/\(.*\)/$(EXT)\/\1/g;') +WGL_EXT_SPEC := $(shell grep "^[ \t]*WGL_" custom.txt | perl -e 's/\(.*\)/$(EXT)\/\1/g;') +#GLX_CORE_SPEC := $(shell grep GLX_VERSION custom.txt | perl -e 's/\(.*\)/$(CORE)\/\1/g;') +GLX_EXT_SPEC := $(shell grep "^[ \t]*GLX_" custom.txt | grep -v GLX_VERSION | perl -e 's/\(.*\)/$(EXT)\/\1/g;') else GL_EXT_SPEC := $(EXT)/GL_* WGL_EXT_SPEC := $(EXT)/WGL_* @@ -321,7 +321,7 @@ $(D.DEST)/%.html: doc/%.html @echo "Creating $(@F)" @echo "--------------------------------------------------------------------" cat $(SRC)/header.html $< $(SRC)/footer.html | \ - sed 's#\(.*\)#\1#' > $@ + perl -e 's#\(.*\)#\1#' > $@ $(D.DEST)/glew.html: $(EXT)/.dummy @echo "--------------------------------------------------------------------" @@ -331,7 +331,7 @@ $(D.DEST)/glew.html: $(EXT)/.dummy echo -e "

Supported OpenGL Extensions

\n" >> $@ $(BIN)/make_html.pl $(GL_EXT_SPEC) >> $@ cat $(SRC)/footer.html >> $@ - sed -i 's#\(.*\)#\1#' $@ + perl -i -e 's#\(.*\)#\1#' $@ $(D.DEST)/wglew.html: $(EXT)/.dummy @echo "--------------------------------------------------------------------" @@ -341,7 +341,7 @@ $(D.DEST)/wglew.html: $(EXT)/.dummy echo -e "

Supported WGL Extensions

\n" >> $@ $(BIN)/make_html.pl $(WGL_EXT_SPEC) >> $@ cat $(SRC)/footer.html >> $@ - sed -i 's#\(.*\)#\1#' $@ + perl -i -e 's#\(.*\)#\1#' $@ $(D.DEST)/glxew.html: $(EXT)/.dummy @echo "--------------------------------------------------------------------" @@ -351,7 +351,7 @@ $(D.DEST)/glxew.html: $(EXT)/.dummy echo -e "

Supported GLX Extensions

\n" >> $@ $(BIN)/make_html.pl $(GLX_EXT_SPEC) >> $@ cat $(SRC)/footer.html >> $@ - sed -i 's#\(.*\)#\1#' $@ + perl -i -e 's#\(.*\)#\1#' $@ $(B.DEST)/%.rc: src/%.rc $(EXT)/.dummy perl -e "s/GLEW_MAJOR/$(GLEW_MAJOR)/g;s/GLEW_MINOR/$(GLEW_MINOR)/g;s/GLEW_MICRO/$(GLEW_MICRO)/g;" -p $< > $@ From dea5a6143c362cd77443541bc2014f1b64335768 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Mon, 25 Apr 2011 21:15:35 -0500 Subject: [PATCH 12/18] For ID: 3148451 - bad dll perms on default cygwin 1.7.7 install --- Makefile | 16 +++++++++------- config/Makefile.cygwin | 12 ++++++------ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index bb019a5..5637c2b 100644 --- a/Makefile +++ b/Makefile @@ -181,8 +181,9 @@ install.lib: glew.lib $(INSTALL) -d -m 0755 $(LIBDIR) # runtime ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) + $(INSTALL) -d -m 0755 $(BINDIR) $(STRIP) -x lib/$(LIB.SHARED) - $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(BINDIR)/ + $(INSTALL) -m 0755 lib/$(LIB.SHARED) $(BINDIR)/ else $(STRIP) -x lib/$(LIB.SHARED) $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/ @@ -192,17 +193,18 @@ endif ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) $(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(LIBDIR)/ else - $(STRIP) -x lib/$(LIB.STATIC) - $(INSTALL) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/ $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK) endif + $(STRIP) -x lib/$(LIB.STATIC) + $(INSTALL) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/ install.lib.mx: glew.lib.mx $(INSTALL) -d -m 0755 $(LIBDIR) # runtime ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) + $(INSTALL) -d -m 0755 $(BINDIR) $(STRIP) -x lib/$(LIB.SHARED.MX) - $(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) $(BINDIR)/ + $(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) $(BINDIR)/ else $(STRIP) -x lib/$(LIB.SHARED.MX) $(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) $(LIBDIR)/ @@ -212,10 +214,10 @@ endif ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) $(INSTALL) -m 0644 lib/$(LIB.DEVLNK.MX) $(LIBDIR)/ else - $(STRIP) -x lib/$(LIB.STATIC.MX) - $(INSTALL) -m 0644 lib/$(LIB.STATIC.MX) $(LIBDIR)/ $(LN) $(LIB.SHARED.MX) $(LIBDIR)/$(LIB.DEVLNK.MX) endif + $(STRIP) -x lib/$(LIB.STATIC.MX) + $(INSTALL) -m 0644 lib/$(LIB.STATIC.MX) $(LIBDIR)/ install.bin: glew.bin $(INSTALL) -d -m 0755 $(BINDIR) @@ -247,8 +249,8 @@ ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) else $(RM) $(LIBDIR)/$(LIB.SONAME) $(LIBDIR)/$(LIB.SONAME.MX) $(RM) $(LIBDIR)/$(LIB.SHARED) $(LIBDIR)/$(LIB.SHARED.MX) - $(RM) $(LIBDIR)/$(LIB.STATIC) $(LIBDIR)/$(LIB.STATIC.MX) endif + $(RM) $(LIBDIR)/$(LIB.STATIC) $(LIBDIR)/$(LIB.STATIC.MX) $(RM) $(BINDIR)/$(GLEWINFO.BIN) $(BINDIR)/$(VISUALINFO.BIN) clean: diff --git a/config/Makefile.cygwin b/config/Makefile.cygwin index 068bc09..8280bf2 100644 --- a/config/Makefile.cygwin +++ b/config/Makefile.cygwin @@ -1,9 +1,9 @@ NAME = GLEW -GLEW_DEST ?= /usr/X11R6 +GLEW_DEST ?= /usr CC = cc # use gcc for linking, with ld it does not work LD = cc -LDFLAGS.EXTRA = -L/usr/X11R6/lib +LDFLAGS.EXTRA = LIBDIR = $(GLEW_DEST)/lib LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11 LDFLAGS.STATIC = -Wl,-Bstatic @@ -11,13 +11,13 @@ LDFLAGS.DYNAMIC = -Wl,-Bdynamic WARN = -Wall -W POPT = -O2 BIN.SUFFIX = .exe -LIB.SONAME = cyg$(NAME)-$(SO_MAJOR).dll +LIB.SONAME = cyg$(NAME)-$(GLEW_MAJOR)-$(GLEW_MINOR).dll LIB.DEVLNK = lib$(NAME).dll.a -LIB.SHARED = cyg$(NAME)-$(SO_MAJOR).dll +LIB.SHARED = cyg$(NAME)-$(GLEW_MAJOR)-$(GLEW_MINOR).dll LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -shared -Wl,--out-implib,lib/$(LIB.DEVLNK) -LIB.SONAME.MX = cyg$(NAME)mx-$(SO_MAJOR).dll +LIB.SONAME.MX = cyg$(NAME)mx-$(GLEW_MAJOR)-$(GLEW_MINOR).dll LIB.DEVLNK.MX = lib$(NAME)mx.dll.a -LIB.SHARED.MX = cyg$(NAME)mx-$(SO_MAJOR).dll +LIB.SHARED.MX = cyg$(NAME)mx-$(GLEW_MAJOR)-$(GLEW_MINOR).dll LIB.STATIC.MX = lib$(NAME)mx.a LDFLAGS.SO.MX = -shared -Wl,--out-implib,lib/$(LIB.DEVLNK.MX) From 507bcf72566e208f68f40a6538374b964f96dc11 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Wed, 27 Apr 2011 10:14:50 -0500 Subject: [PATCH 13/18] Fixup for .html generation - perl needs -pe instead of just -e --- auto/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/auto/Makefile b/auto/Makefile index 36debba..977c343 100644 --- a/auto/Makefile +++ b/auto/Makefile @@ -321,7 +321,7 @@ $(D.DEST)/%.html: doc/%.html @echo "Creating $(@F)" @echo "--------------------------------------------------------------------" cat $(SRC)/header.html $< $(SRC)/footer.html | \ - perl -e 's#\(.*\)#\1#' > $@ + perl -pe 's#\(.*\)#\1#' > $@ $(D.DEST)/glew.html: $(EXT)/.dummy @echo "--------------------------------------------------------------------" @@ -331,7 +331,7 @@ $(D.DEST)/glew.html: $(EXT)/.dummy echo -e "

Supported OpenGL Extensions

\n" >> $@ $(BIN)/make_html.pl $(GL_EXT_SPEC) >> $@ cat $(SRC)/footer.html >> $@ - perl -i -e 's#\(.*\)#\1#' $@ + perl -i -pe 's#\(.*\)#\1#' $@ $(D.DEST)/wglew.html: $(EXT)/.dummy @echo "--------------------------------------------------------------------" @@ -341,7 +341,7 @@ $(D.DEST)/wglew.html: $(EXT)/.dummy echo -e "

Supported WGL Extensions

\n" >> $@ $(BIN)/make_html.pl $(WGL_EXT_SPEC) >> $@ cat $(SRC)/footer.html >> $@ - perl -i -e 's#\(.*\)#\1#' $@ + perl -i -pe 's#\(.*\)#\1#' $@ $(D.DEST)/glxew.html: $(EXT)/.dummy @echo "--------------------------------------------------------------------" @@ -351,7 +351,7 @@ $(D.DEST)/glxew.html: $(EXT)/.dummy echo -e "

Supported GLX Extensions

\n" >> $@ $(BIN)/make_html.pl $(GLX_EXT_SPEC) >> $@ cat $(SRC)/footer.html >> $@ - perl -i -e 's#\(.*\)#\1#' $@ + perl -i -pe 's#\(.*\)#\1#' $@ $(B.DEST)/%.rc: src/%.rc $(EXT)/.dummy perl -e "s/GLEW_MAJOR/$(GLEW_MAJOR)/g;s/GLEW_MINOR/$(GLEW_MINOR)/g;s/GLEW_MICRO/$(GLEW_MICRO)/g;" -p $< > $@ From 5be9820df8edc641a6f3cca47a33482ec95dc42f Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Wed, 27 Apr 2011 10:42:44 -0500 Subject: [PATCH 14/18] Fixup for .html generation --- auto/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/auto/Makefile b/auto/Makefile index 977c343..f4a24d1 100644 --- a/auto/Makefile +++ b/auto/Makefile @@ -321,7 +321,7 @@ $(D.DEST)/%.html: doc/%.html @echo "Creating $(@F)" @echo "--------------------------------------------------------------------" cat $(SRC)/header.html $< $(SRC)/footer.html | \ - perl -pe 's#\(.*\)#\1#' > $@ + perl -pe 's#(.*)#\1#' > $@ $(D.DEST)/glew.html: $(EXT)/.dummy @echo "--------------------------------------------------------------------" @@ -331,7 +331,7 @@ $(D.DEST)/glew.html: $(EXT)/.dummy echo -e "

Supported OpenGL Extensions

\n" >> $@ $(BIN)/make_html.pl $(GL_EXT_SPEC) >> $@ cat $(SRC)/footer.html >> $@ - perl -i -pe 's#\(.*\)#\1#' $@ + perl -i -pe 's#(.*)#\1#' $@ $(D.DEST)/wglew.html: $(EXT)/.dummy @echo "--------------------------------------------------------------------" @@ -341,7 +341,7 @@ $(D.DEST)/wglew.html: $(EXT)/.dummy echo -e "

Supported WGL Extensions

\n" >> $@ $(BIN)/make_html.pl $(WGL_EXT_SPEC) >> $@ cat $(SRC)/footer.html >> $@ - perl -i -pe 's#\(.*\)#\1#' $@ + perl -i -pe 's#(.*)#\1#' $@ $(D.DEST)/glxew.html: $(EXT)/.dummy @echo "--------------------------------------------------------------------" @@ -351,7 +351,7 @@ $(D.DEST)/glxew.html: $(EXT)/.dummy echo -e "

Supported GLX Extensions

\n" >> $@ $(BIN)/make_html.pl $(GLX_EXT_SPEC) >> $@ cat $(SRC)/footer.html >> $@ - perl -i -pe 's#\(.*\)#\1#' $@ + perl -i -pe 's#(.*)#\1#' $@ $(B.DEST)/%.rc: src/%.rc $(EXT)/.dummy perl -e "s/GLEW_MAJOR/$(GLEW_MAJOR)/g;s/GLEW_MINOR/$(GLEW_MINOR)/g;s/GLEW_MICRO/$(GLEW_MICRO)/g;" -p $< > $@ From 2e7fd1cef2d583dcf9fb511808a92f2f359de3f5 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Wed, 27 Apr 2011 10:47:39 -0500 Subject: [PATCH 15/18] Bump version to 1.6.0, documentation updates for GLEW release. --- auto/doc/index.html | 13 +- auto/doc/log.html | 30 ++ auto/src/header.html | 4 +- config/version | 4 +- doc/advanced.html | 4 +- doc/basic.html | 4 +- doc/credits.html | 4 +- doc/glew.html | 801 ++++++++++++++++++++++--------------------- doc/glxew.html | 45 +-- doc/index.html | 17 +- doc/install.html | 4 +- doc/log.html | 34 +- doc/wglew.html | 28 +- 13 files changed, 531 insertions(+), 461 deletions(-) diff --git a/auto/doc/index.html b/auto/doc/index.html index 2b4c576..8248e17 100644 --- a/auto/doc/index.html +++ b/auto/doc/index.html @@ -12,8 +12,8 @@ Mac OS X, FreeBSD, Irix, and Solaris.

GLEW is distributed as source and precompiled binaries. The latest release is -1.5.8 -[01-31-11]: +1.6.0 +[04-27-11]:

@@ -27,8 +27,8 @@ as source and precompiled binaries. The latest release is Source -ZIP |  -TGZ +ZIP |  +TGZ @@ -36,8 +36,8 @@ as source and precompiled binaries. The latest release is Binaries -Windows 32-bit |  -64-bit  +Windows 32-bit |  +64-bit  @@ -64,6 +64,7 @@ The latest release contains support for OpenGL 3.3, OpenGL 4.1 and the following

News