From a25abc0c20edd3a05b8622619dd965bc6c45cdd6 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Mon, 6 Aug 2012 13:39:19 -0500 Subject: [PATCH 01/26] Remove duplicate of NUM_SAMPLE_COUNTS - belongs to GL_ARB_internalformat_query --- auto/core/GL_ARB_internalformat_query2 | 1 - 1 file changed, 1 deletion(-) diff --git a/auto/core/GL_ARB_internalformat_query2 b/auto/core/GL_ARB_internalformat_query2 index fc84d27..5ebcb93 100644 --- a/auto/core/GL_ARB_internalformat_query2 +++ b/auto/core/GL_ARB_internalformat_query2 @@ -112,5 +112,4 @@ GL_ARB_internalformat_query2 GL_TEXTURE_CUBE_MAP_ARRAY 0x9009 GL_TEXTURE_2D_MULTISAMPLE 0x9100 GL_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9102 - GL_NUM_SAMPLE_COUNTS 0x9380 void glGetInternalformati64v (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint64* params) From 60e85a9815dfc605d18451f95ef49bcbc70423b7 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Mon, 6 Aug 2012 13:57:38 -0500 Subject: [PATCH 02/26] Remove more duplicates from core/GL_ARB_internalformat_query2 --- auto/core/GL_ARB_internalformat_query2 | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/auto/core/GL_ARB_internalformat_query2 b/auto/core/GL_ARB_internalformat_query2 index 5ebcb93..1210966 100644 --- a/auto/core/GL_ARB_internalformat_query2 +++ b/auto/core/GL_ARB_internalformat_query2 @@ -1,10 +1,6 @@ GL_ARB_internalformat_query2 http://www.opengl.org/registry/specs/ARB/internalformat_query2.txt GL_ARB_internalformat_query2 - GL_TEXTURE_1D 0x0DE0 - GL_TEXTURE_2D 0x0DE1 - GL_TEXTURE_3D 0x806F - GL_SAMPLES 0x80A9 GL_INTERNALFORMAT_SUPPORTED 0x826F GL_INTERNALFORMAT_PREFERRED 0x8270 GL_INTERNALFORMAT_RED_SIZE 0x8271 @@ -104,12 +100,4 @@ GL_ARB_internalformat_query2 GL_VIEW_CLASS_RGTC2_RG 0x82D1 GL_VIEW_CLASS_BPTC_UNORM 0x82D2 GL_VIEW_CLASS_BPTC_FLOAT 0x82D3 - GL_TEXTURE_RECTANGLE 0x84F5 - GL_TEXTURE_1D_ARRAY 0x8C18 - GL_TEXTURE_2D_ARRAY 0x8C1A - GL_TEXTURE_BUFFER 0x8C2A - GL_RENDERBUFFER 0x8D41 - GL_TEXTURE_CUBE_MAP_ARRAY 0x9009 - GL_TEXTURE_2D_MULTISAMPLE 0x9100 - GL_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9102 void glGetInternalformati64v (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint64* params) From 0a04f18c017dbe765aee275fe4f7f198760b90cc Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Tue, 7 Aug 2012 21:54:20 -0500 Subject: [PATCH 03/26] Use -fPIC for Linux and Darwin builds. See: https://bugs.launchpad.net/ubuntu/+source/glew/+bug/811789 --- Makefile | 4 ++-- config/Makefile.darwin | 2 +- config/Makefile.darwin-ppc | 2 +- config/Makefile.darwin-x86_64 | 2 +- config/Makefile.gnu | 2 +- config/Makefile.kfreebsd | 2 +- config/Makefile.linux | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 77d693d..a4fe9ce 100644 --- a/Makefile +++ b/Makefile @@ -121,7 +121,7 @@ tmp/$(SYSTEM)/default/static/glew.o: src/glew.c include/GL/glew.h include/GL/wgl tmp/$(SYSTEM)/default/shared/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h @mkdir -p $(dir $@) - $(CC) -DGLEW_NO_GLU $(CFLAGS) $(PICFLAG) $(CFLAGS.SO) -o $@ -c $< + $(CC) -DGLEW_NO_GLU $(CFLAGS) $(CFLAGS.SO) -o $@ -c $< glew.pc: glew.pc.in sed \ @@ -157,7 +157,7 @@ tmp/$(SYSTEM)/mx/static/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h tmp/$(SYSTEM)/mx/shared/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h @mkdir -p $(dir $@) - $(CC) -DGLEW_NO_GLU -DGLEW_MX $(CFLAGS) $(PICFLAG) $(CFLAGS.SO) -o $@ -c $< + $(CC) -DGLEW_NO_GLU -DGLEW_MX $(CFLAGS) $(CFLAGS.SO) -o $@ -c $< glewmx.pc: glew.pc.in sed \ diff --git a/config/Makefile.darwin b/config/Makefile.darwin index f6f86ed..0c05ed1 100644 --- a/config/Makefile.darwin +++ b/config/Makefile.darwin @@ -3,7 +3,6 @@ CC = cc LD = cc CFLAGS.EXTRA = -dynamic -fno-common #CFLAGS.EXTRA += -no-cpp-precomp -PICFLAG = -fPIC LDFLAGS.EXTRA = ifneq (undefined, $(origin GLEW_APPLE_GLX)) CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX' @@ -15,6 +14,7 @@ LDFLAGS.STATIC = LDFLAGS.DYNAMIC = WARN = -Wall -W POPT = -O2 +CFLAGS.EXTRA += -fPIC BIN.SUFFIX = LIB.SONAME = lib$(NAME).$(SO_MAJOR).dylib LIB.DEVLNK = lib$(NAME).dylib diff --git a/config/Makefile.darwin-ppc b/config/Makefile.darwin-ppc index 1162998..2aaf66a 100644 --- a/config/Makefile.darwin-ppc +++ b/config/Makefile.darwin-ppc @@ -3,7 +3,6 @@ CC = cc LD = cc CFLAGS.EXTRA = -arch ppc -dynamic -fno-common #CFLAGS.EXTRA += -no-cpp-precomp -PICFLAG = -fPIC LDFLAGS.EXTRA = -arch ppc ifneq (undefined, $(origin GLEW_APPLE_GLX)) CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX' @@ -15,6 +14,7 @@ LDFLAGS.STATIC = LDFLAGS.DYNAMIC = WARN = -Wall -W POPT = -O2 +CFLAGS.EXTRA += -fPIC BIN.SUFFIX = LIB.SONAME = lib$(NAME).$(SO_MAJOR).dylib LIB.DEVLNK = lib$(NAME).dylib diff --git a/config/Makefile.darwin-x86_64 b/config/Makefile.darwin-x86_64 index 18ab312..83e5c47 100644 --- a/config/Makefile.darwin-x86_64 +++ b/config/Makefile.darwin-x86_64 @@ -3,7 +3,6 @@ CC = cc LD = cc CFLAGS.EXTRA = -arch x86_64 -dynamic -fno-common #CFLAGS.EXTRA += -no-cpp-precomp -PICFLAG = -fPIC LDFLAGS.EXTRA = -arch x86_64 ifneq (undefined, $(origin GLEW_APPLE_GLX)) CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX' @@ -15,6 +14,7 @@ LDFLAGS.STATIC = LDFLAGS.DYNAMIC = WARN = -Wall -W POPT = -O2 +CFLAGS.EXTRA += -fPIC BIN.SUFFIX = LIB.SONAME = lib$(NAME).$(SO_MAJOR).dylib LIB.DEVLNK = lib$(NAME).dylib diff --git a/config/Makefile.gnu b/config/Makefile.gnu index 09b7230..2398ab0 100644 --- a/config/Makefile.gnu +++ b/config/Makefile.gnu @@ -1,7 +1,6 @@ NAME = $(GLEW_NAME) CC = cc LD = cc -PICFLAG = -fPIC LDFLAGS.EXTRA = -L/usr/X11R6/lib LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 LDFLAGS.STATIC = -Wl,-Bstatic @@ -9,6 +8,7 @@ LDFLAGS.DYNAMIC = -Wl,-Bdynamic NAME = GLEW WARN = -Wall -W POPT = -O2 +CFLAGS.EXTRA += -fPIC BIN.SUFFIX = LIB.SONAME = lib$(NAME).so.$(SO_MAJOR) LIB.DEVLNK = lib$(NAME).so diff --git a/config/Makefile.kfreebsd b/config/Makefile.kfreebsd index b3747e1..9501091 100644 --- a/config/Makefile.kfreebsd +++ b/config/Makefile.kfreebsd @@ -1,7 +1,6 @@ NAME = $(GLEW_NAME) CC = cc LD = cc -PICFLAG = -fPIC LDFLAGS.EXTRA = -L/usr/X11R6/lib LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 LDFLAGS.STATIC = -Wl,-Bstatic @@ -9,6 +8,7 @@ LDFLAGS.DYNAMIC = -Wl,-Bdynamic NAME = GLEW WARN = -Wall -W POPT = -O2 +CFLAGS.EXTRA += -fPIC BIN.SUFFIX = LIB.SONAME = lib$(NAME).so.$(SO_MAJOR) LIB.DEVLNK = lib$(NAME).so diff --git a/config/Makefile.linux b/config/Makefile.linux index b9f5181..4bc9a53 100644 --- a/config/Makefile.linux +++ b/config/Makefile.linux @@ -1,7 +1,6 @@ NAME = $(GLEW_NAME) CC = cc LD = cc -PICFLAG = -fPIC M_ARCH ?= $(shell uname -m) ifeq (x86_64,${M_ARCH}) LDFLAGS.EXTRA = -L/usr/X11R6/lib64 -L/usr/lib64 @@ -16,6 +15,7 @@ LDFLAGS.DYNAMIC = -Wl,-Bdynamic NAME = GLEW WARN = -Wall -W POPT = -O2 +CFLAGS.EXTRA += -fPIC BIN.SUFFIX = LIB.SONAME = lib$(NAME).so.$(SO_MAJOR) LIB.DEVLNK = lib$(NAME).so From 38a3d857549e7ac31b7edb2a1cfa1ead52f72220 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Tue, 7 Aug 2012 22:06:41 -0500 Subject: [PATCH 04/26] Ignore enums that end in ? - these values are not specified or known. --- auto/bin/parse_spec.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auto/bin/parse_spec.pl b/auto/bin/parse_spec.pl index ad9861d..edcab48 100755 --- a/auto/bin/parse_spec.pl +++ b/auto/bin/parse_spec.pl @@ -147,7 +147,7 @@ my %regex = ( prefix => qr/^(?:[aw]?gl|glX)/, # gl | agl | wgl | glX tprefix => qr/^(?:[AW]?GL|GLX)_/, # GL_ | AGL_ | WGL_ | GLX_ section => compile_regex('^(', join('|', @sections), ')$'), # sections in spec - token => qr/^([A-Z0-9][A-Z0-9_x]*):?\s+((?:0x)?[0-9A-F]+)(.*)$/, # define tokens + token => qr/^([A-Z0-9][A-Z0-9_x]*):?\s+((?:0x)?[0-9A-F]+)([^\?]*)$/, # define tokens types => compile_regex('\b(', join('|', keys %typemap), ')\b'), # var types voidtype => compile_regex('\b(', keys %voidtypemap, ')\b '), # void type ); From 6d14805de58321e8a7b1881323e604bb0ba27217 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Tue, 7 Aug 2012 23:51:27 -0500 Subject: [PATCH 05/26] MX-mode glxew export fix, as recommended by Stefan Eilemann. --- auto/src/glxew_mid.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auto/src/glxew_mid.h b/auto/src/glxew_mid.h index cfcd20d..e9a3391 100644 --- a/auto/src/glxew_mid.h +++ b/auto/src/glxew_mid.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------------------- */ #ifdef GLEW_MX -#define GLXEW_FUN_EXPORT +#define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT #define GLXEW_VAR_EXPORT #else #define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT From 62616c381a8d156b2024ab7cde31780fe8ad4a70 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sun, 12 Aug 2012 20:21:27 -0500 Subject: [PATCH 06/26] 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 07/26] 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 @@
  • New features:
  • New extensions:
      From 35f724ebee0352f901b1fabb4b3f8bf6b165acbe Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Tue, 14 Aug 2012 18:42:34 -0500 Subject: [PATCH 08/26] Add GL_REGAL_enable extension, point to github for Regal extensions. --- auto/core/GL_REGAL_enable | 8 ++++++++ auto/core/GL_REGAL_error_string | 2 +- auto/core/GL_REGAL_extension_query | 2 +- auto/core/GL_REGAL_log | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 auto/core/GL_REGAL_enable diff --git a/auto/core/GL_REGAL_enable b/auto/core/GL_REGAL_enable new file mode 100644 index 0000000..07db3a1 --- /dev/null +++ b/auto/core/GL_REGAL_enable @@ -0,0 +1,8 @@ +GL_REGAL_enable +https://github.com/p3/regal/blob/master/doc/extensions/GL_REGAL_enable.txt +GL_REGAL_enable + GL_ERROR_REGAL 0x9322 + GL_DEBUG_REGAL 0x9323 + GL_LOG_REGAL 0x9324 + GL_EMULATION_REGAL 0x9325 + GL_LOADER_REGAL 0x9326 diff --git a/auto/core/GL_REGAL_error_string b/auto/core/GL_REGAL_error_string index c5ff4ce..8ea6409 100644 --- a/auto/core/GL_REGAL_error_string +++ b/auto/core/GL_REGAL_error_string @@ -1,4 +1,4 @@ GL_REGAL_error_string -https://github.com/p3/regal +https://github.com/p3/regal/blob/master/doc/extensions/GL_REGAL_error_string.txt GL_REGAL_error_string const GLchar* glErrorStringREGAL (GLenum error) diff --git a/auto/core/GL_REGAL_extension_query b/auto/core/GL_REGAL_extension_query index 5bf7245..d952651 100644 --- a/auto/core/GL_REGAL_extension_query +++ b/auto/core/GL_REGAL_extension_query @@ -1,5 +1,5 @@ GL_REGAL_extension_query -https://github.com/p3/regal +https://github.com/p3/regal/blob/master/doc/extensions/GL_REGAL_extension_query.txt GL_REGAL_extension_query GLboolean glGetExtensionREGAL (const GLchar* ext) GLboolean glIsSupportedREGAL (const GLchar* ext) diff --git a/auto/core/GL_REGAL_log b/auto/core/GL_REGAL_log index 62b1295..69ecaf2 100644 --- a/auto/core/GL_REGAL_log +++ b/auto/core/GL_REGAL_log @@ -1,5 +1,5 @@ GL_REGAL_log -http://www.opengl.org/registry/specs/REGAL/log.txt +https://github.com/p3/regal/blob/master/doc/extensions/GL_REGAL_log.txt GL_REGAL_log GL_LOG_ERROR_REGAL 0x9319 GL_LOG_WARNING_REGAL 0x931A From 62d2c87d5a55ab75514d730e646f1eef77cb4a09 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Tue, 14 Aug 2012 18:43:08 -0500 Subject: [PATCH 09/26] Fixup for deleting extensions that disappeared from opengl.org --- auto/bin/update_ext.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/auto/bin/update_ext.sh b/auto/bin/update_ext.sh index 1d521b4..2f38577 100755 --- a/auto/bin/update_ext.sh +++ b/auto/bin/update_ext.sh @@ -342,9 +342,9 @@ EOT EOT # Remove GL_ARB_debug_group, GL_ARB_debug_label and GL_ARB_debug_output2, for now - rm $1/GL_ARB_debug_group - rm $1/GL_ARB_debug_label - rm $1/GL_ARB_debug_output2 + rm -f $1/GL_ARB_debug_group + rm -f $1/GL_ARB_debug_label + rm -f $1/GL_ARB_debug_output2 # add typedefs to GL_ARB_cl_event # parse_spec.pl can't parse typedefs from New Types section, but ought to From 2de0716a469ed3ee9d5c479102b8e3288e4e0825 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Thu, 16 Aug 2012 14:01:11 -0500 Subject: [PATCH 10/26] Initial NaCL support for GLEW - it's not Windows or Linux/X11. --- auto/Makefile | 8 ++++---- auto/src/glew_head.c | 4 +++- auto/src/glew_init_tail.c | 4 ++-- auto/src/glew_utils.c | 2 +- auto/src/glew_utils.h | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/auto/Makefile b/auto/Makefile index c6914d4..5800434 100644 --- a/auto/Makefile +++ b/auto/Makefile @@ -188,7 +188,7 @@ $(S.DEST)/glew.c: $(EXT)/.dummy cat $(SRC)/glew_init_wgl.c >> $@ $(BIN)/make_list.pl $(WGL_EXT_SPEC) >> $@ echo -e "\n return GLEW_OK;\n}" >> $@; - echo -e "\n#elif !defined(__ANDROID__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX))" >> $@ + echo -e "\n#elif !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX))" >> $@ $(BIN)/make_def_fun.pl GLX $(GLX_CORE_SPEC) >> $@ $(BIN)/make_def_fun.pl GLX $(GLX_EXT_SPEC) >> $@ echo -e "\n#if !defined(GLEW_MX)" >> $@; @@ -203,7 +203,7 @@ $(S.DEST)/glew.c: $(EXT)/.dummy $(BIN)/make_list.pl $(CORE)/GLX_VERSION_1_3 | grep -v '\"GLX_VERSION' >> $@ $(BIN)/make_list.pl $(GLX_EXT_SPEC) >> $@ echo -e "\n return GLEW_OK;\n}" >> $@ - echo -e "\n#endif /* !defined(__ANDROID__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) */\n" >> $@; + echo -e "\n#endif /* !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) */\n" >> $@; cat $(SRC)/glew_init_tail.c >> $@ cat $(SRC)/glew_str_head.c >> $@ $(BIN)/make_str.pl $(GL_CORE_SPEC) $(GL_EXT_SPEC) >> $@ @@ -234,7 +234,7 @@ $(S.DEST)/glew_def.c: $(EXT)/.dummy $(BIN)/make_def_var.pl WGL $(WGL_EXT_SPEC) >> $@ echo -e "\n#endif /* _WIN32 */" >> $@ echo -e "\n#endif /* !GLEW_MX */" >> $@; - echo -e "\n#if !defined(_WIN32) && !defined(__ANDROID__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX))" >> $@ + echo -e "\n#if !defined(_WIN32) && !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX))" >> $@ $(BIN)/make_def_fun.pl GLX $(GLX_CORE_SPEC) >> $@ $(BIN)/make_def_fun.pl GLX $(GLX_EXT_SPEC) >> $@ echo -e "\n#if !defined(GLEW_MX)" >> $@; @@ -243,7 +243,7 @@ $(S.DEST)/glew_def.c: $(EXT)/.dummy $(BIN)/make_def_var.pl GLX $(GLX_CORE_SPEC) >> $@ $(BIN)/make_def_var.pl GLX $(GLX_EXT_SPEC) >> $@ echo -e "\n#endif /* !GLEW_MX */" >> $@; - echo -e "\n#endif /* !defined(_WIN32) && !defined(__ANDROID__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) */" >> $@; + echo -e "\n#endif /* !defined(_WIN32) && !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) */" >> $@; rm -f $@.bak $(S.DEST)/glew_init.c: $(EXT)/.dummy diff --git a/auto/src/glew_head.c b/auto/src/glew_head.c index d12e8c2..252d55a 100644 --- a/auto/src/glew_head.c +++ b/auto/src/glew_head.c @@ -2,7 +2,7 @@ #if defined(_WIN32) # include -#elif !defined(__ANDROID__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) +#elif !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) # include #endif @@ -135,6 +135,8 @@ void* NSGLGetProcAddress (const GLubyte *name) # define glewGetProcAddress(name) dlGetProcAddress(name) #elif defined(__ANDROID__) # define glewGetProcAddress(name) NULL /* TODO */ +#elif defined(__native_client__) +# define glewGetProcAddress(name) NULL /* TODO */ #else /* __linux */ # define glewGetProcAddress(name) (*glXGetProcAddressARB)(name) #endif diff --git a/auto/src/glew_init_tail.c b/auto/src/glew_init_tail.c index 90188bf..2316fb3 100644 --- a/auto/src/glew_init_tail.c +++ b/auto/src/glew_init_tail.c @@ -36,7 +36,7 @@ GLboolean glewExperimental = GL_FALSE; #if defined(_WIN32) extern GLenum GLEWAPIENTRY wglewContextInit (void); -#elif !defined(__ANDROID__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) +#elif !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) extern GLenum GLEWAPIENTRY glxewContextInit (void); #endif /* _WIN32 */ @@ -47,7 +47,7 @@ GLenum GLEWAPIENTRY glewInit (void) if ( r != 0 ) return r; #if defined(_WIN32) return wglewContextInit(); -#elif !defined(__ANDROID__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) /* _UNIX */ +#elif !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) /* _UNIX */ return glxewContextInit(); #else return r; diff --git a/auto/src/glew_utils.c b/auto/src/glew_utils.c index e31f048..a7748df 100644 --- a/auto/src/glew_utils.c +++ b/auto/src/glew_utils.c @@ -32,7 +32,7 @@ #include #if defined(_WIN32) # include -#elif !defined(__ANDROID__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) +#elif !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) # include #endif diff --git a/auto/src/glew_utils.h b/auto/src/glew_utils.h index e25d8b9..4291972 100644 --- a/auto/src/glew_utils.h +++ b/auto/src/glew_utils.h @@ -35,7 +35,7 @@ #include #if defined(_WIN32) # include -#elif !defined(__ANDROID__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) +#elif !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) # include #endif From 287c58f930f164f49cad8414846d511a15c91e50 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Thu, 16 Aug 2012 14:26:32 -0500 Subject: [PATCH 11/26] Add build support for NaCL - Google Native Client. --- Makefile | 6 ++++++ auto/src/glew_str_glx.c | 2 +- config/Makefile.nacl-32 | 36 ++++++++++++++++++++++++++++++++++++ config/Makefile.nacl-64 | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 config/Makefile.nacl-32 create mode 100644 config/Makefile.nacl-64 diff --git a/Makefile b/Makefile index a4fe9ce..8c67a95 100644 --- a/Makefile +++ b/Makefile @@ -184,7 +184,13 @@ VISUALINFO.BIN.SRC := src/visualinfo.c VISUALINFO.BIN.OBJ := $(addprefix tmp/$(SYSTEM)/default/shared/,$(notdir $(VISUALINFO.BIN.SRC))) VISUALINFO.BIN.OBJ := $(VISUALINFO.BIN.OBJ:.c=.o) +# Don't build glewinfo or visualinfo for NaCL, yet. + +ifneq ($(filter nacl%,$(SYSTEM)),) +glew.bin: glew.lib bin +else glew.bin: glew.lib bin bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) +endif bin: mkdir bin diff --git a/auto/src/glew_str_glx.c b/auto/src/glew_str_glx.c index ea2ba36..f6ddc6c 100644 --- a/auto/src/glew_str_glx.c +++ b/auto/src/glew_str_glx.c @@ -4,7 +4,7 @@ return ret; } -#elif !defined(__ANDROID__) && !defined(__APPLE__) || defined(GLEW_APPLE_GLX) +#elif !defined(__ANDROID__) && !defined(__native_client__) && !defined(__APPLE__) || defined(GLEW_APPLE_GLX) #if defined(GLEW_MX) GLboolean glxewContextIsSupported (const GLXEWContext* ctx, const char* name) diff --git a/config/Makefile.nacl-32 b/config/Makefile.nacl-32 new file mode 100644 index 0000000..2a5cec7 --- /dev/null +++ b/config/Makefile.nacl-32 @@ -0,0 +1,36 @@ +NAME = $(REGAL_NAME) + +M_PREFIX = i686 +M_NAME ?= $(shell uname -s) +ifeq (Linux,${M_NAME}) +M_PREFIX = i686 +endif + +CC = $(M_PREFIX)-nacl-gcc +CXX = $(M_PREFIX)-nacl-g++ +LD = $(M_PREFIX)-nacl-ld +STRIP ?= +EXT.DYNAMIC = so +LDFLAGS.EXTRA = +LIBDIR = +CFLAGS.EXTRA += -fPIC +CFLAGS.EXTRA += -m32 +LDFLAGS.EXTRA += -melf_nacl +LDFLAGS.GL = +LDFLAGS.GLU = -lRegalGLU +LDFLAGS.GLUT = -lRegalGLUT +LDFLAGS.STATIC = +LDFLAGS.DYNAMIC = -shared +WARN = -Wall -W -Wno-unused-parameter +POPT = -O2 +BIN.SUFFIX = +LIB.SONAME = lib$(NAME).so.$(SO_MAJOR) +LIB.DEVLNK = lib$(NAME).so +LIB.SHARED = lib$(NAME).so.$(SO_VERSION) +LIB.STATIC = lib$(NAME).a +LDFLAGS.SO = $(LDFLAGS.DYNAMIC) -soname=$(LIB.SONAME) +LIB.SONAME.MX = lib$(NAME)mx.so.$(SO_MAJOR) +LIB.DEVLNK.MX = lib$(NAME)mx.so +LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION) +LIB.STATIC.MX = lib$(NAME)mx.a +LDFLAGS.SO.MX = $(LDFLAGS.DYNAMIC) -soname=$(LIB.SONAME.MX) diff --git a/config/Makefile.nacl-64 b/config/Makefile.nacl-64 new file mode 100644 index 0000000..37cb6e9 --- /dev/null +++ b/config/Makefile.nacl-64 @@ -0,0 +1,36 @@ +NAME = $(REGAL_NAME) + +M_PREFIX = i686 +M_NAME ?= $(shell uname -s) +ifeq (Linux,${M_NAME}) +M_PREFIX = i686 +endif + +CC = $(M_PREFIX)-nacl-gcc +CXX = $(M_PREFIX)-nacl-g++ +LD = $(M_PREFIX)-nacl-ld +STRIP ?= +EXT.DYNAMIC = so +LDFLAGS.EXTRA = +LIBDIR = +CFLAGS.EXTRA += -fPIC +CFLAGS.EXTRA += -m64 +LDFLAGS.EXTRA += -melf64_nacl +LDFLAGS.GL = +LDFLAGS.GLU = -lRegalGLU +LDFLAGS.GLUT = -lRegalGLUT +LDFLAGS.STATIC = +LDFLAGS.DYNAMIC = -shared +WARN = -Wall -W -Wno-unused-parameter +POPT = -O2 +BIN.SUFFIX = +LIB.SONAME = lib$(NAME).so.$(SO_MAJOR) +LIB.DEVLNK = lib$(NAME).so +LIB.SHARED = lib$(NAME).so.$(SO_VERSION) +LIB.STATIC = lib$(NAME).a +LDFLAGS.SO = $(LDFLAGS.DYNAMIC) -soname=$(LIB.SONAME) +LIB.SONAME.MX = lib$(NAME)mx.so.$(SO_MAJOR) +LIB.DEVLNK.MX = lib$(NAME)mx.so +LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION) +LIB.STATIC.MX = lib$(NAME)mx.a +LDFLAGS.SO.MX = $(LDFLAGS.DYNAMIC) -soname=$(LIB.SONAME.MX) From d93aee1bbdf5c6c88076fc938eff862af921b6e2 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sat, 18 Aug 2012 21:58:57 -0500 Subject: [PATCH 12/26] Add GL_REGAL_ES1_0_compatibility and GL_REGAL_ES1_1_compatibility --- auto/core/GL_REGAL_ES1_0_compatibility | 36 ++++++++++++++++++++++++++ auto/core/GL_REGAL_ES1_1_compatibility | 16 ++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 auto/core/GL_REGAL_ES1_0_compatibility create mode 100644 auto/core/GL_REGAL_ES1_1_compatibility diff --git a/auto/core/GL_REGAL_ES1_0_compatibility b/auto/core/GL_REGAL_ES1_0_compatibility new file mode 100644 index 0000000..7b9f1fb --- /dev/null +++ b/auto/core/GL_REGAL_ES1_0_compatibility @@ -0,0 +1,36 @@ +GL_REGAL_ES1_0_compatibility +https://github.com/p3/regal/blob/master/doc/extensions/GL_REGAL_ES1_0_compatibility.txt +GL_REGAL_ES1_0_compatibility + typedef GLuint GLfixed + typedef GLuint GLclampx + void glAlphaFuncx (GLenum func, GLclampx ref) + void glClearColorx (GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha) + void glClearDepthx (GLclampx depth) + void glColor4x (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha) + void glDepthRangex (GLclampx zNear, GLclampx zFar) + void glFogx (GLenum pname, GLfixed param) + void glFogxv (GLenum pname, const GLfixed* params) + void glFrustumf (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar) + void glFrustumx (GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar) + void glLightModelx (GLenum pname, GLfixed param) + void glLightModelxv (GLenum pname, const GLfixed* params) + void glLightx (GLenum light, GLenum pname, GLfixed param) + void glLightxv (GLenum light, GLenum pname, const GLfixed* params) + void glLineWidthx (GLfixed width) + void glLoadMatrixx (const GLfixed* m) + void glMaterialx (GLenum face, GLenum pname, GLfixed param) + void glMaterialxv (GLenum face, GLenum pname, const GLfixed* params) + void glMultMatrixx (const GLfixed* m) + void glMultiTexCoord4x (GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q) + void glNormal3x (GLfixed nx, GLfixed ny, GLfixed nz) + void glOrthof (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar) + void glOrthox (GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar) + void glPointSizex (GLfixed size) + void glPolygonOffsetx (GLfixed factor, GLfixed units) + void glRotatex (GLfixed angle, GLfixed x, GLfixed y, GLfixed z) + void glSampleCoveragex (GLclampx value, GLboolean invert) + void glScalex (GLfixed x, GLfixed y, GLfixed z) + void glTexEnvx (GLenum target, GLenum pname, GLfixed param) + void glTexEnvxv (GLenum target, GLenum pname, const GLfixed* params) + void glTexParameterx (GLenum target, GLenum pname, GLfixed param) + void glTranslatex (GLfixed x, GLfixed y, GLfixed z) diff --git a/auto/core/GL_REGAL_ES1_1_compatibility b/auto/core/GL_REGAL_ES1_1_compatibility new file mode 100644 index 0000000..53b86cc --- /dev/null +++ b/auto/core/GL_REGAL_ES1_1_compatibility @@ -0,0 +1,16 @@ +GL_REGAL_ES1_1_compatibility +https://github.com/p3/regal/blob/master/doc/extensions/GL_REGAL_ES1_1_compatibility.txt +GL_REGAL_ES1_1_compatibility + void glClipPlanef (GLenum plane, const GLfloat* equation) + void glClipPlanex (GLenum plane, const GLfixed* equation) + void glGetClipPlanef (GLenum pname, GLfloat eqn[4]) + void glGetClipPlanex (GLenum pname, GLfixed eqn[4]) + void glGetFixedv (GLenum pname, GLfixed* params) + void glGetLightxv (GLenum light, GLenum pname, GLfixed* params) + void glGetMaterialxv (GLenum face, GLenum pname, GLfixed* params) + void glGetTexEnvxv (GLenum env, GLenum pname, GLfixed* params) + void glGetTexParameterxv (GLenum target, GLenum pname, GLfixed* params) + void glPointParameterx (GLenum pname, GLfixed param) + void glPointParameterxv (GLenum pname, const GLfixed* params) + void glPointSizePointerOES (GLenum type, GLsizei stride, const GLvoid* pointer) + void glTexParameterxv (GLenum target, GLenum pname, const GLfixed* params) From 31f9a387e28d0943a8b9363306f2e9499b1cae2b Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sun, 19 Aug 2012 12:07:58 -0500 Subject: [PATCH 13/26] Fixup for GLfixed as part of ES2_compatibility. --- auto/bin/update_ext.sh | 7 +++++++ auto/core/GL_REGAL_ES1_0_compatibility | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/auto/bin/update_ext.sh b/auto/bin/update_ext.sh index 2f38577..111f6f1 100755 --- a/auto/bin/update_ext.sh +++ b/auto/bin/update_ext.sh @@ -428,6 +428,13 @@ EOT grep -v 'GL_COMPRESSED_RGBA_S3TC_DXT1_EXT' $1/GL_EXT_texture_compression_dxt1 > tmp mv tmp $1/GL_EXT_texture_compression_dxt1 +# Append GLfixed to GL_ARB_ES2_compatibility +# Probably ought to be explicitly mentioned in the spec language + + cat >> $1/GL_ARB_ES2_compatibility < Date: Wed, 22 Aug 2012 23:03:20 -0500 Subject: [PATCH 14/26] Rename GL_REGAL_enable GL_LOADER_REGAL to GL_DRIVER_REGAL --- auto/core/GL_REGAL_enable | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auto/core/GL_REGAL_enable b/auto/core/GL_REGAL_enable index 07db3a1..283fb9a 100644 --- a/auto/core/GL_REGAL_enable +++ b/auto/core/GL_REGAL_enable @@ -5,4 +5,4 @@ GL_REGAL_enable GL_DEBUG_REGAL 0x9323 GL_LOG_REGAL 0x9324 GL_EMULATION_REGAL 0x9325 - GL_LOADER_REGAL 0x9326 + GL_DRIVER_REGAL 0x9326 From 6ceace91e786d7d7ed500433da99bda994886f0a Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Mon, 27 Aug 2012 22:20:33 -0500 Subject: [PATCH 15/26] Detect ES 2.0 __gl2_h_ header too. --- auto/src/glew_head.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/auto/src/glew_head.h b/auto/src/glew_head.h index ac72d63..c9f1189 100644 --- a/auto/src/glew_head.h +++ b/auto/src/glew_head.h @@ -5,6 +5,9 @@ #if defined(__gl_h_) || defined(__GL_H__) || defined(__X_GL_H) #error gl.h included before glew.h #endif +#if defined(__gl2_h_) +#error gl2.h included before glew.h +#endif #if defined(__REGAL_H__) #error Regal.h included before glew.h #endif @@ -16,6 +19,7 @@ #endif #define __gl_h_ +#define __gl2_h_ #define __GL_H__ #define __REGAL_H__ #define __X_GL_H From aeb1d3309620bb7fd7f8aec67f495e569cd7385e Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Mon, 17 Sep 2012 17:42:14 -0500 Subject: [PATCH 16/26] #39 patch for PPC64 linux Makefile --- config/Makefile.linux | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/config/Makefile.linux b/config/Makefile.linux index 4bc9a53..234adc6 100644 --- a/config/Makefile.linux +++ b/config/Makefile.linux @@ -2,12 +2,19 @@ NAME = $(GLEW_NAME) CC = cc LD = cc M_ARCH ?= $(shell uname -m) +ARCH64 = false ifeq (x86_64,${M_ARCH}) -LDFLAGS.EXTRA = -L/usr/X11R6/lib64 -L/usr/lib64 -LIBDIR = $(GLEW_DEST)/lib64 + ARCH64 = true +endif +ifeq (ppc64,${M_ARCH}) + ARCH64 = true +endif +ifeq (${ARCH64},true) + LDFLAGS.EXTRA = -L/usr/X11R6/lib64 -L/usr/lib64 + LIBDIR = $(GLEW_DEST)/lib64 else -LDFLAGS.EXTRA = -L/usr/X11R6/lib -L/usr/lib -LIBDIR = $(GLEW_DEST)/lib + LDFLAGS.EXTRA = -L/usr/X11R6/lib -L/usr/lib + LIBDIR = $(GLEW_DEST)/lib endif LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 LDFLAGS.STATIC = -Wl,-Bstatic From c8962f911284b9c44ca56805f9be6e0930b3d70b Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Mon, 17 Sep 2012 17:54:25 -0500 Subject: [PATCH 17/26] Patch #38 Makefile.openbsd --- config/Makefile.openbsd | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 config/Makefile.openbsd diff --git a/config/Makefile.openbsd b/config/Makefile.openbsd new file mode 100644 index 0000000..365ea9e --- /dev/null +++ b/config/Makefile.openbsd @@ -0,0 +1,22 @@ +NAME = $(GLEW_NAME) +CC = cc +LD = ld +LDFLAGS.EXTRA = -L/usr/X11R6/lib +LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11 -lm +LDFLAGS.STATIC = -Wl,-Bstatic +LDFLAGS.DYNAMIC = -Wl,-Bdynamic +CFLAGS.EXTRA += -I/usr/X11R6/include +NAME = GLEW +WARN = -Wall -W +POPT = -O2 +BIN.SUFFIX = +LIB.SONAME = lib$(NAME).so.$(SO_MAJOR) +LIB.DEVLNK = lib$(NAME).so +LIB.SHARED = lib$(NAME).so.$(SO_VERSION) +LIB.STATIC = lib$(NAME).a +LDFLAGS.SO = -shared -soname $(LIB.SONAME) +LIB.SONAME.MX = lib$(NAME)mx.so.$(SO_MAJOR) +LIB.DEVLNK.MX = lib$(NAME)mx.so +LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION) +LIB.STATIC.MX = lib$(NAME)mx.a +LDFLAGS.SO.MX = -shared -soname $(LIB.SONAME.MX) From 0580fdd09b3f45ffda75e9efc2b1aa10fafe6e05 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Mon, 17 Sep 2012 18:21:01 -0500 Subject: [PATCH 18/26] For Bug #202 GLX_AMD_gpu_association entry points are missing --- auto/core/GLX_AMD_gpu_association | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/auto/core/GLX_AMD_gpu_association b/auto/core/GLX_AMD_gpu_association index e5561d9..002164e 100644 --- a/auto/core/GLX_AMD_gpu_association +++ b/auto/core/GLX_AMD_gpu_association @@ -11,3 +11,12 @@ GLX_AMD_gpu_association GLX_GPU_NUM_SIMD_AMD 0x21A6 GLX_GPU_NUM_RB_AMD 0x21A7 GLX_GPU_NUM_SPI_AMD 0x21A8 + void glXBlitContextFramebufferAMD (GLXContext dstCtx, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter) + GLXContext glXCreateAssociatedContextAMD (unsigned int id, GLXContext share_list) + GLXContext glXCreateAssociatedContextAttribsAMD (unsigned int id, GLXContext share_context, const int* attribList) + Bool glXDeleteAssociatedContextAMD (GLXContext ctx) + unsigned int glXGetContextGPUIDAMD (GLXContext ctx) + GLXContext glXGetCurrentAssociatedContextAMD (void) + unsigned int glXGetGPUIDsAMD (unsigned int maxCount, unsigned int* ids) + int glXGetGPUInfoAMD (unsigned int id, int property, GLenum dataType, unsigned int size, void* data) + Bool glXMakeAssociatedContextCurrentAMD (GLXContext ctx) From 027efdea2a6c22634b825a19a5da9e2b1bf21f9a Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Mon, 17 Sep 2012 18:32:31 -0500 Subject: [PATCH 19/26] Resolve bug #200 glGetPointerv of GL_KHR_debug hides OpenGL 1.1. --- auto/bin/update_ext.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/auto/bin/update_ext.sh b/auto/bin/update_ext.sh index 111f6f1..8cbaa19 100755 --- a/auto/bin/update_ext.sh +++ b/auto/bin/update_ext.sh @@ -341,6 +341,10 @@ EOT typedef void (APIENTRY *GLDEBUGPROC)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, GLvoid* userParam) EOT +# Remove glGetPointerv from GL_KHR_debug + grep -v "glGetPointerv" $1/GL_KHR_debug > tmp + mv tmp $1/GL_KHR_debug + # Remove GL_ARB_debug_group, GL_ARB_debug_label and GL_ARB_debug_output2, for now rm -f $1/GL_ARB_debug_group rm -f $1/GL_ARB_debug_label From 8e4d04a53b616a1a14aa39843279e7998a210741 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Mon, 17 Sep 2012 18:46:19 -0500 Subject: [PATCH 20/26] Workaround for bug #199 glPopDebugGroup() missing. Need to upstream fix to http://www.opengl.org/registry/specs/KHR/debug.txt too. --- auto/core/GL_KHR_debug | 54 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 auto/core/GL_KHR_debug diff --git a/auto/core/GL_KHR_debug b/auto/core/GL_KHR_debug new file mode 100644 index 0000000..2bd5948 --- /dev/null +++ b/auto/core/GL_KHR_debug @@ -0,0 +1,54 @@ +GL_KHR_debug +http://www.opengl.org/registry/specs/KHR/debug.txt +GL_KHR_debug + GL_CONTEXT_FLAG_DEBUG_BIT 0x00000002 + GL_STACK_OVERFLOW 0x0503 + GL_STACK_UNDERFLOW 0x0504 + GL_DEBUG_OUTPUT_SYNCHRONOUS 0x8242 + GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243 + GL_DEBUG_CALLBACK_FUNCTION 0x8244 + GL_DEBUG_CALLBACK_USER_PARAM 0x8245 + GL_DEBUG_SOURCE_API 0x8246 + GL_DEBUG_SOURCE_WINDOW_SYSTEM 0x8247 + GL_DEBUG_SOURCE_SHADER_COMPILER 0x8248 + GL_DEBUG_SOURCE_THIRD_PARTY 0x8249 + GL_DEBUG_SOURCE_APPLICATION 0x824A + GL_DEBUG_SOURCE_OTHER 0x824B + GL_DEBUG_TYPE_ERROR 0x824C + GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D + GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR 0x824E + GL_DEBUG_TYPE_PORTABILITY 0x824F + GL_DEBUG_TYPE_PERFORMANCE 0x8250 + GL_DEBUG_TYPE_OTHER 0x8251 + GL_DEBUG_TYPE_MARKER 0x8268 + GL_DEBUG_TYPE_PUSH_GROUP 0x8269 + GL_DEBUG_TYPE_POP_GROUP 0x826A + GL_DEBUG_SEVERITY_NOTIFICATION 0x826B + GL_MAX_DEBUG_GROUP_STACK_DEPTH 0x826C + GL_DEBUG_GROUP_STACK_DEPTH 0x826D + GL_BUFFER 0x82E0 + GL_SHADER 0x82E1 + GL_PROGRAM 0x82E2 + GL_QUERY 0x82E3 + GL_PROGRAM_PIPELINE 0x82E4 + GL_SAMPLER 0x82E6 + GL_DISPLAY_LIST 0x82E7 + GL_MAX_LABEL_LENGTH 0x82E8 + GL_MAX_DEBUG_MESSAGE_LENGTH 0x9143 + GL_MAX_DEBUG_LOGGED_MESSAGES 0x9144 + GL_DEBUG_LOGGED_MESSAGES 0x9145 + GL_DEBUG_SEVERITY_HIGH 0x9146 + GL_DEBUG_SEVERITY_MEDIUM 0x9147 + GL_DEBUG_SEVERITY_LOW 0x9148 + GL_DEBUG_OUTPUT 0x92E0 + void glDebugMessageCallback (GLDEBUGPROC callback, void* userParam) + void glDebugMessageControl (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint* ids, GLboolean enabled) + void glDebugMessageInsert (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* buf) + GLuint glGetDebugMessageLog (GLuint count, GLsizei bufsize, GLenum* sources, GLenum* types, GLuint* ids, GLenum* severities, GLsizei* lengths, GLchar* messageLog) + void glGetObjectLabel (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei* length, GLchar *label) + void glGetObjectPtrLabel (void* ptr, GLsizei bufSize, GLsizei* length, GLchar *label) + void glObjectLabel (GLenum identifier, GLuint name, GLsizei length, const GLchar* label) + void glObjectPtrLabel (void* ptr, GLsizei length, const GLchar* label) + void glPushDebugGroup (GLenum source, GLuint id, GLsizei length, const GLchar * message) + void glPopDebugGroup (void) + typedef void (APIENTRY *GLDEBUGPROC)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, GLvoid* userParam) From 025cdbe1e91fff4067b5381957d7137400f2fcbd Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Thu, 20 Sep 2012 13:10:55 -0500 Subject: [PATCH 21/26] GL_KHR_debug can be parsed from upstream, now. --- auto/core/GL_KHR_debug | 54 ------------------------------------------ 1 file changed, 54 deletions(-) delete mode 100644 auto/core/GL_KHR_debug diff --git a/auto/core/GL_KHR_debug b/auto/core/GL_KHR_debug deleted file mode 100644 index 2bd5948..0000000 --- a/auto/core/GL_KHR_debug +++ /dev/null @@ -1,54 +0,0 @@ -GL_KHR_debug -http://www.opengl.org/registry/specs/KHR/debug.txt -GL_KHR_debug - GL_CONTEXT_FLAG_DEBUG_BIT 0x00000002 - GL_STACK_OVERFLOW 0x0503 - GL_STACK_UNDERFLOW 0x0504 - GL_DEBUG_OUTPUT_SYNCHRONOUS 0x8242 - GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243 - GL_DEBUG_CALLBACK_FUNCTION 0x8244 - GL_DEBUG_CALLBACK_USER_PARAM 0x8245 - GL_DEBUG_SOURCE_API 0x8246 - GL_DEBUG_SOURCE_WINDOW_SYSTEM 0x8247 - GL_DEBUG_SOURCE_SHADER_COMPILER 0x8248 - GL_DEBUG_SOURCE_THIRD_PARTY 0x8249 - GL_DEBUG_SOURCE_APPLICATION 0x824A - GL_DEBUG_SOURCE_OTHER 0x824B - GL_DEBUG_TYPE_ERROR 0x824C - GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D - GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR 0x824E - GL_DEBUG_TYPE_PORTABILITY 0x824F - GL_DEBUG_TYPE_PERFORMANCE 0x8250 - GL_DEBUG_TYPE_OTHER 0x8251 - GL_DEBUG_TYPE_MARKER 0x8268 - GL_DEBUG_TYPE_PUSH_GROUP 0x8269 - GL_DEBUG_TYPE_POP_GROUP 0x826A - GL_DEBUG_SEVERITY_NOTIFICATION 0x826B - GL_MAX_DEBUG_GROUP_STACK_DEPTH 0x826C - GL_DEBUG_GROUP_STACK_DEPTH 0x826D - GL_BUFFER 0x82E0 - GL_SHADER 0x82E1 - GL_PROGRAM 0x82E2 - GL_QUERY 0x82E3 - GL_PROGRAM_PIPELINE 0x82E4 - GL_SAMPLER 0x82E6 - GL_DISPLAY_LIST 0x82E7 - GL_MAX_LABEL_LENGTH 0x82E8 - GL_MAX_DEBUG_MESSAGE_LENGTH 0x9143 - GL_MAX_DEBUG_LOGGED_MESSAGES 0x9144 - GL_DEBUG_LOGGED_MESSAGES 0x9145 - GL_DEBUG_SEVERITY_HIGH 0x9146 - GL_DEBUG_SEVERITY_MEDIUM 0x9147 - GL_DEBUG_SEVERITY_LOW 0x9148 - GL_DEBUG_OUTPUT 0x92E0 - void glDebugMessageCallback (GLDEBUGPROC callback, void* userParam) - void glDebugMessageControl (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint* ids, GLboolean enabled) - void glDebugMessageInsert (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* buf) - GLuint glGetDebugMessageLog (GLuint count, GLsizei bufsize, GLenum* sources, GLenum* types, GLuint* ids, GLenum* severities, GLsizei* lengths, GLchar* messageLog) - void glGetObjectLabel (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei* length, GLchar *label) - void glGetObjectPtrLabel (void* ptr, GLsizei bufSize, GLsizei* length, GLchar *label) - void glObjectLabel (GLenum identifier, GLuint name, GLsizei length, const GLchar* label) - void glObjectPtrLabel (void* ptr, GLsizei length, const GLchar* label) - void glPushDebugGroup (GLenum source, GLuint id, GLsizei length, const GLchar * message) - void glPopDebugGroup (void) - typedef void (APIENTRY *GLDEBUGPROC)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, GLvoid* userParam) From 81b477d87745fdc56812a0e12b3682e39a2807e6 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Thu, 27 Sep 2012 13:17:01 -0500 Subject: [PATCH 22/26] Remove various duplicate enums. --- auto/bin/update_ext.sh | 4 ++++ auto/core/GL_ARB_vertex_attrib_64bit | 6 ------ auto/core/GL_NV_path_rendering | 2 -- auto/core/GL_VERSION_1_2 | 1 - auto/core/GL_VERSION_3_0 | 2 -- auto/core/GL_VERSION_3_3 | 5 ----- auto/core/GL_VERSION_4_0 | 5 ----- 7 files changed, 4 insertions(+), 21 deletions(-) diff --git a/auto/bin/update_ext.sh b/auto/bin/update_ext.sh index 8cbaa19..74aa8d6 100755 --- a/auto/bin/update_ext.sh +++ b/auto/bin/update_ext.sh @@ -439,6 +439,10 @@ EOT typedef int GLfixed EOT +# Filter out GL_BYTE from GL_OES_byte_coordinates + grep -v 'GL_BYTE' $1/GL_OES_byte_coordinates > tmp + mv tmp $1/GL_OES_byte_coordinates + # clean up rm -f $1/*.bak diff --git a/auto/core/GL_ARB_vertex_attrib_64bit b/auto/core/GL_ARB_vertex_attrib_64bit index 079dce2..a30aa06 100644 --- a/auto/core/GL_ARB_vertex_attrib_64bit +++ b/auto/core/GL_ARB_vertex_attrib_64bit @@ -1,12 +1,6 @@ GL_ARB_vertex_attrib_64bit http://www.opengl.org/registry/specs/ARB/vertex_attrib_64bit.txt GL_ARB_vertex_attrib_64bit - GL_DOUBLE_MAT2 0x8F46 - GL_DOUBLE_MAT3 0x8F47 - GL_DOUBLE_MAT4 0x8F48 - GL_DOUBLE_VEC2 0x8FFC - GL_DOUBLE_VEC3 0x8FFD - GL_DOUBLE_VEC4 0x8FFE void glGetVertexAttribLdv (GLuint index, GLenum pname, GLdouble* params) void glVertexAttribL1d (GLuint index, GLdouble x) void glVertexAttribL1dv (GLuint index, const GLdouble* v) diff --git a/auto/core/GL_NV_path_rendering b/auto/core/GL_NV_path_rendering index a3239b4..42e1336 100644 --- a/auto/core/GL_NV_path_rendering +++ b/auto/core/GL_NV_path_rendering @@ -46,8 +46,6 @@ GL_NV_path_rendering GL_ARC_TO_NV 0xFE GL_RELATIVE_ARC_TO_NV 0xFF GL_GLYPH_HAS_KERNING_BIT_NV 0x100 - GL_PRIMARY_COLOR_NV 0x852C - GL_SECONDARY_COLOR_NV 0x852D GL_PRIMARY_COLOR 0x8577 GL_PATH_FORMAT_SVG_NV 0x9070 GL_PATH_FORMAT_PS_NV 0x9071 diff --git a/auto/core/GL_VERSION_1_2 b/auto/core/GL_VERSION_1_2 index fb55054..985b59b 100644 --- a/auto/core/GL_VERSION_1_2 +++ b/auto/core/GL_VERSION_1_2 @@ -13,7 +13,6 @@ http://www.opengl.org/documentation/specs/version1.2/opengl1.2.1.pdf GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365 GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366 GL_UNSIGNED_INT_8_8_8_8_REV 0x8367 - GL_UNSIGNED_INT_2_10_10_10_REV 0x8368 GL_BGR 0x80E0 GL_BGRA 0x80E1 GL_MAX_ELEMENTS_VERTICES 0x80E8 diff --git a/auto/core/GL_VERSION_3_0 b/auto/core/GL_VERSION_3_0 index 869d654..747eb83 100644 --- a/auto/core/GL_VERSION_3_0 +++ b/auto/core/GL_VERSION_3_0 @@ -15,8 +15,6 @@ http://www.opengl.org/registry/doc/glspec30.20080811.pdf GL_CONTEXT_FLAGS 0x821E GL_DEPTH_BUFFER 0x8223 GL_STENCIL_BUFFER 0x8224 - GL_COMPRESSED_RED 0x8225 - GL_COMPRESSED_RG 0x8226 GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x0001 GL_RGBA32F 0x8814 GL_RGB32F 0x8815 diff --git a/auto/core/GL_VERSION_3_3 b/auto/core/GL_VERSION_3_3 index a302081..1fbe90b 100644 --- a/auto/core/GL_VERSION_3_3 +++ b/auto/core/GL_VERSION_3_3 @@ -1,11 +1,6 @@ GL_VERSION_3_3 http://www.opengl.org/registry/doc/glspec32.core.20090803.pdf - GL_TEXTURE_SWIZZLE_R 0x8E42 - GL_TEXTURE_SWIZZLE_G 0x8E43 - GL_TEXTURE_SWIZZLE_B 0x8E44 - GL_TEXTURE_SWIZZLE_A 0x8E45 - GL_TEXTURE_SWIZZLE_RGBA 0x8E46 GL_RGB10_A2UI 0x906F GL_VERTEX_ATTRIB_ARRAY_DIVISOR 0x88FE void glVertexAttribDivisor (GLuint index, GLuint divisor) diff --git a/auto/core/GL_VERSION_4_0 b/auto/core/GL_VERSION_4_0 index 9a118c9..dc33f91 100644 --- a/auto/core/GL_VERSION_4_0 +++ b/auto/core/GL_VERSION_4_0 @@ -3,11 +3,6 @@ http://www.opengl.org/registry/doc/glspec32.core.20090803.pdf GL_SAMPLE_SHADING 0x8C36 GL_MIN_SAMPLE_SHADING_VALUE 0x8C37 - GL_GEOMETRY_SHADER_INVOCATIONS 0x887F - GL_MAX_GEOMETRY_SHADER_INVOCATIONS 0x8E5A - GL_MIN_FRAGMENT_INTERPOLATION_OFFSET 0x8E5B - GL_MAX_FRAGMENT_INTERPOLATION_OFFSET 0x8E5C - GL_FRAGMENT_INTERPOLATION_OFFSET_BITS 0x8E5D GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5E GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5F GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS 0x8F9F From 7563efa7e38d4db5b0ebd63b1c6b4985358ce3f4 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Wed, 24 Oct 2012 08:37:05 -0500 Subject: [PATCH 23/26] Update documentation to point at new git repository. --- auto/doc/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/auto/doc/index.html b/auto/doc/index.html index 2e6db99..2fcc864 100644 --- a/auto/doc/index.html +++ b/auto/doc/index.html @@ -46,10 +46,10 @@ as source and precompiled binaries. The latest release is

      -An up-to-date copy is also available from the project repository: +An up-to-date copy is also available from the project repository:

      -git clone git://glew.git.sourceforge.net/gitroot/glew/glew +git clone git://git.code.sf.net/p/glew/code glew-code

      Supported Extensions

      From e2036b5afd10d293d57b557a7506c4b1ea3c414b Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Wed, 24 Oct 2012 14:07:29 -0500 Subject: [PATCH 24/26] Add experimental OpenGL ES extension support, disabled by default. Move registry into registry/gl, move extensions into extensions/gl. This allows room for registry/gles and extensions/gles. Extension filtering moved from update_ext.sh to filter_gl_ext.sh, different logic for OpenGL ES. --- auto/Makefile | 25 +- auto/bin/filter_gl_ext.sh | 443 ++++++++++++++++++ auto/bin/filter_gles_ext.sh | 19 + auto/bin/parse_spec.pl | 1 + auto/bin/update_ext.sh | 426 +---------------- auto/bin/update_registry.sh | 2 +- auto/core/{ => gl}/GLX_AMD_gpu_association | 0 auto/core/{ => gl}/GLX_ARB_get_proc_address | 0 auto/core/{ => gl}/GLX_ATI_pixel_format_float | 0 auto/core/{ => gl}/GLX_ATI_render_texture | 0 .../GLX_EXT_create_context_es2_profile | 0 .../GLX_EXT_create_context_es_profile | 0 .../{ => gl}/GLX_EXT_fbconfig_packed_float | 0 auto/core/{ => gl}/GLX_EXT_framebuffer_sRGB | 0 auto/core/{ => gl}/GLX_MESA_swap_control | 0 auto/core/{ => gl}/GLX_NV_float_buffer | 0 auto/core/{ => gl}/GLX_NV_vertex_array_range | 0 .../core/{ => gl}/GLX_SGIS_shared_multisample | 0 auto/core/{ => gl}/GLX_SGIX_hyperpipe | 0 auto/core/{ => gl}/GLX_SGIX_swap_barrier | 0 auto/core/{ => gl}/GLX_SGIX_swap_group | 0 auto/core/{ => gl}/GLX_SGI_video_sync | 0 auto/core/{ => gl}/GLX_SUN_video_resize | 0 auto/core/{ => gl}/GLX_VERSION_1_2 | 0 auto/core/{ => gl}/GLX_VERSION_1_3 | 0 auto/core/{ => gl}/GLX_VERSION_1_4 | 0 auto/core/{ => gl}/GL_APPLE_float_pixels | 0 auto/core/{ => gl}/GL_APPLE_pixel_buffer | 0 auto/core/{ => gl}/GL_APPLE_texture_range | 0 auto/core/{ => gl}/GL_ARB_draw_instanced | 0 auto/core/{ => gl}/GL_ARB_imaging | 0 auto/core/{ => gl}/GL_ARB_instanced_arrays | 0 .../{ => gl}/GL_ARB_internalformat_query2 | 0 auto/core/{ => gl}/GL_ARB_matrix_palette | 0 auto/core/{ => gl}/GL_ARB_multitexture | 0 auto/core/{ => gl}/GL_ARB_robustness | 0 .../{ => gl}/GL_ARB_separate_shader_objects | 0 auto/core/{ => gl}/GL_ARB_vertex_attrib_64bit | 0 auto/core/{ => gl}/GL_ARB_vertex_blend | 0 auto/core/{ => gl}/GL_ATIX_point_sprites | 0 .../{ => gl}/GL_ATIX_texture_env_combine3 | 0 auto/core/{ => gl}/GL_ATIX_texture_env_route | 0 .../GL_ATIX_vertex_shader_output_point_size | 0 auto/core/{ => gl}/GL_ATI_envmap_bumpmap | 0 auto/core/{ => gl}/GL_ATI_map_object_buffer | 0 auto/core/{ => gl}/GL_ATI_pn_triangles | 0 auto/core/{ => gl}/GL_ATI_separate_stencil | 0 auto/core/{ => gl}/GL_ATI_shader_texture_lod | 0 .../{ => gl}/GL_ATI_texture_compression_3dc | 0 auto/core/{ => gl}/GL_ATI_vertex_streams | 0 auto/core/{ => gl}/GL_EXT_Cg_shader | 0 auto/core/{ => gl}/GL_EXT_bindable_uniform | 0 auto/core/{ => gl}/GL_EXT_debug_marker | 0 auto/core/{ => gl}/GL_EXT_depth_bounds_test | 0 auto/core/{ => gl}/GL_EXT_draw_instanced | 0 auto/core/{ => gl}/GL_EXT_draw_range_elements | 0 auto/core/{ => gl}/GL_EXT_fog_coord | 0 auto/core/{ => gl}/GL_EXT_framebuffer_sRGB | 0 auto/core/{ => gl}/GL_EXT_geometry_shader4 | 0 .../{ => gl}/GL_EXT_gpu_program_parameters | 0 auto/core/{ => gl}/GL_EXT_gpu_shader4 | 0 auto/core/{ => gl}/GL_EXT_packed_float | 0 auto/core/{ => gl}/GL_EXT_pixel_buffer_object | 0 auto/core/{ => gl}/GL_EXT_secondary_color | 0 auto/core/{ => gl}/GL_EXT_texture_array | 0 .../{ => gl}/GL_EXT_texture_buffer_object | 0 .../{ => gl}/GL_EXT_texture_compression_latc | 0 .../{ => gl}/GL_EXT_texture_compression_rgtc | 0 auto/core/{ => gl}/GL_EXT_texture_cube_map | 0 auto/core/{ => gl}/GL_EXT_texture_edge_clamp | 0 auto/core/{ => gl}/GL_EXT_texture_integer | 0 auto/core/{ => gl}/GL_EXT_texture_rectangle | 0 .../{ => gl}/GL_EXT_texture_shared_exponent | 0 auto/core/{ => gl}/GL_EXT_timer_query | 0 auto/core/{ => gl}/GL_EXT_vertex_shader | 0 auto/core/{ => gl}/GL_KTX_buffer_region | 0 auto/core/{ => gl}/GL_NVX_gpu_memory_info | 0 auto/core/{ => gl}/GL_NV_depth_buffer_float | 0 .../core/{ => gl}/GL_NV_depth_range_unclamped | 0 auto/core/{ => gl}/GL_NV_fragment_program2 | 0 auto/core/{ => gl}/GL_NV_fragment_program4 | 0 .../{ => gl}/GL_NV_fragment_program_option | 0 .../GL_NV_framebuffer_multisample_coverage | 0 auto/core/{ => gl}/GL_NV_geometry_program4 | 0 auto/core/{ => gl}/GL_NV_geometry_shader4 | 0 auto/core/{ => gl}/GL_NV_gpu_program4 | 0 auto/core/{ => gl}/GL_NV_gpu_program5 | 0 .../{ => gl}/GL_NV_parameter_buffer_object | 0 auto/core/{ => gl}/GL_NV_path_rendering | 0 auto/core/{ => gl}/GL_NV_present_video | 0 .../core/{ => gl}/GL_NV_tessellation_program5 | 0 auto/core/{ => gl}/GL_NV_transform_feedback | 0 auto/core/{ => gl}/GL_NV_vdpau_interop | 0 .../{ => gl}/GL_NV_vertex_program2_option | 0 auto/core/{ => gl}/GL_NV_vertex_program3 | 0 auto/core/{ => gl}/GL_NV_vertex_program4 | 0 .../{ => gl}/GL_REGAL_ES1_0_compatibility | 0 .../{ => gl}/GL_REGAL_ES1_1_compatibility | 0 auto/core/{ => gl}/GL_REGAL_enable | 0 auto/core/{ => gl}/GL_REGAL_error_string | 0 auto/core/{ => gl}/GL_REGAL_extension_query | 0 auto/core/{ => gl}/GL_REGAL_log | 0 auto/core/{ => gl}/GL_SGIX_shadow | 0 auto/core/{ => gl}/GL_SUN_read_video_pixels | 0 auto/core/{ => gl}/GL_VERSION_1_2 | 0 auto/core/{ => gl}/GL_VERSION_1_2_1 | 0 auto/core/{ => gl}/GL_VERSION_1_3 | 0 auto/core/{ => gl}/GL_VERSION_1_4 | 0 auto/core/{ => gl}/GL_VERSION_1_5 | 0 auto/core/{ => gl}/GL_VERSION_2_0 | 0 auto/core/{ => gl}/GL_VERSION_2_1 | 0 auto/core/{ => gl}/GL_VERSION_3_0 | 0 auto/core/{ => gl}/GL_VERSION_3_1 | 0 auto/core/{ => gl}/GL_VERSION_3_2 | 0 auto/core/{ => gl}/GL_VERSION_3_3 | 0 auto/core/{ => gl}/GL_VERSION_4_0 | 0 auto/core/{ => gl}/GL_VERSION_4_1 | 0 auto/core/{ => gl}/GL_VERSION_4_2 | 0 auto/core/{ => gl}/GL_VERSION_4_3 | 0 auto/core/{ => gl}/GL_WIN_swap_hint | 0 auto/core/{ => gl}/WGL_ARB_create_context | 0 .../{ => gl}/WGL_ATI_render_texture_rectangle | 0 .../WGL_EXT_create_context_es2_profile | 0 .../WGL_EXT_create_context_es_profile | 0 auto/core/{ => gl}/WGL_EXT_framebuffer_sRGB | 0 .../WGL_EXT_pixel_format_packed_float | 0 auto/core/{ => gl}/WGL_NV_gpu_affinity | 0 auto/core/{ => gl}/WGL_NV_vertex_array_range | 0 128 files changed, 486 insertions(+), 430 deletions(-) create mode 100755 auto/bin/filter_gl_ext.sh create mode 100755 auto/bin/filter_gles_ext.sh rename auto/core/{ => gl}/GLX_AMD_gpu_association (100%) rename auto/core/{ => gl}/GLX_ARB_get_proc_address (100%) rename auto/core/{ => gl}/GLX_ATI_pixel_format_float (100%) rename auto/core/{ => gl}/GLX_ATI_render_texture (100%) rename auto/core/{ => gl}/GLX_EXT_create_context_es2_profile (100%) rename auto/core/{ => gl}/GLX_EXT_create_context_es_profile (100%) rename auto/core/{ => gl}/GLX_EXT_fbconfig_packed_float (100%) rename auto/core/{ => gl}/GLX_EXT_framebuffer_sRGB (100%) rename auto/core/{ => gl}/GLX_MESA_swap_control (100%) rename auto/core/{ => gl}/GLX_NV_float_buffer (100%) rename auto/core/{ => gl}/GLX_NV_vertex_array_range (100%) rename auto/core/{ => gl}/GLX_SGIS_shared_multisample (100%) rename auto/core/{ => gl}/GLX_SGIX_hyperpipe (100%) rename auto/core/{ => gl}/GLX_SGIX_swap_barrier (100%) rename auto/core/{ => gl}/GLX_SGIX_swap_group (100%) rename auto/core/{ => gl}/GLX_SGI_video_sync (100%) rename auto/core/{ => gl}/GLX_SUN_video_resize (100%) rename auto/core/{ => gl}/GLX_VERSION_1_2 (100%) rename auto/core/{ => gl}/GLX_VERSION_1_3 (100%) rename auto/core/{ => gl}/GLX_VERSION_1_4 (100%) rename auto/core/{ => gl}/GL_APPLE_float_pixels (100%) rename auto/core/{ => gl}/GL_APPLE_pixel_buffer (100%) rename auto/core/{ => gl}/GL_APPLE_texture_range (100%) rename auto/core/{ => gl}/GL_ARB_draw_instanced (100%) rename auto/core/{ => gl}/GL_ARB_imaging (100%) rename auto/core/{ => gl}/GL_ARB_instanced_arrays (100%) rename auto/core/{ => gl}/GL_ARB_internalformat_query2 (100%) rename auto/core/{ => gl}/GL_ARB_matrix_palette (100%) rename auto/core/{ => gl}/GL_ARB_multitexture (100%) rename auto/core/{ => gl}/GL_ARB_robustness (100%) rename auto/core/{ => gl}/GL_ARB_separate_shader_objects (100%) rename auto/core/{ => gl}/GL_ARB_vertex_attrib_64bit (100%) rename auto/core/{ => gl}/GL_ARB_vertex_blend (100%) rename auto/core/{ => gl}/GL_ATIX_point_sprites (100%) rename auto/core/{ => gl}/GL_ATIX_texture_env_combine3 (100%) rename auto/core/{ => gl}/GL_ATIX_texture_env_route (100%) rename auto/core/{ => gl}/GL_ATIX_vertex_shader_output_point_size (100%) rename auto/core/{ => gl}/GL_ATI_envmap_bumpmap (100%) rename auto/core/{ => gl}/GL_ATI_map_object_buffer (100%) rename auto/core/{ => gl}/GL_ATI_pn_triangles (100%) rename auto/core/{ => gl}/GL_ATI_separate_stencil (100%) rename auto/core/{ => gl}/GL_ATI_shader_texture_lod (100%) rename auto/core/{ => gl}/GL_ATI_texture_compression_3dc (100%) rename auto/core/{ => gl}/GL_ATI_vertex_streams (100%) rename auto/core/{ => gl}/GL_EXT_Cg_shader (100%) rename auto/core/{ => gl}/GL_EXT_bindable_uniform (100%) rename auto/core/{ => gl}/GL_EXT_debug_marker (100%) rename auto/core/{ => gl}/GL_EXT_depth_bounds_test (100%) rename auto/core/{ => gl}/GL_EXT_draw_instanced (100%) rename auto/core/{ => gl}/GL_EXT_draw_range_elements (100%) rename auto/core/{ => gl}/GL_EXT_fog_coord (100%) rename auto/core/{ => gl}/GL_EXT_framebuffer_sRGB (100%) rename auto/core/{ => gl}/GL_EXT_geometry_shader4 (100%) rename auto/core/{ => gl}/GL_EXT_gpu_program_parameters (100%) rename auto/core/{ => gl}/GL_EXT_gpu_shader4 (100%) rename auto/core/{ => gl}/GL_EXT_packed_float (100%) rename auto/core/{ => gl}/GL_EXT_pixel_buffer_object (100%) rename auto/core/{ => gl}/GL_EXT_secondary_color (100%) rename auto/core/{ => gl}/GL_EXT_texture_array (100%) rename auto/core/{ => gl}/GL_EXT_texture_buffer_object (100%) rename auto/core/{ => gl}/GL_EXT_texture_compression_latc (100%) rename auto/core/{ => gl}/GL_EXT_texture_compression_rgtc (100%) rename auto/core/{ => gl}/GL_EXT_texture_cube_map (100%) rename auto/core/{ => gl}/GL_EXT_texture_edge_clamp (100%) rename auto/core/{ => gl}/GL_EXT_texture_integer (100%) rename auto/core/{ => gl}/GL_EXT_texture_rectangle (100%) rename auto/core/{ => gl}/GL_EXT_texture_shared_exponent (100%) rename auto/core/{ => gl}/GL_EXT_timer_query (100%) rename auto/core/{ => gl}/GL_EXT_vertex_shader (100%) rename auto/core/{ => gl}/GL_KTX_buffer_region (100%) rename auto/core/{ => gl}/GL_NVX_gpu_memory_info (100%) rename auto/core/{ => gl}/GL_NV_depth_buffer_float (100%) rename auto/core/{ => gl}/GL_NV_depth_range_unclamped (100%) rename auto/core/{ => gl}/GL_NV_fragment_program2 (100%) rename auto/core/{ => gl}/GL_NV_fragment_program4 (100%) rename auto/core/{ => gl}/GL_NV_fragment_program_option (100%) rename auto/core/{ => gl}/GL_NV_framebuffer_multisample_coverage (100%) rename auto/core/{ => gl}/GL_NV_geometry_program4 (100%) rename auto/core/{ => gl}/GL_NV_geometry_shader4 (100%) rename auto/core/{ => gl}/GL_NV_gpu_program4 (100%) rename auto/core/{ => gl}/GL_NV_gpu_program5 (100%) rename auto/core/{ => gl}/GL_NV_parameter_buffer_object (100%) rename auto/core/{ => gl}/GL_NV_path_rendering (100%) rename auto/core/{ => gl}/GL_NV_present_video (100%) rename auto/core/{ => gl}/GL_NV_tessellation_program5 (100%) rename auto/core/{ => gl}/GL_NV_transform_feedback (100%) rename auto/core/{ => gl}/GL_NV_vdpau_interop (100%) rename auto/core/{ => gl}/GL_NV_vertex_program2_option (100%) rename auto/core/{ => gl}/GL_NV_vertex_program3 (100%) rename auto/core/{ => gl}/GL_NV_vertex_program4 (100%) rename auto/core/{ => gl}/GL_REGAL_ES1_0_compatibility (100%) rename auto/core/{ => gl}/GL_REGAL_ES1_1_compatibility (100%) rename auto/core/{ => gl}/GL_REGAL_enable (100%) rename auto/core/{ => gl}/GL_REGAL_error_string (100%) rename auto/core/{ => gl}/GL_REGAL_extension_query (100%) rename auto/core/{ => gl}/GL_REGAL_log (100%) rename auto/core/{ => gl}/GL_SGIX_shadow (100%) rename auto/core/{ => gl}/GL_SUN_read_video_pixels (100%) rename auto/core/{ => gl}/GL_VERSION_1_2 (100%) rename auto/core/{ => gl}/GL_VERSION_1_2_1 (100%) rename auto/core/{ => gl}/GL_VERSION_1_3 (100%) rename auto/core/{ => gl}/GL_VERSION_1_4 (100%) rename auto/core/{ => gl}/GL_VERSION_1_5 (100%) rename auto/core/{ => gl}/GL_VERSION_2_0 (100%) rename auto/core/{ => gl}/GL_VERSION_2_1 (100%) rename auto/core/{ => gl}/GL_VERSION_3_0 (100%) rename auto/core/{ => gl}/GL_VERSION_3_1 (100%) rename auto/core/{ => gl}/GL_VERSION_3_2 (100%) rename auto/core/{ => gl}/GL_VERSION_3_3 (100%) rename auto/core/{ => gl}/GL_VERSION_4_0 (100%) rename auto/core/{ => gl}/GL_VERSION_4_1 (100%) rename auto/core/{ => gl}/GL_VERSION_4_2 (100%) rename auto/core/{ => gl}/GL_VERSION_4_3 (100%) rename auto/core/{ => gl}/GL_WIN_swap_hint (100%) rename auto/core/{ => gl}/WGL_ARB_create_context (100%) rename auto/core/{ => gl}/WGL_ATI_render_texture_rectangle (100%) rename auto/core/{ => gl}/WGL_EXT_create_context_es2_profile (100%) rename auto/core/{ => gl}/WGL_EXT_create_context_es_profile (100%) rename auto/core/{ => gl}/WGL_EXT_framebuffer_sRGB (100%) rename auto/core/{ => gl}/WGL_EXT_pixel_format_packed_float (100%) rename auto/core/{ => gl}/WGL_NV_gpu_affinity (100%) rename auto/core/{ => gl}/WGL_NV_vertex_array_range (100%) diff --git a/auto/Makefile b/auto/Makefile index 5800434..18ecbfb 100644 --- a/auto/Makefile +++ b/auto/Makefile @@ -10,13 +10,29 @@ include ../config/version #GLEW_SPLIT_SOURCE = yes SHELL = bash -REGISTRY = registry + +### +### Conventional desktop OpenGL settings +### + +REGISTRY = registry/gl +EXT = extensions/gl +FILTER = filter_gl_ext.sh +CORE = core/gl REGISTRY_URL = http://www.opengl.org/registry/ -#http://oss.sgi.com/projects/ogl-sample/registry/ + +### +### Experimental OpenGL ES settings +### + +# REGISTRY = registry/gles +# EXT = extensions/gles +# FILTER = filter_gles_ext.sh +# CORE = core/gles +# REGISTRY_URL = http://www.khronos.org/registry/gles/ + BIN = bin SRC = src -CORE = core -EXT = extensions BLACKLIST = blacklist GL_CORE_SPEC := $(CORE)/GL_VERSION* @@ -94,6 +110,7 @@ $(EXT)/.dummy: $(REGISTRY)/.dummy @echo "--------------------------------------------------------------------" rm -rf $(EXT) $(BIN)/update_ext.sh $(EXT) $(REGISTRY) $(BLACKLIST) + $(BIN)/$(FILTER) $(EXT) ifeq ($(patsubst Darwin%,Darwin,$(SYSTEM)), Darwin) find $(CORE) -maxdepth 1 -type f | grep -v VERSION | grep -v "~" | \ xargs -J % cp % $(EXT) diff --git a/auto/bin/filter_gl_ext.sh b/auto/bin/filter_gl_ext.sh new file mode 100755 index 0000000..7e4504d --- /dev/null +++ b/auto/bin/filter_gl_ext.sh @@ -0,0 +1,443 @@ +#!/bin/bash +## +## Copyright (C) 2002-2008, Marcelo E. Magallon +## Copyright (C) 2002-2008, Milan Ikits +## +## This program is distributed under the terms and conditions of the GNU +## General Public License Version 2 as published by the Free Software +## Foundation or, at your option, any later version. +## +## Parameters: +## +## $1: Extensions directory + +set -e + +if [ ! -d $1 ] ; then + mkdir -p $1 + +# fix GL_NV_texture_compression_vtc + grep -v EXT $1/GL_NV_texture_compression_vtc > tmp + mv tmp $1/GL_NV_texture_compression_vtc + +# remove duplicates from GL_ARB_vertex_program and GL_ARB_fragment_program + grep -v -F -f $1/GL_ARB_vertex_program $1/GL_ARB_fragment_program > tmp + mv tmp $1/GL_ARB_fragment_program + +# remove duplicates from GLX_EXT_visual_rating and GLX_EXT_visual_info + grep -v -F -f $1/GLX_EXT_visual_info $1/GLX_EXT_visual_rating > tmp + mv tmp $1/GLX_EXT_visual_rating + +# GL_EXT_draw_buffers2 and GL_EXT_transform_feedback both define glGetBooleanIndexedvEXT but with different parameter names + grep -v glGetBooleanIndexedvEXT $1/GL_EXT_transform_feedback > tmp + mv tmp $1/GL_EXT_transform_feedback + +# GL_EXT_draw_buffers2 and GL_EXT_transform_feedback both define glGetIntegerIndexedvEXT but with different parameter names + grep -v glGetIntegerIndexedvEXT $1/GL_EXT_transform_feedback > tmp + mv tmp $1/GL_EXT_transform_feedback + +# remove duplicates from GL_NV_video_capture and GLX_NV_video_capture + grep -v glX $1/GL_NV_video_capture > tmp + mv tmp $1/GL_NV_video_capture + +# add missing functions to GL_NV_video_capture + cat >> $1/GL_NV_video_capture <> $1/WGL_NV_video_capture <> $1/GLX_NV_video_capture < tmp + mv tmp $1/GL_NV_present_video + +# fix WGL_NV_present_video + cat >> $1/WGL_NV_present_video <> $1/WGL_NV_video_output < tmp + mv tmp $1/GL_NV_occlusion_query + perl -e's/OCCLUSION_TEST_HP.*/OCCLUSION_TEST_HP 0x8165/' -pi \ + $1/GL_HP_occlusion_test + perl -e's/OCCLUSION_TEST_RESULT_HP.*/OCCLUSION_TEST_RESULT_HP 0x8166/' -pi \ + $1/GL_HP_occlusion_test + +# fix GLvoid in GL_ARB_vertex_buffer_objects + perl -e 's/ void\*/ GLvoid\*/g' -pi \ + $1/GL_ARB_vertex_buffer_object + +# add deprecated constants to GL_ATI_fragment_shader + cat >> $1/GL_ATI_fragment_shader <> $1/GL_NV_texture_shader <> $1/WGL_ATI_pixel_format_float <> $1/WGL_ARB_make_current_read <> $1/WGL_EXT_make_current_read <> $1/GL_ARB_vertex_buffer_object <> $1/GLX_EXT_import_context <> $1/GLX_OML_swap_method <> $1/GLX_SGIX_fbconfig <> $1/GLX_SGIX_pbuffer <> $1/GL_NV_half_float <> $1/WGL_ARB_pbuffer <> $1/WGL_EXT_pbuffer < tmp + mv tmp $1/GL_ARB_fragment_shader + grep -v -F -f $1/GL_ARB_shader_objects $1/GL_ARB_vertex_shader > tmp + mv tmp $1/GL_ARB_vertex_shader + +# remove duplicates in GL_ARB_vertex_program and GL_ARB_vertex_shader + grep -v -F -f $1/GL_ARB_vertex_program $1/GL_ARB_vertex_shader > tmp + mv tmp $1/GL_ARB_vertex_shader + +# remove triplicates in GL_ARB_fragment_program, GL_ARB_fragment_shader, +# and GL_ARB_vertex_shader + grep -v -F -f $1/GL_ARB_fragment_program $1/GL_ARB_fragment_shader > tmp + mv tmp $1/GL_ARB_fragment_shader + grep -v -F -f $1/GL_ARB_fragment_program $1/GL_ARB_vertex_shader > tmp + mv tmp $1/GL_ARB_vertex_shader + +# remove duplicates in GL_EXT_direct_state_access + grep -v "glGetBooleanIndexedvEXT" $1/GL_EXT_direct_state_access > tmp + mv tmp $1/GL_EXT_direct_state_access + grep -v "glGetIntegerIndexedvEXT" $1/GL_EXT_direct_state_access > tmp + mv tmp $1/GL_EXT_direct_state_access + grep -v "glDisableIndexedEXT" $1/GL_EXT_direct_state_access > tmp + mv tmp $1/GL_EXT_direct_state_access + grep -v "glEnableIndexedEXT" $1/GL_EXT_direct_state_access > tmp + mv tmp $1/GL_EXT_direct_state_access + grep -v "glIsEnabledIndexedEXT" $1/GL_EXT_direct_state_access > tmp + mv tmp $1/GL_EXT_direct_state_access + +# remove duplicates in GL_NV_explicit_multisample + grep -v "glGetBooleanIndexedvEXT" $1/GL_NV_explicit_multisample > tmp + mv tmp $1/GL_NV_explicit_multisample + grep -v "glGetIntegerIndexedvEXT" $1/GL_NV_explicit_multisample > tmp + mv tmp $1/GL_NV_explicit_multisample + +# fix bugs in GL_ARB_vertex_shader + grep -v "GL_FLOAT" $1/GL_ARB_vertex_shader > tmp + mv tmp $1/GL_ARB_vertex_shader + perl -e 's/handle /GLhandleARB /g' -pi $1/GL_ARB_vertex_shader + +# fix bugs in GL_ARB_shader_objects + grep -v "GL_FLOAT " $1/GL_ARB_shader_objects > tmp + mv tmp $1/GL_ARB_shader_objects + grep -v "GL_INT " $1/GL_ARB_shader_objects > tmp + mv tmp $1/GL_ARB_shader_objects + +# add typedefs to GL_ARB_shader_objects + cat >> $1/GL_ARB_shader_objects <> $1/GL_ARB_transpose_matrix <> $1/GL_EXT_framebuffer_multisample < tmp + mv tmp $1/GL_NV_gpu_program_fp64 + +# Filter glGetUniformui64vNV from GL_NV_shader_buffer_load + grep -v "glGetUniformui64vNV" $1/GL_NV_shader_buffer_load > tmp + mv tmp $1/GL_NV_shader_buffer_load + +# Filter out profile enumerations from GLX_ARB_create_context + grep -v "_PROFILE_" $1/GLX_ARB_create_context > tmp + mv tmp $1/GLX_ARB_create_context + +# Filter only profile related enumerations for GLX_ARB_create_context_profile + head -n3 $1/GLX_ARB_create_context_profile > tmp + grep "_PROFILE_" $1/GLX_ARB_create_context_profile >> tmp + mv tmp $1/GLX_ARB_create_context_profile + +# Filter out profile enumerations from WGL_ARB_create_context + grep -v "_PROFILE_" $1/WGL_ARB_create_context > tmp + mv tmp $1/WGL_ARB_create_context + +# Filter only profile related enumerations for WGL_ARB_create_context_profile + head -n3 $1/WGL_ARB_create_context_profile > tmp + grep "_PROFILE_" $1/WGL_ARB_create_context_profile >> tmp + mv tmp $1/WGL_ARB_create_context_profile + +# add missing function to GLX_NV_copy_image + cat >> $1/GLX_NV_copy_image <> $1/WGL_NV_copy_image < tmp +# mv tmp $1/GL_ARB_separate_shader_objects + +# Filter out EXT functions from GL_ARB_viewport_array + grep -v "EXT" $1/GL_ARB_viewport_array > tmp + mv tmp $1/GL_ARB_viewport_array + +# Additional enumerations for GL_NV_vertex_buffer_unified_memory +# These are mentioned in GL_ARB_draw_indirect.txt + + cat >> $1/GL_NV_vertex_buffer_unified_memory < tmp + mv tmp $1/GL_ARB_debug_output + +# Filter glGetPointerv from GL_EXT_vertex_array +# It's part of OpenGL 1.1, after all + + grep -v "glGetPointerv" $1/GL_EXT_vertex_array > tmp + mv tmp $1/GL_EXT_vertex_array + +# add typedef to GL_AMD_debug_output +# parse_spec.pl can't parse typedefs from New Types section, but ought to + cat >> $1/GL_AMD_debug_output <> $1/GL_ARB_debug_output <> $1/GL_KHR_debug < tmp + mv tmp $1/GL_KHR_debug + +# Remove GL_ARB_debug_group, GL_ARB_debug_label and GL_ARB_debug_output2, for now + rm -f $1/GL_ARB_debug_group + rm -f $1/GL_ARB_debug_label + rm -f $1/GL_ARB_debug_output2 + +# add typedefs to GL_ARB_cl_event +# parse_spec.pl can't parse typedefs from New Types section, but ought to + cat >> $1/GL_ARB_cl_event < tmp + mv tmp $1/GL_ARB_gpu_shader_fp64 + +# add missing functions to GL_EXT_direct_state_access (GL_ARB_gpu_shader_fp64 related) + cat >> $1/GL_EXT_direct_state_access < tmp + mv tmp $1/GL_AMD_performance_monitor + grep -v 'GL_FLOAT ' $1/GL_AMD_performance_monitor > tmp + mv tmp $1/GL_AMD_performance_monitor + +# Filter out GL_STORAGE_CACHED_APPLE and GL_STORAGE_SHARED_APPLE from GL_APPLE_texture_range + grep -v 'GL_STORAGE_CACHED_APPLE ' $1/GL_APPLE_texture_range > tmp + mv tmp $1/GL_APPLE_texture_range + grep -v 'GL_STORAGE_SHARED_APPLE ' $1/GL_APPLE_texture_range > tmp + mv tmp $1/GL_APPLE_texture_range + +# Filter out GL_RED from GL_ARB_texture_rg + grep -v 'GL_RED ' $1/GL_ARB_texture_rg > tmp + mv tmp $1/GL_ARB_texture_rg + +# Filter out _EXT enums from GL_ARB_texture_storage + grep -v '_EXT ' $1/GL_ARB_texture_storage > tmp + mv tmp $1/GL_ARB_texture_storage + +# Filter out TEXTURE_3D enums from GL_EXT_paletted_texture + grep -v 'TEXTURE_3D' $1/GL_EXT_paletted_texture > tmp + mv tmp $1/GL_EXT_paletted_texture + +# Filter out GL_VERSION_1_1 enums from GL_AMD_stencil_operation_extended + grep -v '0x150' $1/GL_AMD_stencil_operation_extended > tmp + mv tmp $1/GL_AMD_stencil_operation_extended + +# Filter out from GL_APPLE_ycbcr_422 + grep -v 'GL_UNSIGNED_SHORT_8_8_APPLE' $1/GL_APPLE_ycbcr_422 > tmp + mv tmp $1/GL_APPLE_ycbcr_422 + grep -v 'GL_UNSIGNED_SHORT_8_8_REV_APPLE' $1/GL_APPLE_ycbcr_422 > tmp + mv tmp $1/GL_APPLE_ycbcr_422 + +# Filter out GL_FRAGMENT_DEPTH_EXT from GL_EXT_light_texture + grep -v 'GL_FRAGMENT_DEPTH_EXT' $1/GL_EXT_light_texture > tmp + mv tmp $1/GL_EXT_light_texture + +# Filter out GL_MULTISAMPLE_BIT_EXT from GL_SGIS_multisample + grep -v 'GL_MULTISAMPLE_BIT_EXT' $1/GL_SGIS_multisample > tmp + mv tmp $1/GL_SGIS_multisample + +# Filter out GL_COMPRESSED_RGB_S3TC_DXT1_EXT from GL_EXT_texture_compression_dxt1 + grep -v 'GL_COMPRESSED_RGB_S3TC_DXT1_EXT' $1/GL_EXT_texture_compression_dxt1 > tmp + mv tmp $1/GL_EXT_texture_compression_dxt1 + +# Filter out GL_COMPRESSED_RGBA_S3TC_DXT1_EXT from GL_EXT_texture_compression_dxt1 + grep -v 'GL_COMPRESSED_RGBA_S3TC_DXT1_EXT' $1/GL_EXT_texture_compression_dxt1 > tmp + mv tmp $1/GL_EXT_texture_compression_dxt1 + +# Append GLfixed to GL_ARB_ES2_compatibility +# Probably ought to be explicitly mentioned in the spec language + + cat >> $1/GL_ARB_ES2_compatibility < tmp + mv tmp $1/GL_OES_byte_coordinates + +# clean up + rm -f $1/*.bak + +fi diff --git a/auto/bin/filter_gles_ext.sh b/auto/bin/filter_gles_ext.sh new file mode 100755 index 0000000..fa2fe4f --- /dev/null +++ b/auto/bin/filter_gles_ext.sh @@ -0,0 +1,19 @@ +#!/bin/bash +## +## Copyright (C) 2002-2008, Marcelo E. Magallon +## Copyright (C) 2002-2008, Milan Ikits +## +## This program is distributed under the terms and conditions of the GNU +## General Public License Version 2 as published by the Free Software +## Foundation or, at your option, any later version. +## +## Parameters: +## +## $1: Extensions directory +## $2: Registry directory +## $3: The black list + +set -e + +# clean up + rm -f $1/*.bak diff --git a/auto/bin/parse_spec.pl b/auto/bin/parse_spec.pl index edcab48..5544037 100755 --- a/auto/bin/parse_spec.pl +++ b/auto/bin/parse_spec.pl @@ -159,6 +159,7 @@ sub normalize_prototype s/\s+/ /g; # multiple whitespace -> single space s/\<.*\>//g; # remove from direct state access extension s/\<.*$//g; # remove incomplete from direct state access extension + s#/\*.*\*/##g; # remove /* ... */ comments s/\s*\(\s*/ \(/; # exactly one space before ( and none after s/\s*\)\s*/\)/; # no space before or after ) s/\s*\*([a-zA-Z])/\* $1/; # "* identifier" diff --git a/auto/bin/update_ext.sh b/auto/bin/update_ext.sh index 74aa8d6..9ba9c74 100755 --- a/auto/bin/update_ext.sh +++ b/auto/bin/update_ext.sh @@ -16,434 +16,10 @@ set -e if [ ! -d $1 ] ; then - mkdir $1 + mkdir -p $1 # Parse each of the extensions in the registry find $2 -name doc -type d -prune -o -name \*.txt -print | \ grep -v -f $3 | sort | bin/parse_spec.pl $1 -# fix GL_NV_texture_compression_vtc - grep -v EXT $1/GL_NV_texture_compression_vtc > tmp - mv tmp $1/GL_NV_texture_compression_vtc - -# remove duplicates from GL_ARB_vertex_program and GL_ARB_fragment_program - grep -v -F -f $1/GL_ARB_vertex_program $1/GL_ARB_fragment_program > tmp - mv tmp $1/GL_ARB_fragment_program - -# remove duplicates from GLX_EXT_visual_rating and GLX_EXT_visual_info - grep -v -F -f $1/GLX_EXT_visual_info $1/GLX_EXT_visual_rating > tmp - mv tmp $1/GLX_EXT_visual_rating - -# GL_EXT_draw_buffers2 and GL_EXT_transform_feedback both define glGetBooleanIndexedvEXT but with different parameter names - grep -v glGetBooleanIndexedvEXT $1/GL_EXT_transform_feedback > tmp - mv tmp $1/GL_EXT_transform_feedback - -# GL_EXT_draw_buffers2 and GL_EXT_transform_feedback both define glGetIntegerIndexedvEXT but with different parameter names - grep -v glGetIntegerIndexedvEXT $1/GL_EXT_transform_feedback > tmp - mv tmp $1/GL_EXT_transform_feedback - -# remove duplicates from GL_NV_video_capture and GLX_NV_video_capture - grep -v glX $1/GL_NV_video_capture > tmp - mv tmp $1/GL_NV_video_capture - -# add missing functions to GL_NV_video_capture - cat >> $1/GL_NV_video_capture <> $1/WGL_NV_video_capture <> $1/GLX_NV_video_capture < tmp - mv tmp $1/GL_NV_present_video - -# fix WGL_NV_present_video - cat >> $1/WGL_NV_present_video <> $1/WGL_NV_video_output < tmp - mv tmp $1/GL_NV_occlusion_query - perl -e's/OCCLUSION_TEST_HP.*/OCCLUSION_TEST_HP 0x8165/' -pi \ - $1/GL_HP_occlusion_test - perl -e's/OCCLUSION_TEST_RESULT_HP.*/OCCLUSION_TEST_RESULT_HP 0x8166/' -pi \ - $1/GL_HP_occlusion_test - -# fix GLvoid in GL_ARB_vertex_buffer_objects - perl -e 's/ void\*/ GLvoid\*/g' -pi \ - $1/GL_ARB_vertex_buffer_object - -# add deprecated constants to GL_ATI_fragment_shader - cat >> $1/GL_ATI_fragment_shader <> $1/GL_NV_texture_shader <> $1/WGL_ATI_pixel_format_float <> $1/WGL_ARB_make_current_read <> $1/WGL_EXT_make_current_read <> $1/GL_ARB_vertex_buffer_object <> $1/GLX_EXT_import_context <> $1/GLX_OML_swap_method <> $1/GLX_SGIX_fbconfig <> $1/GLX_SGIX_pbuffer <> $1/GL_NV_half_float <> $1/WGL_ARB_pbuffer <> $1/WGL_EXT_pbuffer < tmp - mv tmp $1/GL_ARB_fragment_shader - grep -v -F -f $1/GL_ARB_shader_objects $1/GL_ARB_vertex_shader > tmp - mv tmp $1/GL_ARB_vertex_shader - -# remove duplicates in GL_ARB_vertex_program and GL_ARB_vertex_shader - grep -v -F -f $1/GL_ARB_vertex_program $1/GL_ARB_vertex_shader > tmp - mv tmp $1/GL_ARB_vertex_shader - -# remove triplicates in GL_ARB_fragment_program, GL_ARB_fragment_shader, -# and GL_ARB_vertex_shader - grep -v -F -f $1/GL_ARB_fragment_program $1/GL_ARB_fragment_shader > tmp - mv tmp $1/GL_ARB_fragment_shader - grep -v -F -f $1/GL_ARB_fragment_program $1/GL_ARB_vertex_shader > tmp - mv tmp $1/GL_ARB_vertex_shader - -# remove duplicates in GL_EXT_direct_state_access - grep -v "glGetBooleanIndexedvEXT" $1/GL_EXT_direct_state_access > tmp - mv tmp $1/GL_EXT_direct_state_access - grep -v "glGetIntegerIndexedvEXT" $1/GL_EXT_direct_state_access > tmp - mv tmp $1/GL_EXT_direct_state_access - grep -v "glDisableIndexedEXT" $1/GL_EXT_direct_state_access > tmp - mv tmp $1/GL_EXT_direct_state_access - grep -v "glEnableIndexedEXT" $1/GL_EXT_direct_state_access > tmp - mv tmp $1/GL_EXT_direct_state_access - grep -v "glIsEnabledIndexedEXT" $1/GL_EXT_direct_state_access > tmp - mv tmp $1/GL_EXT_direct_state_access - -# remove duplicates in GL_NV_explicit_multisample - grep -v "glGetBooleanIndexedvEXT" $1/GL_NV_explicit_multisample > tmp - mv tmp $1/GL_NV_explicit_multisample - grep -v "glGetIntegerIndexedvEXT" $1/GL_NV_explicit_multisample > tmp - mv tmp $1/GL_NV_explicit_multisample - -# fix bugs in GL_ARB_vertex_shader - grep -v "GL_FLOAT" $1/GL_ARB_vertex_shader > tmp - mv tmp $1/GL_ARB_vertex_shader - perl -e 's/handle /GLhandleARB /g' -pi $1/GL_ARB_vertex_shader - -# fix bugs in GL_ARB_shader_objects - grep -v "GL_FLOAT " $1/GL_ARB_shader_objects > tmp - mv tmp $1/GL_ARB_shader_objects - grep -v "GL_INT " $1/GL_ARB_shader_objects > tmp - mv tmp $1/GL_ARB_shader_objects - -# add typedefs to GL_ARB_shader_objects - cat >> $1/GL_ARB_shader_objects <> $1/GL_ARB_transpose_matrix <> $1/GL_EXT_framebuffer_multisample < tmp - mv tmp $1/GL_NV_gpu_program_fp64 - -# Filter glGetUniformui64vNV from GL_NV_shader_buffer_load - grep -v "glGetUniformui64vNV" $1/GL_NV_shader_buffer_load > tmp - mv tmp $1/GL_NV_shader_buffer_load - -# Filter out profile enumerations from GLX_ARB_create_context - grep -v "_PROFILE_" $1/GLX_ARB_create_context > tmp - mv tmp $1/GLX_ARB_create_context - -# Filter only profile related enumerations for GLX_ARB_create_context_profile - head -n3 $1/GLX_ARB_create_context_profile > tmp - grep "_PROFILE_" $1/GLX_ARB_create_context_profile >> tmp - mv tmp $1/GLX_ARB_create_context_profile - -# Filter out profile enumerations from WGL_ARB_create_context - grep -v "_PROFILE_" $1/WGL_ARB_create_context > tmp - mv tmp $1/WGL_ARB_create_context - -# Filter only profile related enumerations for WGL_ARB_create_context_profile - head -n3 $1/WGL_ARB_create_context_profile > tmp - grep "_PROFILE_" $1/WGL_ARB_create_context_profile >> tmp - mv tmp $1/WGL_ARB_create_context_profile - -# add missing function to GLX_NV_copy_image - cat >> $1/GLX_NV_copy_image <> $1/WGL_NV_copy_image < tmp -# mv tmp $1/GL_ARB_separate_shader_objects - -# Filter out EXT functions from GL_ARB_viewport_array - grep -v "EXT" $1/GL_ARB_viewport_array > tmp - mv tmp $1/GL_ARB_viewport_array - -# Additional enumerations for GL_NV_vertex_buffer_unified_memory -# These are mentioned in GL_ARB_draw_indirect.txt - - cat >> $1/GL_NV_vertex_buffer_unified_memory < tmp - mv tmp $1/GL_ARB_debug_output - -# Filter glGetPointerv from GL_EXT_vertex_array -# It's part of OpenGL 1.1, after all - - grep -v "glGetPointerv" $1/GL_EXT_vertex_array > tmp - mv tmp $1/GL_EXT_vertex_array - -# add typedef to GL_AMD_debug_output -# parse_spec.pl can't parse typedefs from New Types section, but ought to - cat >> $1/GL_AMD_debug_output <> $1/GL_ARB_debug_output <> $1/GL_KHR_debug < tmp - mv tmp $1/GL_KHR_debug - -# Remove GL_ARB_debug_group, GL_ARB_debug_label and GL_ARB_debug_output2, for now - rm -f $1/GL_ARB_debug_group - rm -f $1/GL_ARB_debug_label - rm -f $1/GL_ARB_debug_output2 - -# add typedefs to GL_ARB_cl_event -# parse_spec.pl can't parse typedefs from New Types section, but ought to - cat >> $1/GL_ARB_cl_event < tmp - mv tmp $1/GL_ARB_gpu_shader_fp64 - -# add missing functions to GL_EXT_direct_state_access (GL_ARB_gpu_shader_fp64 related) - cat >> $1/GL_EXT_direct_state_access < tmp - mv tmp $1/GL_AMD_performance_monitor - grep -v 'GL_FLOAT ' $1/GL_AMD_performance_monitor > tmp - mv tmp $1/GL_AMD_performance_monitor - -# Filter out GL_STORAGE_CACHED_APPLE and GL_STORAGE_SHARED_APPLE from GL_APPLE_texture_range - grep -v 'GL_STORAGE_CACHED_APPLE ' $1/GL_APPLE_texture_range > tmp - mv tmp $1/GL_APPLE_texture_range - grep -v 'GL_STORAGE_SHARED_APPLE ' $1/GL_APPLE_texture_range > tmp - mv tmp $1/GL_APPLE_texture_range - -# Filter out GL_RED from GL_ARB_texture_rg - grep -v 'GL_RED ' $1/GL_ARB_texture_rg > tmp - mv tmp $1/GL_ARB_texture_rg - -# Filter out _EXT enums from GL_ARB_texture_storage - grep -v '_EXT ' $1/GL_ARB_texture_storage > tmp - mv tmp $1/GL_ARB_texture_storage - -# Filter out TEXTURE_3D enums from GL_EXT_paletted_texture - grep -v 'TEXTURE_3D' $1/GL_EXT_paletted_texture > tmp - mv tmp $1/GL_EXT_paletted_texture - -# Filter out GL_VERSION_1_1 enums from GL_AMD_stencil_operation_extended - grep -v '0x150' $1/GL_AMD_stencil_operation_extended > tmp - mv tmp $1/GL_AMD_stencil_operation_extended - -# Filter out from GL_APPLE_ycbcr_422 - grep -v 'GL_UNSIGNED_SHORT_8_8_APPLE' $1/GL_APPLE_ycbcr_422 > tmp - mv tmp $1/GL_APPLE_ycbcr_422 - grep -v 'GL_UNSIGNED_SHORT_8_8_REV_APPLE' $1/GL_APPLE_ycbcr_422 > tmp - mv tmp $1/GL_APPLE_ycbcr_422 - -# Filter out GL_FRAGMENT_DEPTH_EXT from GL_EXT_light_texture - grep -v 'GL_FRAGMENT_DEPTH_EXT' $1/GL_EXT_light_texture > tmp - mv tmp $1/GL_EXT_light_texture - -# Filter out GL_MULTISAMPLE_BIT_EXT from GL_SGIS_multisample - grep -v 'GL_MULTISAMPLE_BIT_EXT' $1/GL_SGIS_multisample > tmp - mv tmp $1/GL_SGIS_multisample - -# Filter out GL_COMPRESSED_RGB_S3TC_DXT1_EXT from GL_EXT_texture_compression_dxt1 - grep -v 'GL_COMPRESSED_RGB_S3TC_DXT1_EXT' $1/GL_EXT_texture_compression_dxt1 > tmp - mv tmp $1/GL_EXT_texture_compression_dxt1 - -# Filter out GL_COMPRESSED_RGBA_S3TC_DXT1_EXT from GL_EXT_texture_compression_dxt1 - grep -v 'GL_COMPRESSED_RGBA_S3TC_DXT1_EXT' $1/GL_EXT_texture_compression_dxt1 > tmp - mv tmp $1/GL_EXT_texture_compression_dxt1 - -# Append GLfixed to GL_ARB_ES2_compatibility -# Probably ought to be explicitly mentioned in the spec language - - cat >> $1/GL_ARB_ES2_compatibility < tmp - mv tmp $1/GL_OES_byte_coordinates - -# clean up - rm -f $1/*.bak - fi diff --git a/auto/bin/update_registry.sh b/auto/bin/update_registry.sh index a03573f..54b0fd2 100755 --- a/auto/bin/update_registry.sh +++ b/auto/bin/update_registry.sh @@ -10,7 +10,7 @@ set -e if [ ! -d $1 ] ; then - mkdir $1 + mkdir -p $1 fi cd $1 diff --git a/auto/core/GLX_AMD_gpu_association b/auto/core/gl/GLX_AMD_gpu_association similarity index 100% rename from auto/core/GLX_AMD_gpu_association rename to auto/core/gl/GLX_AMD_gpu_association diff --git a/auto/core/GLX_ARB_get_proc_address b/auto/core/gl/GLX_ARB_get_proc_address similarity index 100% rename from auto/core/GLX_ARB_get_proc_address rename to auto/core/gl/GLX_ARB_get_proc_address diff --git a/auto/core/GLX_ATI_pixel_format_float b/auto/core/gl/GLX_ATI_pixel_format_float similarity index 100% rename from auto/core/GLX_ATI_pixel_format_float rename to auto/core/gl/GLX_ATI_pixel_format_float diff --git a/auto/core/GLX_ATI_render_texture b/auto/core/gl/GLX_ATI_render_texture similarity index 100% rename from auto/core/GLX_ATI_render_texture rename to auto/core/gl/GLX_ATI_render_texture diff --git a/auto/core/GLX_EXT_create_context_es2_profile b/auto/core/gl/GLX_EXT_create_context_es2_profile similarity index 100% rename from auto/core/GLX_EXT_create_context_es2_profile rename to auto/core/gl/GLX_EXT_create_context_es2_profile diff --git a/auto/core/GLX_EXT_create_context_es_profile b/auto/core/gl/GLX_EXT_create_context_es_profile similarity index 100% rename from auto/core/GLX_EXT_create_context_es_profile rename to auto/core/gl/GLX_EXT_create_context_es_profile diff --git a/auto/core/GLX_EXT_fbconfig_packed_float b/auto/core/gl/GLX_EXT_fbconfig_packed_float similarity index 100% rename from auto/core/GLX_EXT_fbconfig_packed_float rename to auto/core/gl/GLX_EXT_fbconfig_packed_float diff --git a/auto/core/GLX_EXT_framebuffer_sRGB b/auto/core/gl/GLX_EXT_framebuffer_sRGB similarity index 100% rename from auto/core/GLX_EXT_framebuffer_sRGB rename to auto/core/gl/GLX_EXT_framebuffer_sRGB diff --git a/auto/core/GLX_MESA_swap_control b/auto/core/gl/GLX_MESA_swap_control similarity index 100% rename from auto/core/GLX_MESA_swap_control rename to auto/core/gl/GLX_MESA_swap_control diff --git a/auto/core/GLX_NV_float_buffer b/auto/core/gl/GLX_NV_float_buffer similarity index 100% rename from auto/core/GLX_NV_float_buffer rename to auto/core/gl/GLX_NV_float_buffer diff --git a/auto/core/GLX_NV_vertex_array_range b/auto/core/gl/GLX_NV_vertex_array_range similarity index 100% rename from auto/core/GLX_NV_vertex_array_range rename to auto/core/gl/GLX_NV_vertex_array_range diff --git a/auto/core/GLX_SGIS_shared_multisample b/auto/core/gl/GLX_SGIS_shared_multisample similarity index 100% rename from auto/core/GLX_SGIS_shared_multisample rename to auto/core/gl/GLX_SGIS_shared_multisample diff --git a/auto/core/GLX_SGIX_hyperpipe b/auto/core/gl/GLX_SGIX_hyperpipe similarity index 100% rename from auto/core/GLX_SGIX_hyperpipe rename to auto/core/gl/GLX_SGIX_hyperpipe diff --git a/auto/core/GLX_SGIX_swap_barrier b/auto/core/gl/GLX_SGIX_swap_barrier similarity index 100% rename from auto/core/GLX_SGIX_swap_barrier rename to auto/core/gl/GLX_SGIX_swap_barrier diff --git a/auto/core/GLX_SGIX_swap_group b/auto/core/gl/GLX_SGIX_swap_group similarity index 100% rename from auto/core/GLX_SGIX_swap_group rename to auto/core/gl/GLX_SGIX_swap_group diff --git a/auto/core/GLX_SGI_video_sync b/auto/core/gl/GLX_SGI_video_sync similarity index 100% rename from auto/core/GLX_SGI_video_sync rename to auto/core/gl/GLX_SGI_video_sync diff --git a/auto/core/GLX_SUN_video_resize b/auto/core/gl/GLX_SUN_video_resize similarity index 100% rename from auto/core/GLX_SUN_video_resize rename to auto/core/gl/GLX_SUN_video_resize diff --git a/auto/core/GLX_VERSION_1_2 b/auto/core/gl/GLX_VERSION_1_2 similarity index 100% rename from auto/core/GLX_VERSION_1_2 rename to auto/core/gl/GLX_VERSION_1_2 diff --git a/auto/core/GLX_VERSION_1_3 b/auto/core/gl/GLX_VERSION_1_3 similarity index 100% rename from auto/core/GLX_VERSION_1_3 rename to auto/core/gl/GLX_VERSION_1_3 diff --git a/auto/core/GLX_VERSION_1_4 b/auto/core/gl/GLX_VERSION_1_4 similarity index 100% rename from auto/core/GLX_VERSION_1_4 rename to auto/core/gl/GLX_VERSION_1_4 diff --git a/auto/core/GL_APPLE_float_pixels b/auto/core/gl/GL_APPLE_float_pixels similarity index 100% rename from auto/core/GL_APPLE_float_pixels rename to auto/core/gl/GL_APPLE_float_pixels diff --git a/auto/core/GL_APPLE_pixel_buffer b/auto/core/gl/GL_APPLE_pixel_buffer similarity index 100% rename from auto/core/GL_APPLE_pixel_buffer rename to auto/core/gl/GL_APPLE_pixel_buffer diff --git a/auto/core/GL_APPLE_texture_range b/auto/core/gl/GL_APPLE_texture_range similarity index 100% rename from auto/core/GL_APPLE_texture_range rename to auto/core/gl/GL_APPLE_texture_range diff --git a/auto/core/GL_ARB_draw_instanced b/auto/core/gl/GL_ARB_draw_instanced similarity index 100% rename from auto/core/GL_ARB_draw_instanced rename to auto/core/gl/GL_ARB_draw_instanced diff --git a/auto/core/GL_ARB_imaging b/auto/core/gl/GL_ARB_imaging similarity index 100% rename from auto/core/GL_ARB_imaging rename to auto/core/gl/GL_ARB_imaging diff --git a/auto/core/GL_ARB_instanced_arrays b/auto/core/gl/GL_ARB_instanced_arrays similarity index 100% rename from auto/core/GL_ARB_instanced_arrays rename to auto/core/gl/GL_ARB_instanced_arrays diff --git a/auto/core/GL_ARB_internalformat_query2 b/auto/core/gl/GL_ARB_internalformat_query2 similarity index 100% rename from auto/core/GL_ARB_internalformat_query2 rename to auto/core/gl/GL_ARB_internalformat_query2 diff --git a/auto/core/GL_ARB_matrix_palette b/auto/core/gl/GL_ARB_matrix_palette similarity index 100% rename from auto/core/GL_ARB_matrix_palette rename to auto/core/gl/GL_ARB_matrix_palette diff --git a/auto/core/GL_ARB_multitexture b/auto/core/gl/GL_ARB_multitexture similarity index 100% rename from auto/core/GL_ARB_multitexture rename to auto/core/gl/GL_ARB_multitexture diff --git a/auto/core/GL_ARB_robustness b/auto/core/gl/GL_ARB_robustness similarity index 100% rename from auto/core/GL_ARB_robustness rename to auto/core/gl/GL_ARB_robustness diff --git a/auto/core/GL_ARB_separate_shader_objects b/auto/core/gl/GL_ARB_separate_shader_objects similarity index 100% rename from auto/core/GL_ARB_separate_shader_objects rename to auto/core/gl/GL_ARB_separate_shader_objects diff --git a/auto/core/GL_ARB_vertex_attrib_64bit b/auto/core/gl/GL_ARB_vertex_attrib_64bit similarity index 100% rename from auto/core/GL_ARB_vertex_attrib_64bit rename to auto/core/gl/GL_ARB_vertex_attrib_64bit diff --git a/auto/core/GL_ARB_vertex_blend b/auto/core/gl/GL_ARB_vertex_blend similarity index 100% rename from auto/core/GL_ARB_vertex_blend rename to auto/core/gl/GL_ARB_vertex_blend diff --git a/auto/core/GL_ATIX_point_sprites b/auto/core/gl/GL_ATIX_point_sprites similarity index 100% rename from auto/core/GL_ATIX_point_sprites rename to auto/core/gl/GL_ATIX_point_sprites diff --git a/auto/core/GL_ATIX_texture_env_combine3 b/auto/core/gl/GL_ATIX_texture_env_combine3 similarity index 100% rename from auto/core/GL_ATIX_texture_env_combine3 rename to auto/core/gl/GL_ATIX_texture_env_combine3 diff --git a/auto/core/GL_ATIX_texture_env_route b/auto/core/gl/GL_ATIX_texture_env_route similarity index 100% rename from auto/core/GL_ATIX_texture_env_route rename to auto/core/gl/GL_ATIX_texture_env_route diff --git a/auto/core/GL_ATIX_vertex_shader_output_point_size b/auto/core/gl/GL_ATIX_vertex_shader_output_point_size similarity index 100% rename from auto/core/GL_ATIX_vertex_shader_output_point_size rename to auto/core/gl/GL_ATIX_vertex_shader_output_point_size diff --git a/auto/core/GL_ATI_envmap_bumpmap b/auto/core/gl/GL_ATI_envmap_bumpmap similarity index 100% rename from auto/core/GL_ATI_envmap_bumpmap rename to auto/core/gl/GL_ATI_envmap_bumpmap diff --git a/auto/core/GL_ATI_map_object_buffer b/auto/core/gl/GL_ATI_map_object_buffer similarity index 100% rename from auto/core/GL_ATI_map_object_buffer rename to auto/core/gl/GL_ATI_map_object_buffer diff --git a/auto/core/GL_ATI_pn_triangles b/auto/core/gl/GL_ATI_pn_triangles similarity index 100% rename from auto/core/GL_ATI_pn_triangles rename to auto/core/gl/GL_ATI_pn_triangles diff --git a/auto/core/GL_ATI_separate_stencil b/auto/core/gl/GL_ATI_separate_stencil similarity index 100% rename from auto/core/GL_ATI_separate_stencil rename to auto/core/gl/GL_ATI_separate_stencil diff --git a/auto/core/GL_ATI_shader_texture_lod b/auto/core/gl/GL_ATI_shader_texture_lod similarity index 100% rename from auto/core/GL_ATI_shader_texture_lod rename to auto/core/gl/GL_ATI_shader_texture_lod diff --git a/auto/core/GL_ATI_texture_compression_3dc b/auto/core/gl/GL_ATI_texture_compression_3dc similarity index 100% rename from auto/core/GL_ATI_texture_compression_3dc rename to auto/core/gl/GL_ATI_texture_compression_3dc diff --git a/auto/core/GL_ATI_vertex_streams b/auto/core/gl/GL_ATI_vertex_streams similarity index 100% rename from auto/core/GL_ATI_vertex_streams rename to auto/core/gl/GL_ATI_vertex_streams diff --git a/auto/core/GL_EXT_Cg_shader b/auto/core/gl/GL_EXT_Cg_shader similarity index 100% rename from auto/core/GL_EXT_Cg_shader rename to auto/core/gl/GL_EXT_Cg_shader diff --git a/auto/core/GL_EXT_bindable_uniform b/auto/core/gl/GL_EXT_bindable_uniform similarity index 100% rename from auto/core/GL_EXT_bindable_uniform rename to auto/core/gl/GL_EXT_bindable_uniform diff --git a/auto/core/GL_EXT_debug_marker b/auto/core/gl/GL_EXT_debug_marker similarity index 100% rename from auto/core/GL_EXT_debug_marker rename to auto/core/gl/GL_EXT_debug_marker diff --git a/auto/core/GL_EXT_depth_bounds_test b/auto/core/gl/GL_EXT_depth_bounds_test similarity index 100% rename from auto/core/GL_EXT_depth_bounds_test rename to auto/core/gl/GL_EXT_depth_bounds_test diff --git a/auto/core/GL_EXT_draw_instanced b/auto/core/gl/GL_EXT_draw_instanced similarity index 100% rename from auto/core/GL_EXT_draw_instanced rename to auto/core/gl/GL_EXT_draw_instanced diff --git a/auto/core/GL_EXT_draw_range_elements b/auto/core/gl/GL_EXT_draw_range_elements similarity index 100% rename from auto/core/GL_EXT_draw_range_elements rename to auto/core/gl/GL_EXT_draw_range_elements diff --git a/auto/core/GL_EXT_fog_coord b/auto/core/gl/GL_EXT_fog_coord similarity index 100% rename from auto/core/GL_EXT_fog_coord rename to auto/core/gl/GL_EXT_fog_coord diff --git a/auto/core/GL_EXT_framebuffer_sRGB b/auto/core/gl/GL_EXT_framebuffer_sRGB similarity index 100% rename from auto/core/GL_EXT_framebuffer_sRGB rename to auto/core/gl/GL_EXT_framebuffer_sRGB diff --git a/auto/core/GL_EXT_geometry_shader4 b/auto/core/gl/GL_EXT_geometry_shader4 similarity index 100% rename from auto/core/GL_EXT_geometry_shader4 rename to auto/core/gl/GL_EXT_geometry_shader4 diff --git a/auto/core/GL_EXT_gpu_program_parameters b/auto/core/gl/GL_EXT_gpu_program_parameters similarity index 100% rename from auto/core/GL_EXT_gpu_program_parameters rename to auto/core/gl/GL_EXT_gpu_program_parameters diff --git a/auto/core/GL_EXT_gpu_shader4 b/auto/core/gl/GL_EXT_gpu_shader4 similarity index 100% rename from auto/core/GL_EXT_gpu_shader4 rename to auto/core/gl/GL_EXT_gpu_shader4 diff --git a/auto/core/GL_EXT_packed_float b/auto/core/gl/GL_EXT_packed_float similarity index 100% rename from auto/core/GL_EXT_packed_float rename to auto/core/gl/GL_EXT_packed_float diff --git a/auto/core/GL_EXT_pixel_buffer_object b/auto/core/gl/GL_EXT_pixel_buffer_object similarity index 100% rename from auto/core/GL_EXT_pixel_buffer_object rename to auto/core/gl/GL_EXT_pixel_buffer_object diff --git a/auto/core/GL_EXT_secondary_color b/auto/core/gl/GL_EXT_secondary_color similarity index 100% rename from auto/core/GL_EXT_secondary_color rename to auto/core/gl/GL_EXT_secondary_color diff --git a/auto/core/GL_EXT_texture_array b/auto/core/gl/GL_EXT_texture_array similarity index 100% rename from auto/core/GL_EXT_texture_array rename to auto/core/gl/GL_EXT_texture_array diff --git a/auto/core/GL_EXT_texture_buffer_object b/auto/core/gl/GL_EXT_texture_buffer_object similarity index 100% rename from auto/core/GL_EXT_texture_buffer_object rename to auto/core/gl/GL_EXT_texture_buffer_object diff --git a/auto/core/GL_EXT_texture_compression_latc b/auto/core/gl/GL_EXT_texture_compression_latc similarity index 100% rename from auto/core/GL_EXT_texture_compression_latc rename to auto/core/gl/GL_EXT_texture_compression_latc diff --git a/auto/core/GL_EXT_texture_compression_rgtc b/auto/core/gl/GL_EXT_texture_compression_rgtc similarity index 100% rename from auto/core/GL_EXT_texture_compression_rgtc rename to auto/core/gl/GL_EXT_texture_compression_rgtc diff --git a/auto/core/GL_EXT_texture_cube_map b/auto/core/gl/GL_EXT_texture_cube_map similarity index 100% rename from auto/core/GL_EXT_texture_cube_map rename to auto/core/gl/GL_EXT_texture_cube_map diff --git a/auto/core/GL_EXT_texture_edge_clamp b/auto/core/gl/GL_EXT_texture_edge_clamp similarity index 100% rename from auto/core/GL_EXT_texture_edge_clamp rename to auto/core/gl/GL_EXT_texture_edge_clamp diff --git a/auto/core/GL_EXT_texture_integer b/auto/core/gl/GL_EXT_texture_integer similarity index 100% rename from auto/core/GL_EXT_texture_integer rename to auto/core/gl/GL_EXT_texture_integer diff --git a/auto/core/GL_EXT_texture_rectangle b/auto/core/gl/GL_EXT_texture_rectangle similarity index 100% rename from auto/core/GL_EXT_texture_rectangle rename to auto/core/gl/GL_EXT_texture_rectangle diff --git a/auto/core/GL_EXT_texture_shared_exponent b/auto/core/gl/GL_EXT_texture_shared_exponent similarity index 100% rename from auto/core/GL_EXT_texture_shared_exponent rename to auto/core/gl/GL_EXT_texture_shared_exponent diff --git a/auto/core/GL_EXT_timer_query b/auto/core/gl/GL_EXT_timer_query similarity index 100% rename from auto/core/GL_EXT_timer_query rename to auto/core/gl/GL_EXT_timer_query diff --git a/auto/core/GL_EXT_vertex_shader b/auto/core/gl/GL_EXT_vertex_shader similarity index 100% rename from auto/core/GL_EXT_vertex_shader rename to auto/core/gl/GL_EXT_vertex_shader diff --git a/auto/core/GL_KTX_buffer_region b/auto/core/gl/GL_KTX_buffer_region similarity index 100% rename from auto/core/GL_KTX_buffer_region rename to auto/core/gl/GL_KTX_buffer_region diff --git a/auto/core/GL_NVX_gpu_memory_info b/auto/core/gl/GL_NVX_gpu_memory_info similarity index 100% rename from auto/core/GL_NVX_gpu_memory_info rename to auto/core/gl/GL_NVX_gpu_memory_info diff --git a/auto/core/GL_NV_depth_buffer_float b/auto/core/gl/GL_NV_depth_buffer_float similarity index 100% rename from auto/core/GL_NV_depth_buffer_float rename to auto/core/gl/GL_NV_depth_buffer_float diff --git a/auto/core/GL_NV_depth_range_unclamped b/auto/core/gl/GL_NV_depth_range_unclamped similarity index 100% rename from auto/core/GL_NV_depth_range_unclamped rename to auto/core/gl/GL_NV_depth_range_unclamped diff --git a/auto/core/GL_NV_fragment_program2 b/auto/core/gl/GL_NV_fragment_program2 similarity index 100% rename from auto/core/GL_NV_fragment_program2 rename to auto/core/gl/GL_NV_fragment_program2 diff --git a/auto/core/GL_NV_fragment_program4 b/auto/core/gl/GL_NV_fragment_program4 similarity index 100% rename from auto/core/GL_NV_fragment_program4 rename to auto/core/gl/GL_NV_fragment_program4 diff --git a/auto/core/GL_NV_fragment_program_option b/auto/core/gl/GL_NV_fragment_program_option similarity index 100% rename from auto/core/GL_NV_fragment_program_option rename to auto/core/gl/GL_NV_fragment_program_option diff --git a/auto/core/GL_NV_framebuffer_multisample_coverage b/auto/core/gl/GL_NV_framebuffer_multisample_coverage similarity index 100% rename from auto/core/GL_NV_framebuffer_multisample_coverage rename to auto/core/gl/GL_NV_framebuffer_multisample_coverage diff --git a/auto/core/GL_NV_geometry_program4 b/auto/core/gl/GL_NV_geometry_program4 similarity index 100% rename from auto/core/GL_NV_geometry_program4 rename to auto/core/gl/GL_NV_geometry_program4 diff --git a/auto/core/GL_NV_geometry_shader4 b/auto/core/gl/GL_NV_geometry_shader4 similarity index 100% rename from auto/core/GL_NV_geometry_shader4 rename to auto/core/gl/GL_NV_geometry_shader4 diff --git a/auto/core/GL_NV_gpu_program4 b/auto/core/gl/GL_NV_gpu_program4 similarity index 100% rename from auto/core/GL_NV_gpu_program4 rename to auto/core/gl/GL_NV_gpu_program4 diff --git a/auto/core/GL_NV_gpu_program5 b/auto/core/gl/GL_NV_gpu_program5 similarity index 100% rename from auto/core/GL_NV_gpu_program5 rename to auto/core/gl/GL_NV_gpu_program5 diff --git a/auto/core/GL_NV_parameter_buffer_object b/auto/core/gl/GL_NV_parameter_buffer_object similarity index 100% rename from auto/core/GL_NV_parameter_buffer_object rename to auto/core/gl/GL_NV_parameter_buffer_object diff --git a/auto/core/GL_NV_path_rendering b/auto/core/gl/GL_NV_path_rendering similarity index 100% rename from auto/core/GL_NV_path_rendering rename to auto/core/gl/GL_NV_path_rendering diff --git a/auto/core/GL_NV_present_video b/auto/core/gl/GL_NV_present_video similarity index 100% rename from auto/core/GL_NV_present_video rename to auto/core/gl/GL_NV_present_video diff --git a/auto/core/GL_NV_tessellation_program5 b/auto/core/gl/GL_NV_tessellation_program5 similarity index 100% rename from auto/core/GL_NV_tessellation_program5 rename to auto/core/gl/GL_NV_tessellation_program5 diff --git a/auto/core/GL_NV_transform_feedback b/auto/core/gl/GL_NV_transform_feedback similarity index 100% rename from auto/core/GL_NV_transform_feedback rename to auto/core/gl/GL_NV_transform_feedback diff --git a/auto/core/GL_NV_vdpau_interop b/auto/core/gl/GL_NV_vdpau_interop similarity index 100% rename from auto/core/GL_NV_vdpau_interop rename to auto/core/gl/GL_NV_vdpau_interop diff --git a/auto/core/GL_NV_vertex_program2_option b/auto/core/gl/GL_NV_vertex_program2_option similarity index 100% rename from auto/core/GL_NV_vertex_program2_option rename to auto/core/gl/GL_NV_vertex_program2_option diff --git a/auto/core/GL_NV_vertex_program3 b/auto/core/gl/GL_NV_vertex_program3 similarity index 100% rename from auto/core/GL_NV_vertex_program3 rename to auto/core/gl/GL_NV_vertex_program3 diff --git a/auto/core/GL_NV_vertex_program4 b/auto/core/gl/GL_NV_vertex_program4 similarity index 100% rename from auto/core/GL_NV_vertex_program4 rename to auto/core/gl/GL_NV_vertex_program4 diff --git a/auto/core/GL_REGAL_ES1_0_compatibility b/auto/core/gl/GL_REGAL_ES1_0_compatibility similarity index 100% rename from auto/core/GL_REGAL_ES1_0_compatibility rename to auto/core/gl/GL_REGAL_ES1_0_compatibility diff --git a/auto/core/GL_REGAL_ES1_1_compatibility b/auto/core/gl/GL_REGAL_ES1_1_compatibility similarity index 100% rename from auto/core/GL_REGAL_ES1_1_compatibility rename to auto/core/gl/GL_REGAL_ES1_1_compatibility diff --git a/auto/core/GL_REGAL_enable b/auto/core/gl/GL_REGAL_enable similarity index 100% rename from auto/core/GL_REGAL_enable rename to auto/core/gl/GL_REGAL_enable diff --git a/auto/core/GL_REGAL_error_string b/auto/core/gl/GL_REGAL_error_string similarity index 100% rename from auto/core/GL_REGAL_error_string rename to auto/core/gl/GL_REGAL_error_string diff --git a/auto/core/GL_REGAL_extension_query b/auto/core/gl/GL_REGAL_extension_query similarity index 100% rename from auto/core/GL_REGAL_extension_query rename to auto/core/gl/GL_REGAL_extension_query diff --git a/auto/core/GL_REGAL_log b/auto/core/gl/GL_REGAL_log similarity index 100% rename from auto/core/GL_REGAL_log rename to auto/core/gl/GL_REGAL_log diff --git a/auto/core/GL_SGIX_shadow b/auto/core/gl/GL_SGIX_shadow similarity index 100% rename from auto/core/GL_SGIX_shadow rename to auto/core/gl/GL_SGIX_shadow diff --git a/auto/core/GL_SUN_read_video_pixels b/auto/core/gl/GL_SUN_read_video_pixels similarity index 100% rename from auto/core/GL_SUN_read_video_pixels rename to auto/core/gl/GL_SUN_read_video_pixels diff --git a/auto/core/GL_VERSION_1_2 b/auto/core/gl/GL_VERSION_1_2 similarity index 100% rename from auto/core/GL_VERSION_1_2 rename to auto/core/gl/GL_VERSION_1_2 diff --git a/auto/core/GL_VERSION_1_2_1 b/auto/core/gl/GL_VERSION_1_2_1 similarity index 100% rename from auto/core/GL_VERSION_1_2_1 rename to auto/core/gl/GL_VERSION_1_2_1 diff --git a/auto/core/GL_VERSION_1_3 b/auto/core/gl/GL_VERSION_1_3 similarity index 100% rename from auto/core/GL_VERSION_1_3 rename to auto/core/gl/GL_VERSION_1_3 diff --git a/auto/core/GL_VERSION_1_4 b/auto/core/gl/GL_VERSION_1_4 similarity index 100% rename from auto/core/GL_VERSION_1_4 rename to auto/core/gl/GL_VERSION_1_4 diff --git a/auto/core/GL_VERSION_1_5 b/auto/core/gl/GL_VERSION_1_5 similarity index 100% rename from auto/core/GL_VERSION_1_5 rename to auto/core/gl/GL_VERSION_1_5 diff --git a/auto/core/GL_VERSION_2_0 b/auto/core/gl/GL_VERSION_2_0 similarity index 100% rename from auto/core/GL_VERSION_2_0 rename to auto/core/gl/GL_VERSION_2_0 diff --git a/auto/core/GL_VERSION_2_1 b/auto/core/gl/GL_VERSION_2_1 similarity index 100% rename from auto/core/GL_VERSION_2_1 rename to auto/core/gl/GL_VERSION_2_1 diff --git a/auto/core/GL_VERSION_3_0 b/auto/core/gl/GL_VERSION_3_0 similarity index 100% rename from auto/core/GL_VERSION_3_0 rename to auto/core/gl/GL_VERSION_3_0 diff --git a/auto/core/GL_VERSION_3_1 b/auto/core/gl/GL_VERSION_3_1 similarity index 100% rename from auto/core/GL_VERSION_3_1 rename to auto/core/gl/GL_VERSION_3_1 diff --git a/auto/core/GL_VERSION_3_2 b/auto/core/gl/GL_VERSION_3_2 similarity index 100% rename from auto/core/GL_VERSION_3_2 rename to auto/core/gl/GL_VERSION_3_2 diff --git a/auto/core/GL_VERSION_3_3 b/auto/core/gl/GL_VERSION_3_3 similarity index 100% rename from auto/core/GL_VERSION_3_3 rename to auto/core/gl/GL_VERSION_3_3 diff --git a/auto/core/GL_VERSION_4_0 b/auto/core/gl/GL_VERSION_4_0 similarity index 100% rename from auto/core/GL_VERSION_4_0 rename to auto/core/gl/GL_VERSION_4_0 diff --git a/auto/core/GL_VERSION_4_1 b/auto/core/gl/GL_VERSION_4_1 similarity index 100% rename from auto/core/GL_VERSION_4_1 rename to auto/core/gl/GL_VERSION_4_1 diff --git a/auto/core/GL_VERSION_4_2 b/auto/core/gl/GL_VERSION_4_2 similarity index 100% rename from auto/core/GL_VERSION_4_2 rename to auto/core/gl/GL_VERSION_4_2 diff --git a/auto/core/GL_VERSION_4_3 b/auto/core/gl/GL_VERSION_4_3 similarity index 100% rename from auto/core/GL_VERSION_4_3 rename to auto/core/gl/GL_VERSION_4_3 diff --git a/auto/core/GL_WIN_swap_hint b/auto/core/gl/GL_WIN_swap_hint similarity index 100% rename from auto/core/GL_WIN_swap_hint rename to auto/core/gl/GL_WIN_swap_hint diff --git a/auto/core/WGL_ARB_create_context b/auto/core/gl/WGL_ARB_create_context similarity index 100% rename from auto/core/WGL_ARB_create_context rename to auto/core/gl/WGL_ARB_create_context diff --git a/auto/core/WGL_ATI_render_texture_rectangle b/auto/core/gl/WGL_ATI_render_texture_rectangle similarity index 100% rename from auto/core/WGL_ATI_render_texture_rectangle rename to auto/core/gl/WGL_ATI_render_texture_rectangle diff --git a/auto/core/WGL_EXT_create_context_es2_profile b/auto/core/gl/WGL_EXT_create_context_es2_profile similarity index 100% rename from auto/core/WGL_EXT_create_context_es2_profile rename to auto/core/gl/WGL_EXT_create_context_es2_profile diff --git a/auto/core/WGL_EXT_create_context_es_profile b/auto/core/gl/WGL_EXT_create_context_es_profile similarity index 100% rename from auto/core/WGL_EXT_create_context_es_profile rename to auto/core/gl/WGL_EXT_create_context_es_profile diff --git a/auto/core/WGL_EXT_framebuffer_sRGB b/auto/core/gl/WGL_EXT_framebuffer_sRGB similarity index 100% rename from auto/core/WGL_EXT_framebuffer_sRGB rename to auto/core/gl/WGL_EXT_framebuffer_sRGB diff --git a/auto/core/WGL_EXT_pixel_format_packed_float b/auto/core/gl/WGL_EXT_pixel_format_packed_float similarity index 100% rename from auto/core/WGL_EXT_pixel_format_packed_float rename to auto/core/gl/WGL_EXT_pixel_format_packed_float diff --git a/auto/core/WGL_NV_gpu_affinity b/auto/core/gl/WGL_NV_gpu_affinity similarity index 100% rename from auto/core/WGL_NV_gpu_affinity rename to auto/core/gl/WGL_NV_gpu_affinity diff --git a/auto/core/WGL_NV_vertex_array_range b/auto/core/gl/WGL_NV_vertex_array_range similarity index 100% rename from auto/core/WGL_NV_vertex_array_range rename to auto/core/gl/WGL_NV_vertex_array_range From de35ee02155d706aed45c80593ca9b3d28ff1998 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Wed, 24 Oct 2012 18:36:37 -0500 Subject: [PATCH 25/26] Fixup for filter_gl_ext.sh --- auto/bin/filter_gl_ext.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/auto/bin/filter_gl_ext.sh b/auto/bin/filter_gl_ext.sh index 7e4504d..34a3214 100755 --- a/auto/bin/filter_gl_ext.sh +++ b/auto/bin/filter_gl_ext.sh @@ -13,9 +13,6 @@ set -e -if [ ! -d $1 ] ; then - mkdir -p $1 - # fix GL_NV_texture_compression_vtc grep -v EXT $1/GL_NV_texture_compression_vtc > tmp mv tmp $1/GL_NV_texture_compression_vtc @@ -439,5 +436,3 @@ EOT # clean up rm -f $1/*.bak - -fi From d5fc1620f8b967d53e1c4e30280c3e0c425c22fe Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Mon, 17 Sep 2012 21:55:47 -0500 Subject: [PATCH 26/26] Documentation updates. --- doc/glew.html | 292 +++++++++++++++++++++++++------------------------ doc/glxew.html | 2 +- doc/log.html | 4 +- doc/wglew.html | 72 ++++++------ 4 files changed, 191 insertions(+), 179 deletions(-) diff --git a/doc/glew.html b/doc/glew.html index e239834..94f331e 100644 --- a/doc/glew.html +++ b/doc/glew.html @@ -428,161 +428,169 @@ width="88" height="32" border="0" alt="Support This Project"> --> 311 MESA_window_pos 312 MESA_ycbcr_texture
      -313 NVX_gpu_memory_info +313 NVX_conditional_render +314 NVX_gpu_memory_info
      -314 NV_bindless_texture -315 NV_blend_square -316 NV_conditional_render -317 NV_copy_depth_to_color -318 NV_copy_image -319 NV_depth_buffer_float -320 NV_depth_clamp -321 NV_depth_range_unclamped -322 NV_evaluators -323 NV_explicit_multisample -324 NV_fence -325 NV_float_buffer -326 NV_fog_distance -327 NV_fragment_program -328 NV_fragment_program2 -329 NV_fragment_program4 -330 NV_fragment_program_option -331 NV_framebuffer_multisample_coverage -332 NV_geometry_program4 -333 NV_geometry_shader4 -334 NV_gpu_program4 -335 NV_gpu_program5 -336 NV_gpu_program_fp64 -337 NV_gpu_shader5 -338 NV_half_float -339 NV_light_max_exponent -340 NV_multisample_coverage -341 NV_multisample_filter_hint -342 NV_occlusion_query -343 NV_packed_depth_stencil -344 NV_parameter_buffer_object -345 NV_parameter_buffer_object2 -346 NV_path_rendering -347 NV_pixel_data_range -348 NV_point_sprite -349 NV_present_video -350 NV_primitive_restart -351 NV_register_combiners -352 NV_register_combiners2 -353 NV_shader_atomic_float -354 NV_shader_buffer_load -355 NV_tessellation_program5 -356 NV_texgen_emboss -357 NV_texgen_reflection -358 NV_texture_barrier -359 NV_texture_compression_vtc -360 NV_texture_env_combine4 -361 NV_texture_expand_normal -362 NV_texture_multisample -363 NV_texture_rectangle -364 NV_texture_shader -365 NV_texture_shader2 -366 NV_texture_shader3 -367 NV_transform_feedback -368 NV_transform_feedback2 -369 NV_vdpau_interop -370 NV_vertex_array_range -371 NV_vertex_array_range2 -372 NV_vertex_attrib_integer_64bit -373 NV_vertex_buffer_unified_memory -374 NV_vertex_program -375 NV_vertex_program1_1 -376 NV_vertex_program2 -377 NV_vertex_program2_option -378 NV_vertex_program3 -379 NV_vertex_program4 -380 NV_video_capture +315 NV_bindless_texture +316 NV_blend_square +317 NV_compute_program5 +318 NV_conditional_render +319 NV_copy_depth_to_color +320 NV_copy_image +321 NV_deep_texture3D +322 NV_depth_buffer_float +323 NV_depth_clamp +324 NV_depth_range_unclamped +325 NV_evaluators +326 NV_explicit_multisample +327 NV_fence +328 NV_float_buffer +329 NV_fog_distance +330 NV_fragment_program +331 NV_fragment_program2 +332 NV_fragment_program4 +333 NV_fragment_program_option +334 NV_framebuffer_multisample_coverage +335 NV_geometry_program4 +336 NV_geometry_shader4 +337 NV_gpu_program4 +338 NV_gpu_program5 +339 NV_gpu_program_fp64 +340 NV_gpu_shader5 +341 NV_half_float +342 NV_light_max_exponent +343 NV_multisample_coverage +344 NV_multisample_filter_hint +345 NV_occlusion_query +346 NV_packed_depth_stencil +347 NV_parameter_buffer_object +348 NV_parameter_buffer_object2 +349 NV_path_rendering +350 NV_pixel_data_range +351 NV_point_sprite +352 NV_present_video +353 NV_primitive_restart +354 NV_register_combiners +355 NV_register_combiners2 +356 NV_shader_atomic_counters +357 NV_shader_atomic_float +358 NV_shader_buffer_load +359 NV_shader_storage_buffer_object +360 NV_tessellation_program5 +361 NV_texgen_emboss +362 NV_texgen_reflection +363 NV_texture_barrier +364 NV_texture_compression_vtc +365 NV_texture_env_combine4 +366 NV_texture_expand_normal +367 NV_texture_multisample +368 NV_texture_rectangle +369 NV_texture_shader +370 NV_texture_shader2 +371 NV_texture_shader3 +372 NV_transform_feedback +373 NV_transform_feedback2 +374 NV_vdpau_interop +375 NV_vertex_array_range +376 NV_vertex_array_range2 +377 NV_vertex_attrib_integer_64bit +378 NV_vertex_buffer_unified_memory +379 NV_vertex_program +380 NV_vertex_program1_1 +381 NV_vertex_program2 +382 NV_vertex_program2_option +383 NV_vertex_program3 +384 NV_vertex_program4 +385 NV_video_capture
      -381 OES_byte_coordinates -382 OES_compressed_paletted_texture -383 OES_read_format -384 OES_single_precision +386 OES_byte_coordinates +387 OES_compressed_paletted_texture +388 OES_read_format +389 OES_single_precision
      -385 OML_interlace -386 OML_resample -387 OML_subsample +390 OML_interlace +391 OML_resample +392 OML_subsample
      -388 PGI_misc_hints -389 PGI_vertex_hints +393 PGI_misc_hints +394 PGI_vertex_hints
      -390 REGAL_error_string -391 REGAL_extension_query -392 REGAL_log +395 REGAL_ES1_0_compatibility +396 REGAL_ES1_1_compatibility +397 REGAL_enable +398 REGAL_error_string +399 REGAL_extension_query +400 REGAL_log
      -393 REND_screen_coordinates +401 REND_screen_coordinates
      -394 S3_s3tc +402 S3_s3tc
      -395 SGIS_color_range -396 SGIS_detail_texture -397 SGIS_fog_function -398 SGIS_generate_mipmap -399 SGIS_multisample -400 SGIS_pixel_texture -401 SGIS_point_line_texgen -402 SGIS_sharpen_texture -403 SGIS_texture4D -404 SGIS_texture_border_clamp -405 SGIS_texture_edge_clamp -406 SGIS_texture_filter4 -407 SGIS_texture_lod -408 SGIS_texture_select +403 SGIS_color_range +404 SGIS_detail_texture +405 SGIS_fog_function +406 SGIS_generate_mipmap +407 SGIS_multisample +408 SGIS_pixel_texture +409 SGIS_point_line_texgen +410 SGIS_sharpen_texture +411 SGIS_texture4D +412 SGIS_texture_border_clamp +413 SGIS_texture_edge_clamp +414 SGIS_texture_filter4 +415 SGIS_texture_lod +416 SGIS_texture_select
      -409 SGIX_async -410 SGIX_async_histogram -411 SGIX_async_pixel -412 SGIX_blend_alpha_minmax -413 SGIX_clipmap -414 SGIX_convolution_accuracy -415 SGIX_depth_texture -416 SGIX_flush_raster -417 SGIX_fog_offset -418 SGIX_fog_texture -419 SGIX_fragment_specular_lighting -420 SGIX_framezoom -421 SGIX_interlace -422 SGIX_ir_instrument1 -423 SGIX_list_priority -424 SGIX_pixel_texture -425 SGIX_pixel_texture_bits -426 SGIX_reference_plane -427 SGIX_resample -428 SGIX_shadow -429 SGIX_shadow_ambient -430 SGIX_sprite -431 SGIX_tag_sample_buffer -432 SGIX_texture_add_env -433 SGIX_texture_coordinate_clamp -434 SGIX_texture_lod_bias -435 SGIX_texture_multi_buffer -436 SGIX_texture_range -437 SGIX_texture_scale_bias -438 SGIX_vertex_preclip -439 SGIX_vertex_preclip_hint -440 SGIX_ycrcb +417 SGIX_async +418 SGIX_async_histogram +419 SGIX_async_pixel +420 SGIX_blend_alpha_minmax +421 SGIX_clipmap +422 SGIX_convolution_accuracy +423 SGIX_depth_texture +424 SGIX_flush_raster +425 SGIX_fog_offset +426 SGIX_fog_texture +427 SGIX_fragment_specular_lighting +428 SGIX_framezoom +429 SGIX_interlace +430 SGIX_ir_instrument1 +431 SGIX_list_priority +432 SGIX_pixel_texture +433 SGIX_pixel_texture_bits +434 SGIX_reference_plane +435 SGIX_resample +436 SGIX_shadow +437 SGIX_shadow_ambient +438 SGIX_sprite +439 SGIX_tag_sample_buffer +440 SGIX_texture_add_env +441 SGIX_texture_coordinate_clamp +442 SGIX_texture_lod_bias +443 SGIX_texture_multi_buffer +444 SGIX_texture_range +445 SGIX_texture_scale_bias +446 SGIX_vertex_preclip +447 SGIX_vertex_preclip_hint +448 SGIX_ycrcb
      -441 SGI_color_matrix -442 SGI_color_table -443 SGI_texture_color_table +449 SGI_color_matrix +450 SGI_color_table +451 SGI_texture_color_table
      -444 SUNX_constant_data +452 SUNX_constant_data
      -445 SUN_convolution_border_modes -446 SUN_global_alpha -447 SUN_mesh_array -448 SUN_read_video_pixels -449 SUN_slice_accum -450 SUN_triangle_list -451 SUN_vertex +453 SUN_convolution_border_modes +454 SUN_global_alpha +455 SUN_mesh_array +456 SUN_read_video_pixels +457 SUN_slice_accum +458 SUN_triangle_list +459 SUN_vertex
      -452 WIN_phong_shading -453 WIN_specular_fog -454 WIN_swap_hint +460 WIN_phong_shading +461 WIN_specular_fog +462 WIN_swap_hint diff --git a/doc/glxew.html b/doc/glxew.html index 9464770..42d349a 100644 --- a/doc/glxew.html +++ b/doc/glxew.html @@ -146,7 +146,7 @@ width="88" height="32" border="0" alt="Support This Project"> --> 37 NV_swap_group 38 NV_vertex_array_range 39 NV_video_capture -40 NV_video_out +40 NV_video_output
      41 OML_swap_method 42 OML_sync_control diff --git a/doc/log.html b/doc/log.html index 888372a..d52dbf8 100644 --- a/doc/log.html +++ b/doc/log.html @@ -105,7 +105,9 @@ width="88" height="32" border="0" alt="Support This Project"> -->