diff --git a/.gitattributes b/.gitattributes index b49408f..100a05f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,6 @@ * text eol=lf *.png binary +*.pdf binary build/*/* text eol=crlf CMakeLists.txt text eol=lf build/cmake/* text eol=lf diff --git a/.gitignore b/.gitignore index 8e9527a..6270eeb 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ /src/*.c /include/GL/*.h /build/vc6/*.rc +/build/*.rc /build/*/*.sdf /build/*/*.suo /build/*/*.vcxproj.user diff --git a/.travis.yml b/.travis.yml index 769a9ab..021066d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,14 @@ script: - make -C auto clobber - make extensions - make dist-src -- make clean; SYSTEM=linux make -- make clean; SYSTEM=linux-osmesa make -- pushd build/cmake; git clean -xdf .; cmake -G 'Unix Makefiles' . ; make; popd -- pushd build/cmake; git clean -xdf .; cmake -G 'Unix Makefiles' -DGLEW_OSMESA=1 .; make; popd +- make clean; SYSTEM=linux make +- make clean; SYSTEM=linux-osmesa make +- make clean; SYSTEM=linux-egl make +- make clean; SYSTEM=linux-clang make +- make clean; SYSTEM=linux-clang-egl make +- pushd build/cmake; git clean -xdf .; cmake -G 'Unix Makefiles' . ; make; popd +- pushd build/cmake; git clean -xdf .; cmake -G 'Unix Makefiles' -DGLEW_OSMESA=1 . ; make; popd +- pushd build/cmake; git clean -xdf .; cmake -G 'Unix Makefiles' -DGLEW_EGL=1 . ; make; popd addons: apt: packages: @@ -16,6 +20,7 @@ addons: - cmake - dos2unix - libosmesa6-dev + - libegl1-mesa-dev artifacts: bucket: glew s3_region: "us-east-1" diff --git a/Makefile b/Makefile index 8bdb0e1..ea3cf3a 100644 --- a/Makefile +++ b/Makefile @@ -45,21 +45,23 @@ GLEW_DEST ?= /usr BINDIR ?= $(GLEW_DEST)/bin LIBDIR ?= $(GLEW_DEST)/lib INCDIR ?= $(GLEW_DEST)/include/GL +PKGDIR ?= $(GLEW_DEST)/lib/pkgconfig ifneq ($(GLEW_NO_GLU), -DGLEW_NO_GLU) LIBGLU = glu endif -DIST_NAME ?= glew-$(GLEW_VERSION) +DIST_NAME ?= glew-$(GLEW_VERSION) DIST_SRC_ZIP ?= $(shell pwd)/$(DIST_NAME).zip DIST_SRC_TGZ ?= $(shell pwd)/$(DIST_NAME).tgz DIST_WIN32 ?= $(shell pwd)/$(DIST_NAME)-win32.zip DIST_DIR := $(shell mktemp -d /tmp/glew.XXXXXX)/$(DIST_NAME) -# To disable stripping of binaries either: +# To disable stripping of linked binaries either: # - use STRIP= on gmake command-line # - edit this makefile to set STRIP to the empty string +# (Note: STRIP does not affect the strip in the install step) # # To disable symlinks: # - use LN= on gmake command-line @@ -81,7 +83,7 @@ endif INCLUDE = -Iinclude CFLAGS = $(OPT) $(WARN) $(INCLUDE) $(CFLAGS.EXTRA) -all debug: glew.lib glew.lib.mx glew.bin +all debug: glew.lib glew.bin # GLEW shared and static libraries @@ -96,11 +98,6 @@ LIB.OBJS := $(LIB.OBJS:.c=.o) LIB.SOBJS := $(addprefix tmp/$(SYSTEM)/default/shared/,$(LIB.SRCS.NAMES)) LIB.SOBJS := $(LIB.SOBJS:.c=.o) -LIB.OBJS.MX := $(addprefix tmp/$(SYSTEM)/mx/static/,$(LIB.SRCS.NAMES)) -LIB.OBJS.MX := $(LIB.OBJS.MX:.c=.o) -LIB.SOBJS.MX := $(addprefix tmp/$(SYSTEM)/mx/shared/,$(LIB.SRCS.NAMES)) -LIB.SOBJS.MX := $(LIB.SOBJS.MX:.c=.o) - glew.lib: lib lib/$(LIB.SHARED) lib/$(LIB.STATIC) glew.pc lib: @@ -150,54 +147,6 @@ glew.pc: glew.pc.in -e "s|@requireslib@|$(LIBGLU)|g" \ < $< > $@ -# GLEW MX static and shared libraries - -glew.lib.mx: lib lib/$(LIB.SHARED.MX) lib/$(LIB.STATIC.MX) glewmx.pc - -lib/$(LIB.STATIC.MX): $(LIB.OBJS.MX) -ifneq ($(AR),) - $(AR) $(ARFLAGS) $@ $^ -else ifneq ($(LIBTOOL),) - $(LIBTOOL) $@ $^ -endif -ifneq ($(STRIP),) - $(STRIP) -x $@ -endif - -lib/$(LIB.SHARED.MX): $(LIB.SOBJS.MX) - $(LD) $(LDFLAGS.SO.MX) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS) -ifneq ($(LN),) - $(LN) $(LIB.SHARED.MX) lib/$(LIB.SONAME.MX) - $(LN) $(LIB.SHARED.MX) lib/$(LIB.DEVLNK.MX) -endif -ifneq ($(STRIP),) - $(STRIP) -x $@ -endif - -tmp/$(SYSTEM)/mx/static/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 -DGLEW_STATIC $(CFLAGS) $(CFLAGS.SO) -o $@ -c $< - -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 -DGLEW_BUILD $(CFLAGS) $(CFLAGS.SO) -o $@ -c $< - -# Force re-write of glewmx.pc, GLEW_DEST can vary - -.PHONY: glewmx.pc - -glewmx.pc: glew.pc.in - sed \ - -e "s|@prefix@|$(GLEW_PREFIX)|g" \ - -e "s|@libdir@|$(LIBDIR)|g" \ - -e "s|@exec_prefix@|$(BINDIR)|g" \ - -e "s|@includedir@|$(INCDIR)|g" \ - -e "s|@version@|$(GLEW_VERSION)|g" \ - -e "s|@cflags@|-DGLEW_MX|g" \ - -e "s|@libname@|$(NAME)mx|g" \ - -e "s|@requireslib@|$(LIBGLU)|g" \ - < $< > $@ - # GLEW utility programs BIN.LIBS = -Llib $(LDFLAGS.DYNAMIC) -l$(NAME) $(LDFLAGS.EXTRA) $(LDFLAGS.GL) @@ -245,12 +194,10 @@ $(VISUALINFO.BIN.OBJ): $(VISUALINFO.BIN.SRC) include/GL/glew.h include/GL/wglew. # Install targets -install.all: install install.mx install.bin +install.all: install install.bin install: install.include install.lib install.pkgconfig -install.mx: install.include install.lib.mx install.pkgconfig.mx - install.lib: glew.lib $(INSTALL) -d -m 0755 "$(DESTDIR)$(LIBDIR)" # runtime @@ -273,27 +220,6 @@ ifneq ($(LN),) endif $(INSTALL) -m 0644 lib/$(LIB.STATIC) "$(DESTDIR)$(LIBDIR)/" -install.lib.mx: glew.lib.mx - $(INSTALL) -d -m 0755 "$(DESTDIR)$(LIBDIR)" -# runtime -ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) - $(INSTALL) -d -m 0755 "$(DESTDIR)$(BINDIR)" - $(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) "$(DESTDIR)$(BINDIR)/" -else - $(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) "$(DESTDIR)$(LIBDIR)/" -endif -ifneq ($(LN),) - $(LN) $(LIB.SHARED.MX) "$(DESTDIR)$(LIBDIR)/$(LIB.SONAME.MX)" -endif -# development files -ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) - $(INSTALL) -m 0644 lib/$(LIB.DEVLNK.MX) "$(DESTDIR)$(LIBDIR)/" -endif -ifneq ($(LN),) - $(LN) $(LIB.SHARED.MX) "$(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK.MX)" -endif - $(INSTALL) -m 0644 lib/$(LIB.STATIC.MX) "$(DESTDIR)$(LIBDIR)/" - install.bin: glew.bin $(INSTALL) -d -m 0755 "$(DESTDIR)$(BINDIR)" $(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) "$(DESTDIR)$(BINDIR)/" @@ -305,34 +231,29 @@ install.include: $(INSTALL) -m 0644 include/GL/glxew.h "$(DESTDIR)$(INCDIR)/" install.pkgconfig: glew.pc - $(INSTALL) -d -m 0755 "$(DESTDIR)$(LIBDIR)" - $(INSTALL) -d -m 0755 "$(DESTDIR)$(LIBDIR)/pkgconfig" - $(INSTALL) -m 0644 glew.pc "$(DESTDIR)$(LIBDIR)/pkgconfig/" - -install.pkgconfig.mx: glewmx.pc - $(INSTALL) -d -m 0755 "$(DESTDIR)$(LIBDIR)" - $(INSTALL) -d -m 0755 "$(DESTDIR)$(LIBDIR)/pkgconfig" - $(INSTALL) -m 0644 glewmx.pc "$(DESTDIR)$(LIBDIR)/pkgconfig/" + $(INSTALL) -d -m 0755 "$(DESTDIR)$(PKGDIR)" + $(INSTALL) -d -m 0755 "$(DESTDIR)$(PKGDIR)" + $(INSTALL) -m 0644 glew.pc "$(DESTDIR)$(PKGDIR)/" uninstall: $(RM) "$(DESTDIR)$(INCDIR)/wglew.h" $(RM) "$(DESTDIR)$(INCDIR)/glew.h" $(RM) "$(DESTDIR)$(INCDIR)/glxew.h" - $(RM) "$(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK)" "$(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK.MX)" + $(RM) "$(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK)" ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) - $(RM) "$(DESTDIR)$(BINDIR)/$(LIB.SHARED)" "$(DESTDIR)$(BINDIR)/$(LIB.SHARED.MX)" + $(RM) "$(DESTDIR)$(BINDIR)/$(LIB.SHARED)" else - $(RM) "$(DESTDIR)$(LIBDIR)/$(LIB.SONAME)" "$(DESTDIR)$(LIBDIR)/$(LIB.SONAME.MX)" - $(RM) "$(DESTDIR)$(LIBDIR)/$(LIB.SHARED)" "$(DESTDIR)$(LIBDIR)/$(LIB.SHARED.MX)" + $(RM) "$(DESTDIR)$(LIBDIR)/$(LIB.SONAME)" + $(RM) "$(DESTDIR)$(LIBDIR)/$(LIB.SHARED)" endif - $(RM) "$(DESTDIR)$(LIBDIR)/$(LIB.STATIC)" "$(DESTDIR)$(LIBDIR)/$(LIB.STATIC.MX)" + $(RM) "$(DESTDIR)$(LIBDIR)/$(LIB.STATIC)" $(RM) "$(DESTDIR)$(BINDIR)/$(GLEWINFO.BIN)" "$(DESTDIR)$(BINDIR)/$(VISUALINFO.BIN)" clean: $(RM) -r tmp/ $(RM) -r lib/ $(RM) -r bin/ - $(RM) glew.pc glewmx.pc + $(RM) glew.pc distclean: clean find . -name \*~ | xargs $(RM) diff --git a/README.md b/README.md index 4c13c0a..c4a01e8 100644 --- a/README.md +++ b/README.md @@ -7,30 +7,155 @@ http://glew.sourceforge.net/ https://github.com/nigels-com/glew [![Build Status](https://travis-ci.org/nigels-com/glew.svg?branch=master)](https://travis-ci.org/nigels-com/glew) +[![Gitter](https://badges.gitter.im/nigels-com/glew.svg)](https://gitter.im/nigels-com/glew?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) + +## Downloads + +Current release is [1.13.0](https://sourceforge.net/projects/glew/files/glew/1.13.0/). +[(Change Log)](http://glew.sourceforge.net/log.html) + +Sources available as +[ZIP](https://sourceforge.net/projects/glew/files/glew/1.13.0/glew-1.13.0.zip/download) or +[TGZ](https://sourceforge.net/projects/glew/files/glew/1.13.0/glew-1.13.0.tgz/download). + +Windows binaries for [32-bit and 64-bit](https://sourceforge.net/projects/glew/files/glew/1.13.0/glew-1.13.0-win32.zip/download). + +### Recent snapshots + +Snapshots may contain new features, bug-fixes or new OpenGL extensions ahead of tested, official releases. + +[glew-20160402.tgz](http://sourceforge.net/projects/glew/files/glew/snapshots/glew-20160402.tgz/download) +*GLEW 2.0.0 release candidate, Core context, EGL support, no MX* + +[glew-20160131.tgz](http://sourceforge.net/projects/glew/files/glew/snapshots/glew-20160131.tgz/download) +*GLEW 2.0.0 release candidate: Core context support, no MX* + +[glew-20151117.tgz](http://sourceforge.net/projects/glew/files/glew/snapshots/glew-20151117.tgz/download) ## Build -If you downloaded the tarball or zip archive from the GLEW website, -you just need to: +From a downloaded tarball or zip archive: -### Unix +### Linux and Mac - $ make - $ sudo make install - $ make clean +#### Using GNU Make + +##### Install build tools + +Debian/Ubuntu/Mint: `$ sudo apt-get install build-essential libxmu-dev libxi-dev libgl-dev libosmesa-dev git` + +RedHat/CentOS/Fedora: `$ sudo yum install libXmu-devel libXi-devel libGL-devel git` + +##### Build + + $ make + $ sudo make install + $ make clean + +Targets: `all, glew.lib, glew.bin, clean, install, uninstall` + +Variables: `SYSTEM=linux-clang, GLEW_DEST=/usr/local, STRIP=` + +#### Using cmake + +*CMake 2.8.12 or higher is required.* + +##### Install build tools + +Debian/Ubuntu/Mint: `$ sudo apt-get install build-essential libXmu-dev libXi-dev libgl-dev git cmake` + +RedHat/CentOS/Fedora: `$ sudo yum install libXmu-devel libXi-devel libGL-devel git cmake` + +##### Build + + $ cd build + $ cmake ./cmake + $ make -j4 + +| Target | Description | +| ---------- | ----------- | +| glew | Build the glew shared library. | +| glew_s | Build the glew static library. | +| glewinfo | Build the `glewinfo` executable (requires `BUILD_UTILS` to be `ON`). | +| visualinfo | Build the `visualinfo` executable (requires `BUILD_UTILS` to be `ON`). | +| install | Install all enabled targets into `CMAKE_INSTALL_PREFIX`. | +| clean | Clean up build artifacts. | +| all | Build all enabled targets (default target). | + +| Variables | Description | +| --------------- | ----------- | +| BUILD_UTILS | Build the `glewinfo` and `visualinfo` executables. | +| GLEW_REGAL | Build in Regal mode. | +| GLEW_OSMESA | Build in off-screen Mesa mode. | +| BUILD_FRAMEWORK | Build as MacOSX Framework. Setting `CMAKE_INSTALL_PREFIX` to `/Library/Frameworks` is recommended. | ### Windows -use the project file in build/vc12/ +#### Visual Studio + +Use the provided Visual Studio project file in build/vc12/ + +Projects for vc6 and vc10 are also provided + +#### MSYS/Mingw + +Available from [Mingw](http://www.mingw.org/) + +Requirements: bash, make, gcc + + $ mingw32-make + $ mingw32-make install + $ mingw32-make install.all + +Alternative toolchain: `SYSTEM=mingw-win32` + +#### MSYS2/Mingw-w64 + +Available from [Msys2](http://msys2.github.io/) and/or [Mingw-w64](http://mingw-w64.org/) + +Requirements: bash, make, gcc + + $ pacman -S gcc make mingw-w64-i686-gcc mingw-w64-x86_64-gcc + $ make + $ make install + $ make install.all + +Alternative toolchain: `SYSTEM=msys, SYSTEM=msys-win32, SYSTEM=msys-win64` + +## glewinfo + +`glewinfo` is a command-line tool useful for inspecting the capabilities of an +OpenGL implementation and GLEW support for that. Please include the output of +`glewinfo` with bug reports, as appropriate. + + --------------------------- + GLEW Extension Info + --------------------------- + + GLEW version 2.0.0 + Reporting capabilities of pixelformat 3 + Running on a Intel(R) HD Graphics 3000 from Intel + OpenGL version 3.1.0 - Build 9.17.10.4229 is supported + + GL_VERSION_1_1: OK + --------------- + + GL_VERSION_1_2: OK + --------------- + glCopyTexSubImage3D: OK + glDrawRangeElements: OK + glTexImage3D: OK + glTexSubImage3D: OK + + ... ## Code Generation -If you wish to build GLEW from scratch (update the extension data from -the net or add your own extension information), you need a Unix -environment (including wget, perl, and GNU make). The extension data -is regenerated from the top level source directory with: +A Unix or Mac environment is neded for building GLEW from scratch to +include new extensions, or customize the code generation. The extension +data is regenerated from the top level source directory with: - make extensions + make extensions An alternative to generating the GLEW sources from scratch is to download a pre-generated (unsupported) snapshot: @@ -39,4 +164,30 @@ https://sourceforge.net/projects/glew/files/glew/snapshots/ Travis-built snapshots are also available: -https://glew.s3.amazonaws.com/index.html \ No newline at end of file +https://glew.s3.amazonaws.com/index.html + +## Authors + +GLEW is currently maintained by [Nigel Stewart](https://github.com/nigels-com) +with bug fixes, new OpenGL extension support and new releases. + +GLEW was developed by [Milan Ikits](http://www.cs.utah.edu/~ikits/) +and [Marcelo Magallon](http://wwwvis.informatik.uni-stuttgart.de/~magallon/). +Aaron Lefohn, Joe Kniss, and Chris Wyman were the first users and also +assisted with the design and debugging process. + +The acronym GLEW originates from Aaron Lefohn. +Pasi Kärkkäinen identified and fixed several problems with +GLX and SDL. Nate Robins created the `wglinfo` utility, to +which modifications were made by Michael Wimmer. + +## Copyright and Licensing + +GLEW is originally derived from the EXTGL project by Lev Povalahev. +The source code is licensed under the +[Modified BSD License](http://glew.sourceforge.net/glew.txt), the +[Mesa 3-D License](http://glew.sourceforge.net/mesa.txt) (MIT) and the +[Khronos License](http://glew.sourceforge.net/khronos.txt) (MIT). + +The automatic code generation scripts are released under the +[GNU GPL](http://glew.sourceforge.net/gpl.txt). diff --git a/auto/Makefile b/auto/Makefile index 953660e..ff9dd36 100644 --- a/auto/Makefile +++ b/auto/Makefile @@ -10,6 +10,7 @@ include ../config/version #GLEW_SPLIT_SOURCE = yes SHELL = bash +PYTHON ?= python ### Use git repository for GL extension specifications @@ -41,16 +42,19 @@ BLACKLIST = blacklist GL_CORE_SPEC := $(CORE)/GL_VERSION* GLX_CORE_SPEC := $(CORE)/GLX_VERSION* +EGL_CORE_SPEC := $(CORE)/EGL_VERSION* ifeq (custom,$(MAKECMDGOALS)) #GL_CORE_SPEC := $(shell grep GL_VERSION custom.txt | perl -pi -e "s=^=$(CORE)/=g;") GL_EXT_SPEC := $(shell grep "^[ \t]*GL_" custom.txt | grep -v GL_VERSION | perl -pi -e "s=^=$(EXT)/=g;") WGL_EXT_SPEC := $(shell grep "^[ \t]*WGL_" custom.txt | perl -pi -e "s=^=$(EXT)/=g;") #GLX_CORE_SPEC := $(shell grep GLX_VERSION custom.txt | perl -pi -e "s=^=$(CORE)/=g;") GLX_EXT_SPEC := $(shell grep "^[ \t]*GLX_" custom.txt | grep -v GLX_VERSION | perl -pi -e "s=^=$(EXT)/=g;") +EGL_EXT_SPEC := $(shell grep "^[ \t]*EGL_" custom.txt | grep -v EGL_VERSION | perl -pi -e "s=^=$(EXT)/=g;") else GL_EXT_SPEC := $(EXT)/GL_* WGL_EXT_SPEC := $(EXT)/WGL_* GLX_EXT_SPEC := $(EXT)/GLX_* +EGL_EXT_SPEC := $(EXT)/EGL_* endif PARSE_SPEC = parse_spec.pl @@ -65,7 +69,8 @@ B.DEST = $(TOP)/build I.TARGETS = \ $(I.DEST)/glew.h \ $(I.DEST)/wglew.h \ - $(I.DEST)/glxew.h + $(I.DEST)/glxew.h \ + $(I.DEST)/eglew.h ifeq (yes,$(GLEW_SPLIT_SOURCE)) S.TARGETS = \ @@ -114,6 +119,7 @@ $(EXT)/.dummy: $(REGISTRY)/.dummy @echo "--------------------------------------------------------------------" rm -rf $(EXT) $(BIN)/update_ext.sh $(EXT) $(REGISTRY) $(BLACKLIST) + $(PYTHON) $(BIN)/parse_xml.py registry/xml/egl.xml --core core/gl --extensions extensions/gl $(BIN)/$(FILTER) $(EXT) ifeq ($(patsubst Darwin%,Darwin,$(SYSTEM)), Darwin) find $(CORE) -maxdepth 1 -type f | grep -v VERSION | grep -v "~" | \ @@ -135,13 +141,9 @@ $(I.DEST)/glew.h: $(EXT)/.dummy cat $(SRC)/glew_head.h >> $@ $(BIN)/make_header.pl GLAPIENTRY GL $(GL_CORE_SPEC) >> $@ $(BIN)/make_header.pl GLAPIENTRY GL $(GL_EXT_SPEC) >> $@ - echo -e "/* ------------------------------------------------------------------------- */\n\n#if defined(GLEW_MX) && defined(_WIN32)\n#define GLEW_FUN_EXPORT\n#else\n#define GLEW_FUN_EXPORT GLEWAPI\n#endif /* GLEW_MX */\n" >> $@ - echo -e "#if defined(GLEW_MX)\n#define GLEW_VAR_EXPORT\n#else\n#define GLEW_VAR_EXPORT GLEWAPI\n#endif /* GLEW_MX */\n" >> $@ - echo -e "#if defined(GLEW_MX) && defined(_WIN32)\nstruct GLEWContextStruct\n{\n#endif /* GLEW_MX */" >> $@ + echo -e "/* ------------------------------------------------------------------------- */\n\n" >> $@ $(BIN)/make_struct_fun.pl GLEW_FUN_EXPORT $(GL_CORE_SPEC) $(GL_EXT_SPEC) >> $@ - echo -e "\n#if defined(GLEW_MX) && !defined(_WIN32)\nstruct GLEWContextStruct\n{\n#endif /* GLEW_MX */\n" >> $@ $(BIN)/make_struct_var.pl GLEW_VAR_EXPORT $(GL_CORE_SPEC) $(GL_EXT_SPEC) >> $@ - echo -e "\n#ifdef GLEW_MX\n}; /* GLEWContextStruct */\n#endif /* GLEW_MX */\n" >> $@ perl -e "s/GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_2;/GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_1;\nGLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_2;/" -pi $@ cat $(SRC)/glew_tail.h >> $@ perl -e "s/GLEW_VERSION_STRING/$(GLEW_VERSION)/g" -pi $@ @@ -159,10 +161,8 @@ $(I.DEST)/wglew.h: $(EXT)/.dummy cat $(SRC)/wglew_head.h >> $@ $(BIN)/make_header.pl WINAPI WGL $(WGL_EXT_SPEC) >> $@ cat $(SRC)/wglew_mid.h >> $@ - echo -e "\n#ifdef GLEW_MX\nstruct WGLEWContextStruct\n{\n#endif /* GLEW_MX */" >> $@ $(BIN)/make_struct_fun.pl WGLEW_FUN_EXPORT $(WGL_EXT_SPEC) >> $@ $(BIN)/make_struct_var.pl WGLEW_VAR_EXPORT $(WGL_EXT_SPEC) >> $@ - echo -e "\n#ifdef GLEW_MX\n}; /* WGLEWContextStruct */\n#endif /* GLEW_MX */\n" >> $@ cat $(SRC)/wglew_tail.h >> $@ $(I.DEST)/glxew.h: $(EXT)/.dummy @@ -177,51 +177,76 @@ $(I.DEST)/glxew.h: $(EXT)/.dummy $(BIN)/make_header.pl "" GLX $(GLX_EXT_SPEC) >> $@ cat $(SRC)/glxew_mid.h >> $@ $(BIN)/make_struct_fun.pl GLXEW_FUN_EXPORT $(GLX_CORE_SPEC) $(GLX_EXT_SPEC) >> $@ - echo -e "\n#if defined(GLEW_MX)\nstruct GLXEWContextStruct\n{\n#endif /* GLEW_MX */\n" >> $@ $(BIN)/make_struct_var.pl GLXEW_VAR_EXPORT $(GLX_CORE_SPEC) $(GLX_EXT_SPEC) >> $@ - echo -e "\n#ifdef GLEW_MX\n}; /* GLXEWContextStruct */\n#endif /* GLEW_MX */\n" >> $@ perl -e "s/GLXEW_VAR_EXPORT GLboolean __GLXEW_VERSION_1_2;/GLXEW_VAR_EXPORT GLboolean __GLXEW_VERSION_1_0;\nGLXEW_VAR_EXPORT GLboolean __GLXEW_VERSION_1_1;\nGLXEW_VAR_EXPORT GLboolean __GLXEW_VERSION_1_2;/" -pi $@ cat $(SRC)/glxew_tail.h >> $@ +$(I.DEST)/eglew.h: $(EXT)/.dummy + @echo "--------------------------------------------------------------------" + @echo "Creating eglew.h" + @echo "--------------------------------------------------------------------" + cp -f $(SRC)/glew_license.h $@ + cat $(SRC)/mesa_license.h >> $@ + cat $(SRC)/khronos_license.h >> $@ + cat $(SRC)/eglew_head.h >> $@ + $(BIN)/make_header.pl "" EGL $(EGL_CORE_SPEC) >> $@ + $(BIN)/make_header.pl "" EGL $(EGL_EXT_SPEC) >> $@ + cat $(SRC)/eglew_mid.h >> $@ + $(BIN)/make_struct_fun.pl EGLEW_FUN_EXPORT $(EGL_CORE_SPEC) $(EGL_EXT_SPEC) >> $@ + $(BIN)/make_struct_var.pl EGLEW_VAR_EXPORT $(EGL_CORE_SPEC) $(EGL_EXT_SPEC) >> $@ + cat $(SRC)/eglew_tail.h >> $@ + $(S.DEST)/glew.c: $(EXT)/.dummy @echo "--------------------------------------------------------------------" @echo "Creating glew.c" @echo "--------------------------------------------------------------------" cp -f $(SRC)/glew_license.h $@ cat $(SRC)/glew_head.c >> $@ - echo -e "\n#if !defined(_WIN32) || !defined(GLEW_MX)" >> $@ $(BIN)/make_def_fun.pl GL $(GL_CORE_SPEC) >> $@ $(BIN)/make_def_fun.pl GL $(GL_EXT_SPEC) >> $@ - echo -e "\n#endif /* !WIN32 || !GLEW_MX */" >> $@ - echo -e "\n#if !defined(GLEW_MX)" >> $@; echo -e "\nGLboolean __GLEW_VERSION_1_1 = GL_FALSE;" >> $@ $(BIN)/make_def_var.pl GL $(GL_CORE_SPEC) >> $@ $(BIN)/make_def_var.pl GL $(GL_EXT_SPEC) >> $@ - echo -e "\n#endif /* !GLEW_MX */\n" >> $@; + echo -e "\nstatic const char * _glewExtensionLookup[] = {" >> $@; + $(BIN)/make_index.pl $(GL_CORE_SPEC) $(GL_EXT_SPEC) >> $@ + echo -e " NULL\n};\n" >> $@; + $(BIN)/make_enable_index.pl $(GL_CORE_SPEC) $(GL_EXT_SPEC) >> $@ + $(BIN)/make_initd.pl GL $(GL_CORE_SPEC) >> $@ + $(BIN)/make_initd.pl GL $(GL_EXT_SPEC) >> $@ + echo -e "" >> $@; $(BIN)/make_init.pl GL $(GL_CORE_SPEC) >> $@ $(BIN)/make_init.pl GL $(GL_EXT_SPEC) >> $@ cat $(SRC)/glew_init_gl.c >> $@ $(BIN)/make_list.pl $(GL_CORE_SPEC) | grep -v '\"GL_VERSION' >> $@ $(BIN)/make_list.pl $(GL_EXT_SPEC) >> $@ + $(BIN)/make_list2.pl $(GL_EXT_SPEC) >> $@ echo -e "\n return GLEW_OK;\n}\n" >> $@ - echo -e "\n#if defined(_WIN32) && ! defined(GLEW_OSMESA)" >> $@ - echo -e "\n#if !defined(GLEW_MX)" >> $@ + echo -e "\n#if defined(GLEW_OSMESA)" >> $@ + echo -e "\n#elif defined(GLEW_EGL)" >> $@ + $(BIN)/make_def_fun.pl EGL $(EGL_CORE_SPEC) >> $@ + $(BIN)/make_def_fun.pl EGL $(EGL_EXT_SPEC) >> $@ + $(BIN)/make_def_var.pl EGL $(EGL_CORE_SPEC) >> $@ + $(BIN)/make_def_var.pl EGL $(EGL_EXT_SPEC) >> $@ + $(BIN)/make_init.pl EGL $(EGL_CORE_SPEC) >> $@ + $(BIN)/make_init.pl EGL $(EGL_EXT_SPEC) >> $@ + cat $(SRC)/glew_init_egl.c >> $@ + $(BIN)/make_list.pl $(EGL_CORE_SPEC) >> $@ + $(BIN)/make_list.pl $(EGL_EXT_SPEC) >> $@ + echo -e "\n return GLEW_OK;\n}" >> $@ + echo -e "\n#elif defined(_WIN32)" >> $@ $(BIN)/make_def_fun.pl WGL $(WGL_EXT_SPEC) >> $@ $(BIN)/make_def_var.pl WGL $(WGL_EXT_SPEC) >> $@ - echo -e "\n#endif /* !GLEW_MX */\n" >> $@; $(BIN)/make_init.pl WGL $(WGL_EXT_SPEC) >> $@ 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(GLEW_OSMESA) && !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX))" >> $@ + echo -e "\n#elif !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && (!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)" >> $@; echo -e "\nGLboolean __GLXEW_VERSION_1_0 = GL_FALSE;" >> $@ echo -e "GLboolean __GLXEW_VERSION_1_1 = GL_FALSE;" >> $@ $(BIN)/make_def_var.pl GLX $(GLX_CORE_SPEC) >> $@ $(BIN)/make_def_var.pl GLX $(GLX_EXT_SPEC) >> $@ - echo -e "\n#endif /* !GLEW_MX */\n" >> $@; $(BIN)/make_init.pl GLX $(GLX_CORE_SPEC) >> $@ $(BIN)/make_init.pl GLX $(GLX_EXT_SPEC) >> $@ cat $(SRC)/glew_init_glx.c >> $@ @@ -236,12 +261,14 @@ $(S.DEST)/glew.c: $(EXT)/.dummy $(BIN)/make_str.pl $(WGL_EXT_SPEC) >> $@ cat $(SRC)/glew_str_glx.c >> $@ $(BIN)/make_str.pl $(GLX_CORE_SPEC) $(GLX_EXT_SPEC) >> $@ + cat $(SRC)/glew_str_egl.c >> $@ + $(BIN)/make_str.pl $(EGL_CORE_SPEC) $(EGL_EXT_SPEC) >> $@ cat $(SRC)/glew_str_tail.c >> $@ perl -e "s/GLEW_VERSION_STRING/$(GLEW_VERSION)/g" -pi $@ perl -e "s/GLEW_VERSION_MAJOR_STRING/$(GLEW_MAJOR)/g" -pi $@ perl -e "s/GLEW_VERSION_MINOR_STRING/$(GLEW_MINOR)/g" -pi $@ perl -e "s/GLEW_VERSION_MICRO_STRING/$(GLEW_MICRO)/g" -pi $@ - perl -e "s/GLEW_ARB_vertex_shader = !_glewInit_GL_ARB_vertex_shader\(GLEW_CONTEXT_ARG_VAR_INIT\);/{ GLEW_ARB_vertex_shader = !_glewInit_GL_ARB_vertex_shader(GLEW_CONTEXT_ARG_VAR_INIT); _glewInit_GL_ARB_vertex_program(GLEW_CONTEXT_ARG_VAR_INIT); }/g" -pi $@ + perl -e "s/GLEW_ARB_vertex_shader = !_glewInit_GL_ARB_vertex_shader\(\);/{ GLEW_ARB_vertex_shader = !_glewInit_GL_ARB_vertex_shader(); _glewInit_GL_ARB_vertex_program(); }/g" -pi $@ perl -e "s/\(\(glColorSubTable = /((glBlendEquation = (PFNGLBLENDEQUATIONPROC)glewGetProcAddress((const GLubyte*)\"glBlendEquation\")) == NULL) || r;\n r = ((glColorSubTable = /g" -pi $@ rm -f $@.bak @@ -253,7 +280,10 @@ $(S.DEST)/glewinfo.c: $(EXT)/.dummy cat $(SRC)/glewinfo_head.c >> $@ $(BIN)/make_info.pl $(GL_CORE_SPEC) >> $@ $(BIN)/make_info.pl $(GL_EXT_SPEC) >> $@ - echo -e "#ifdef _WIN32\n" >> $@ + echo -e "#if defined(GLEW_EGL)\n" >> $@ + $(BIN)/make_info.pl $(EGL_CORE_SPEC) >> $@ + $(BIN)/make_info.pl $(EGL_EXT_SPEC) >> $@ + echo -e "#elif _WIN32\n" >> $@ $(BIN)/make_info.pl $(WGL_EXT_SPEC) >> $@ echo -e "#else /* _UNIX */\n" >> $@ $(BIN)/make_info.pl $(GLX_CORE_SPEC) >> $@ @@ -268,6 +298,9 @@ $(S.DEST)/glewinfo.c: $(EXT)/.dummy cat $(SRC)/glewinfo_glx.c >> $@ $(BIN)/make_info_list.pl $(GLX_CORE_SPEC) >> $@ $(BIN)/make_info_list.pl $(GLX_EXT_SPEC) >> $@ + cat $(SRC)/glewinfo_egl.c >> $@ + $(BIN)/make_info_list.pl $(EGL_CORE_SPEC) >> $@ + $(BIN)/make_info_list.pl $(EGL_EXT_SPEC) >> $@ cat $(SRC)/glewinfo_tail.c >> $@ perl -e 's/"glColorSubTable"/"glBlendEquation", glBlendEquation == NULL);\n glewInfoFunc("glColorSubTable"/g' -pi $@ rm -f $@.bak diff --git a/auto/bin/filter_gl_ext.sh b/auto/bin/filter_gl_ext.sh index 72fde80..042e1f2 100755 --- a/auto/bin/filter_gl_ext.sh +++ b/auto/bin/filter_gl_ext.sh @@ -18,11 +18,13 @@ set -e 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 + tail -n +5 $1/GL_ARB_vertex_program > patterns + grep -v -F -f patterns $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 + tail -n +5 $1/GLX_EXT_visual_info > patterns + grep -v -F -f patterns $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 @@ -58,7 +60,8 @@ EOT EOT # remove duplicates from GL_NV_present_video and GLX_NV_present_video - grep -v -F -f $1/GLX_NV_present_video $1/GL_NV_present_video > tmp + tail -n +5 $1/GLX_NV_present_video > patterns + grep -v -F -f patterns $1/GL_NV_present_video > tmp mv tmp $1/GL_NV_present_video # fix WGL_NV_present_video @@ -180,20 +183,23 @@ EOT # remove triplicates in GL_ARB_shader_objects, GL_ARB_fragment_shader, # and GL_ARB_vertex_shader - grep -v -F -f $1/GL_ARB_shader_objects $1/GL_ARB_fragment_shader > tmp + tail -n +5 $1/GL_ARB_shader_objects > patterns + grep -v -F -f patterns $1/GL_ARB_fragment_shader > tmp mv tmp $1/GL_ARB_fragment_shader - grep -v -F -f $1/GL_ARB_shader_objects $1/GL_ARB_vertex_shader > tmp + grep -v -F -f patterns $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 + tail -n +5 $1/GL_ARB_vertex_program > patterns + grep -v -F -f patterns $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 + tail -n +5 $1/GL_ARB_fragment_program > patterns + grep -v -F -f patterns $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 + grep -v -F -f patterns $1/GL_ARB_vertex_shader > tmp mv tmp $1/GL_ARB_vertex_shader # remove duplicates in GL_EXT_direct_state_access @@ -246,7 +252,7 @@ EOT EOT # Filter out GL_NV_gpu_program_fp64 enums and functions - head -n3 $1/GL_NV_gpu_program_fp64 > tmp + head -n4 $1/GL_NV_gpu_program_fp64 > tmp mv tmp $1/GL_NV_gpu_program_fp64 # Filter glGetUniformui64vNV from GL_NV_shader_buffer_load @@ -258,7 +264,7 @@ EOT 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 + head -n4 $1/GLX_ARB_create_context_profile > tmp grep "_PROFILE_" $1/GLX_ARB_create_context_profile >> tmp mv tmp $1/GLX_ARB_create_context_profile @@ -267,7 +273,7 @@ EOT 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 + head -n4 $1/WGL_ARB_create_context_profile > tmp grep "_PROFILE_" $1/WGL_ARB_create_context_profile >> tmp mv tmp $1/WGL_ARB_create_context_profile @@ -471,11 +477,11 @@ EOT for i in $1/GL_ANGLE_*; do perl -e 's#http://www.opengl.org/registry/specs/ANGLE/.*#https://code.google.com/p/angleproject/source/browse/\#git%2Fextensions#g' -pi $i; done # Filter out GL_NV_blend_equation_advanced_coherent enums and functions - head -n3 $1/GL_NV_blend_equation_advanced_coherent > tmp + head -n4 $1/GL_NV_blend_equation_advanced_coherent > tmp mv tmp $1/GL_NV_blend_equation_advanced_coherent # Filter out GL_AMD_gpu_shader_int64 enums and functions - head -n3 $1/GL_AMD_gpu_shader_int64 > tmp + head -n4 $1/GL_AMD_gpu_shader_int64 > tmp mv tmp $1/GL_AMD_gpu_shader_int64 # Filter out GL_NO_ERROR enum from GL_KHR_robustness @@ -506,5 +512,12 @@ EOT grep -v "RasterSamplesEXT" $1/GL_NV_framebuffer_mixed_samples > tmp mv tmp $1/GL_NV_framebuffer_mixed_samples +# Append GLVULKANPROCNV to GL_NV_draw_vulkan_image +# Probably ought to be explicitly mentioned in the spec language + + cat >> $1/GL_NV_draw_vulkan_image < +## 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. + +use strict; +use warnings; + +do 'bin/make.pl'; + +## +## Make Extension-enabled Index +## + +my @extlist = (); + +if (@ARGV) +{ + @extlist = @ARGV; + + print "/* Detected in the extension string or strings */\n"; + print "static GLboolean _glewExtensionString[" . scalar @extlist . "];\n"; + + print "/* Detected via extension string or experimental mode */\n"; + print "static GLboolean* _glewExtensionEnabled[] = {\n";; + + foreach my $ext (sort @extlist) + { + my ($extname, $exturl, $extstring, $reuse, $types, $tokens, $functions, $exacts) = + parse_ext($ext); + + my $extvar = $extname; + $extvar =~ s/GL(X*)_/GL$1EW_/; + + print "#ifdef $extname\n"; + print " &__$extvar,\n"; + print "#endif\n"; + } + + print " NULL\n};\n"; +} diff --git a/auto/bin/make_header.pl b/auto/bin/make_header.pl index 934ef77..5c7f94a 100755 --- a/auto/bin/make_header.pl +++ b/auto/bin/make_header.pl @@ -52,7 +52,7 @@ if (@ARGV) foreach my $ext (sort @extlist) { - my ($extname, $exturl, $extstring, $types, $tokens, $functions, $exacts) = parse_ext($ext); + my ($extname, $exturl, $extstring, $reuse, $types, $tokens, $functions, $exacts) = parse_ext($ext); make_separator($extname); print "#ifndef $extname\n#define $extname 1\n"; diff --git a/auto/bin/make_html.pl b/auto/bin/make_html.pl index ee58196..486e7fd 100755 --- a/auto/bin/make_html.pl +++ b/auto/bin/make_html.pl @@ -26,7 +26,7 @@ if (@ARGV) print "\n"; foreach my $ext (sort @extlist) { - my ($extname, $exturl, $extstring, $types, $tokens, $functions, $exacts) = parse_ext($ext); + my ($extname, $exturl, $extstring, $reuse, $types, $tokens, $functions, $exacts) = parse_ext($ext); $cur_group = $extname; $cur_group =~ s/^(?:W?)GL(?:X?)_([A-Z0-9]+?)_.*$/$1/; $extname =~ s/^(?:W?)GL(?:X?)_(.*)$/$1/; diff --git a/auto/bin/make_index.pl b/auto/bin/make_index.pl new file mode 100755 index 0000000..bfaf300 --- /dev/null +++ b/auto/bin/make_index.pl @@ -0,0 +1,38 @@ +#!/usr/bin/perl +## +## 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. + +use strict; +use warnings; + +do 'bin/make.pl'; + +## +## Make Index +## +## Output sorted array of extension strings for indexing into extension +## enable/disable flags. This provides a way to convert an extension string +## into an integer index. +## + +my @extlist = (); + +if (@ARGV) +{ + @extlist = @ARGV; + + foreach my $ext (sort @extlist) + { + my ($extname, $exturl, $extstring, $reuse, $types, $tokens, $functions, $exacts) = + parse_ext($ext); + + print "#ifdef $extname\n"; + print " \"$extname\",\n"; + print "#endif\n"; + } +} diff --git a/auto/bin/make_info.pl b/auto/bin/make_info.pl index 5d0c7f6..78295fc 100755 --- a/auto/bin/make_info.pl +++ b/auto/bin/make_info.pl @@ -32,7 +32,7 @@ if (@ARGV) foreach my $ext (sort @extlist) { - my ($extname, $exturl, $extstring, $types, $tokens, $functions, $exacts) = parse_ext($ext); + my ($extname, $exturl, $extstring, $reuse, $types, $tokens, $functions, $exacts) = parse_ext($ext); my $extvar = $extname; $extvar =~ s/GL(X*)_/GL$1EW_/; my $extpre = $extname; diff --git a/auto/bin/make_info_list.pl b/auto/bin/make_info_list.pl index a55106d..5bc65fa 100755 --- a/auto/bin/make_info_list.pl +++ b/auto/bin/make_info_list.pl @@ -38,7 +38,7 @@ if (@ARGV) foreach my $ext (sort @extlist) { - my ($extname, $exturl, $extstring, $types, $tokens, $functions, $exacts) = parse_ext($ext); + my ($extname, $exturl, $extstring, $reuse, $types, $tokens, $functions, $exacts) = parse_ext($ext); print "#ifdef $extname\n"; print " _glewInfo_$extname();\n"; diff --git a/auto/bin/make_init.pl b/auto/bin/make_init.pl index 5e6200a..343a1ad 100755 --- a/auto/bin/make_init.pl +++ b/auto/bin/make_init.pl @@ -21,6 +21,11 @@ sub make_pfn_def_init($%) return " r = ((" . $_[0] . " = (PFN" . (uc $_[0]) . "PROC)glewGetProcAddress((const GLubyte*)\"" . $_[0] . "\")) == NULL) || r;"; } +sub make_reuse_call($%) +{ + return " r = _glewInit_" . $_[0] . "() || r;"; +} + #------------------------------------------------------------------------------- my @extlist = (); @@ -34,18 +39,18 @@ if (@ARGV) foreach my $ext (sort @extlist) { - my ($extname, $exturl, $extstring, $types, $tokens, $functions, $exacts) = + my ($extname, $exturl, $extstring, $reuse, $types, $tokens, $functions, $exacts) = parse_ext($ext); #make_separator($extname); my $extvar = $extname; my $extvardef = $extname; $extvar =~ s/GL(X*)_/GL$1EW_/; - if (keys %$functions) + if (keys %$functions or keys @$reuse) { print "#ifdef $extname\n\n"; - print "static GLboolean _glewInit_$extname (" . $type . - "EW_CONTEXT_ARG_DEF_INIT)\n{\n GLboolean r = GL_FALSE;\n"; + print "static GLboolean _glewInit_$extname ()\n{\n GLboolean r = GL_FALSE;\n"; + output_reuse($reuse, \&make_reuse_call); output_decls($functions, \&make_pfn_def_init); print "\n return r;\n}\n\n"; print "#endif /* $extname */\n\n"; diff --git a/auto/bin/make_initd.pl b/auto/bin/make_initd.pl new file mode 100755 index 0000000..35c3b5d --- /dev/null +++ b/auto/bin/make_initd.pl @@ -0,0 +1,43 @@ +#!/usr/bin/perl +## +## 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. + +use strict; +use warnings; + +do 'bin/make.pl'; + +## Output declarations for the _glewInit_[extension] functions defined +## by make_init.pl script. These are necessary for for initializers to +## call each other, such as a core GL 3 context that depends on certain +## extensions. + +#------------------------------------------------------------------------------- + +my @extlist = (); +my %extensions = (); + +our $type = shift; + +if (@ARGV) +{ + @extlist = @ARGV; + + foreach my $ext (sort @extlist) + { + my ($extname, $exturl, $extstring, $reuse, $types, $tokens, $functions, $exacts) = + parse_ext($ext); + + #print "#ifdef $extname\n\n"; + if (keys %$functions) + { + print "static GLboolean _glewInit_$extname ();\n"; + } + #print "#endif /* $extname */\n\n"; + } +} diff --git a/auto/bin/make_list.pl b/auto/bin/make_list.pl index 75dc060..ef1d81e 100755 --- a/auto/bin/make_list.pl +++ b/auto/bin/make_list.pl @@ -32,35 +32,42 @@ if (@ARGV) foreach my $ext (sort @extlist) { - my ($extname, $exturl, $extstring, $types, $tokens, $functions, $exacts) = parse_ext($ext); + my ($extname, $exturl, $extstring, $reuse, $types, $tokens, $functions, $exacts) = parse_ext($ext); my $extvar = $extname; $extvar =~ s/GL(X*)_/GL$1EW_/; my $extpre = $extname; - $extpre =~ s/^(W?)GL(X?).*$/\l$1gl\l$2ew/; + $extpre =~ s/^(W?E?)GL(X?).*$/\l$1gl\l$2ew/; #my $pextvar = prefix_varname($extvar); - print "#ifdef $extname\n"; - - if (length($extstring)) + if (length($extstring) && $extstring !~ /^GL_/ || keys %$functions) { - print " " . $extvar . " = _glewSearchExtension(\"$extstring\", extStart, extEnd);\n"; + print "#ifdef $extname\n"; + } + + if (length($extstring) && $extstring !~ /^GL_/) + { + print " " . $extvar . " = _glewSearchExtension(\"$extstring\", extStart, extEnd);\n"; } if (keys %$functions) { if ($extname =~ /WGL_.*/) { - print " if (glewExperimental || " . $extvar . "|| crippled) " . $extvar . "= !_glewInit_$extname(GLEW_CONTEXT_ARG_VAR_INIT);\n"; + print " if (glewExperimental || " . $extvar . "|| crippled) " . $extvar . "= !_glewInit_$extname();\n"; } else { - print " if (glewExperimental || " . $extvar . ") " . $extvar . " = !_glewInit_$extname(GLEW_CONTEXT_ARG_VAR_INIT);\n"; + print " if (glewExperimental || " . $extvar . ") " . $extvar . " = !_glewInit_$extname();\n"; } } - print "#endif /* $extname */\n"; + + if (length($extstring) && $extstring !~ /^GL_/ || keys %$functions) + { + print "#endif /* $extname */\n"; + } } } diff --git a/auto/bin/make_list2.pl b/auto/bin/make_list2.pl new file mode 100755 index 0000000..572fdc9 --- /dev/null +++ b/auto/bin/make_list2.pl @@ -0,0 +1,44 @@ +#!/usr/bin/perl +## +## 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. + +use strict; +use warnings; + +do 'bin/make.pl'; + +#--------------------------------------------------------------------------------------- +# Extensions that depend on others can be enabled once we know +# if the one it depends on, is enabled. + +my @extlist = (); +my %extensions = (); + +if (@ARGV) +{ + @extlist = @ARGV; + + foreach my $ext (sort @extlist) + { + my ($extname, $exturl, $extstring, $reuse, $types, $tokens, $functions, $exacts) = parse_ext($ext); + + if ($extname ne $extstring && length($extstring)) + { + my $extvar = $extname; + $extvar =~ s/GL(X*)_/GL$1EW_/; + + my $parent = $extstring; + $parent =~ s/GL(X*)_/GL$1EW_/; + + print "#ifdef $extname\n"; + print " $extvar = $parent;\n"; + print "#endif /* $extname */\n"; + } + } + +} diff --git a/auto/bin/make_str.pl b/auto/bin/make_str.pl index ac4a366..6673a80 100755 --- a/auto/bin/make_str.pl +++ b/auto/bin/make_str.pl @@ -22,13 +22,13 @@ if (@ARGV) my $curexttype = ""; foreach my $ext (sort @extlist) { - my ($extname, $exturl, $extstring, $types, $tokens, $functions, $exacts) = parse_ext($ext); + my ($extname, $exturl, $extstring, $reuse, $types, $tokens, $functions, $exacts) = parse_ext($ext); my $exttype = $extname; - $exttype =~ s/(W*?)GL(X*?)_(.*?_)(.*)/$3/; + $exttype =~ s/(W?E?)GL(X?)_(.*?_)(.*)/$3/; my $extrem = $extname; - $extrem =~ s/(W*?)GL(X*?)_(.*?_)(.*)/$4/; + $extrem =~ s/(W?E?)GL(X?)_(.*?_)(.*)/$4/; my $extvar = $extname; - $extvar =~ s/(W*)GL(X*)_/$1GL$2EW_/; + $extvar =~ s/(W?E?)GL(X?)_/$1GL$2EW_/; if(!($exttype =~ $curexttype)) { if(length($curexttype) > 0) diff --git a/auto/bin/make_struct_fun.pl b/auto/bin/make_struct_fun.pl index c885960..3eedafe 100755 --- a/auto/bin/make_struct_fun.pl +++ b/auto/bin/make_struct_fun.pl @@ -30,7 +30,7 @@ if (@ARGV) foreach my $ext (sort @extlist) { - my ($extname, $exturl, $extstring, $types, $tokens, $functions, $exacts) = parse_ext($ext); + my ($extname, $exturl, $extstring, $reuse, $types, $tokens, $functions, $exacts) = parse_ext($ext); output_decls($functions, \&make_pfn_decl); } } diff --git a/auto/bin/make_struct_var.pl b/auto/bin/make_struct_var.pl index c7ba2f4..c88b559 100755 --- a/auto/bin/make_struct_var.pl +++ b/auto/bin/make_struct_var.pl @@ -23,7 +23,7 @@ if (@ARGV) foreach my $ext (sort @extlist) { - my ($extname, $exturl, $extstring, $types, $tokens, $functions, $exacts) = parse_ext($ext); + my ($extname, $exturl, $extstring, $reuse, $types, $tokens, $functions, $exacts) = parse_ext($ext); my $extvar = $extname; $extvar =~ s/GL(X*)_/GL$1EW_/; print $export . " GLboolean " . prefix_varname($extvar) . ";\n"; diff --git a/auto/bin/parse_spec.pl b/auto/bin/parse_spec.pl index 00fdde9..2f7b6eb 100755 --- a/auto/bin/parse_spec.pl +++ b/auto/bin/parse_spec.pl @@ -81,6 +81,8 @@ my %typemap = ( DEBUGPROC => "GLDEBUGPROC", + VULKANPROCNV => "GLVULKANPROCNV", + vdpauSurfaceNV => "GLvdpauSurfaceNV", # GLX 1.3 defines new types which might not be available at compile time @@ -147,7 +149,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-Fa-f]+)(|\s[^\?]*)$/, # define tokens types => compile_regex('\b(', join('|', keys %typemap), ')\b'), # var types voidtype => compile_regex('\b(', keys %voidtypemap, ')\b '), # void type ); @@ -333,6 +335,7 @@ foreach my $spec (sort @speclist) $specname =~ s/registry\/gl\/specs\///; print EXT $reg_http . $specname . "\n"; # Extension info URL print EXT $ext . "\n"; # Extension string + print EXT "\n"; # Resuses nothing by default my $prefix = $ext; $prefix =~ s/^(.+?)(_.+)$/$1/; diff --git a/auto/bin/parse_xml.py b/auto/bin/parse_xml.py new file mode 100755 index 0000000..1340deb --- /dev/null +++ b/auto/bin/parse_xml.py @@ -0,0 +1,131 @@ +#!/usr/bin/python + +import re +import sys +from xml.dom.minidom import parse, Node + +def findChildren(node, path): + result = [] + if len(path)==1: + for i in node.childNodes: + if i.nodeType==Node.ELEMENT_NODE: + if i.tagName==path[0]: + result.append(i) + else: + for i in node.childNodes: + if i.nodeType==Node.ELEMENT_NODE: + if i.tagName==path[0]: + result.extend(findChildren(i, path[1:])) + return result + +def findData(node, path): + return [ i.firstChild.data for i in findChildren(node, path) ] + +def findParams(node): + n = findData(node, ['name'])[0] + t = '' + for i in node.childNodes: + if i.nodeType==Node.TEXT_NODE: + t += i.data + if i.nodeType==Node.ELEMENT_NODE and i.tagName=='ptype': + t += i.firstChild.data + return ( t, n) + +def findEnums(dom): + ret = {} + for i in findChildren(dom, [ 'registry', 'enums', 'enum' ]): + n = i.getAttribute('name') + v = i.getAttribute('value') + ret[n] = v + return ret + +def findCommands(dom): + ret = {} + for i in findChildren(dom, [ 'registry', 'commands', 'command' ]): + r,n = findParams(findChildren(i, ['proto'])[0]) + p = [ findParams(j) for j in findChildren(i, ['param'])] + ret[n] = (r, p) + return ret + +def findFeatures(dom): + ret = {} + for i in findChildren(dom, [ 'registry', 'feature' ]): + n = i.getAttribute('name') + e = [] + c = [] + for j in findChildren(i, [ 'require', 'enum' ]): + e.append(j.getAttribute("name")) + for j in findChildren(i, [ 'require', 'command' ]): + c.append(j.getAttribute("name")) + ret[n] = (e,c) + return ret + +def findExtensions(dom): + ret = {} + for i in findChildren(dom, [ 'registry', 'extensions', 'extension' ]): + n = i.getAttribute('name') + e = [] + c = [] + for j in findChildren(i, [ 'require', 'enum' ]): + e.append(j.getAttribute("name")) + for j in findChildren(i, [ 'require', 'command' ]): + c.append(j.getAttribute("name")) + ret[n] = (e,c) + return ret + +def findApi(dom, name): + enums = findEnums(dom) + commands = findCommands(dom) + features = findFeatures(dom) + extensions = findExtensions(dom) + return (enums, commands, features, extensions) + +def writeExtension(f, name, extension, enums, commands): + f.write('%s\n'%name) + f.write('%s\n'%'https://www.khronos.org/registry/egl/specs/eglspec.1.5.pdf') + if name.find('_VERSION_')==-1: + f.write('%s\n'%name) + else: + f.write('\n') + f.write('\n') + enums = [ (j, enums[j]) for j in extension[0] ] + for e in sorted(enums, key=lambda i: i[1]): + f.write('\t%s %s\n'%(e[0], e[1])) + commands = [ (j, commands[j]) for j in extension[1] ] + for c in sorted(commands): + params = ', '.join( [ '%s %s'%(j[0], j[1]) for j in c[1][1] ] ) + if len(params)==0: + params = ' void ' + f.write('\t%s %s (%s)\n'%(c[1][0], c[0], params)) + +if __name__ == '__main__': + + from optparse import OptionParser + import os + + parser = OptionParser('usage: %prog [options] [XML specs...]') + parser.add_option("--core", dest="core", help="location for core outputs", default='') + parser.add_option("--extensions", dest="extensions", help="location for extensions outputs", default='') + + (options, args) = parser.parse_args() + + for i in args: + + dom = parse(i) + api = findApi(dom, 'egl') + + print('Found {} enums, {} commands, {} features and {} extensions.'.format( + len(api[0]), len(api[1]), len(api[2]), len(api[3]))) + + if len(options.core): + for i in api[2].keys(): + f = open('%s/%s'%(options.core, i), 'w') + writeExtension(f, i, api[2][i], api[0], api[1]) + f.close() + + if len(options.extensions): + for i in api[3].keys(): + f = open('%s/%s'%(options.extensions, i), 'w') + writeExtension(f, i, api[3][i], api[0], api[1]) + f.close() + diff --git a/auto/core/gl/GLX_AMD_gpu_association b/auto/core/gl/GLX_AMD_gpu_association index 002164e..72264a9 100644 --- a/auto/core/gl/GLX_AMD_gpu_association +++ b/auto/core/gl/GLX_AMD_gpu_association @@ -1,6 +1,7 @@ GLX_AMD_gpu_association http://www.opengl.org/registry/specs/AMD/glx_gpu_association.txt GLX_AMD_gpu_association + GLX_GPU_VENDOR_AMD 0x1F00 GLX_GPU_RENDERER_STRING_AMD 0x1F01 GLX_GPU_OPENGL_VERSION_STRING_AMD 0x1F02 diff --git a/auto/core/gl/GLX_ARB_get_proc_address b/auto/core/gl/GLX_ARB_get_proc_address index 5c066d7..e2cb2c5 100644 --- a/auto/core/gl/GLX_ARB_get_proc_address +++ b/auto/core/gl/GLX_ARB_get_proc_address @@ -1,4 +1,5 @@ GLX_ARB_get_proc_address http://oss.sgi.com/projects/ogl-sample/registry/ARB/get_proc_address.txt GLX_ARB_get_proc_address + extern void ( * glXGetProcAddressARB (const GLubyte *procName)) (void); diff --git a/auto/core/gl/GLX_ATI_pixel_format_float b/auto/core/gl/GLX_ATI_pixel_format_float index 854ca71..5336da4 100644 --- a/auto/core/gl/GLX_ATI_pixel_format_float +++ b/auto/core/gl/GLX_ATI_pixel_format_float @@ -1,4 +1,5 @@ GLX_ATI_pixel_format_float GLX_ATI_pixel_format_float + GLX_RGBA_FLOAT_ATI_BIT 0x00000100 diff --git a/auto/core/gl/GLX_ATI_render_texture b/auto/core/gl/GLX_ATI_render_texture index 254eb9f..6b35814 100644 --- a/auto/core/gl/GLX_ATI_render_texture +++ b/auto/core/gl/GLX_ATI_render_texture @@ -1,6 +1,7 @@ GLX_ATI_render_texture GLX_ATI_render_texture + GLX_BIND_TO_TEXTURE_RGB_ATI 0x9800 GLX_BIND_TO_TEXTURE_RGBA_ATI 0x9801 GLX_TEXTURE_FORMAT_ATI 0x9802 diff --git a/auto/core/gl/GLX_EXT_create_context_es2_profile b/auto/core/gl/GLX_EXT_create_context_es2_profile index 3093baa..aea21df 100644 --- a/auto/core/gl/GLX_EXT_create_context_es2_profile +++ b/auto/core/gl/GLX_EXT_create_context_es2_profile @@ -1,4 +1,5 @@ GLX_EXT_create_context_es2_profile http://www.opengl.org/registry/specs/EXT/glx_create_context_es2_profile.txt GLX_EXT_create_context_es2_profile + GLX_CONTEXT_ES2_PROFILE_BIT_EXT 0x00000004 diff --git a/auto/core/gl/GLX_EXT_create_context_es_profile b/auto/core/gl/GLX_EXT_create_context_es_profile index 845f65e..ea13e6e 100644 --- a/auto/core/gl/GLX_EXT_create_context_es_profile +++ b/auto/core/gl/GLX_EXT_create_context_es_profile @@ -1,4 +1,5 @@ GLX_EXT_create_context_es_profile http://www.opengl.org/registry/specs/EXT/glx_create_context_es_profile.txt GLX_EXT_create_context_es_profile + GLX_CONTEXT_ES_PROFILE_BIT_EXT 0x00000004 diff --git a/auto/core/gl/GLX_EXT_fbconfig_packed_float b/auto/core/gl/GLX_EXT_fbconfig_packed_float index 7c7822d..ffd47e3 100644 --- a/auto/core/gl/GLX_EXT_fbconfig_packed_float +++ b/auto/core/gl/GLX_EXT_fbconfig_packed_float @@ -1,5 +1,6 @@ GLX_EXT_fbconfig_packed_float http://developer.download.nvidia.com/opengl/specs/GL_EXT_packed_float.txt GLX_EXT_fbconfig_packed_float + GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT 0x20B1 GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT 0x00000008 diff --git a/auto/core/gl/GLX_EXT_framebuffer_sRGB b/auto/core/gl/GLX_EXT_framebuffer_sRGB index f51c484..83743bb 100644 --- a/auto/core/gl/GLX_EXT_framebuffer_sRGB +++ b/auto/core/gl/GLX_EXT_framebuffer_sRGB @@ -1,4 +1,5 @@ GLX_EXT_framebuffer_sRGB http://developer.download.nvidia.com/opengl/specs/GL_EXT_framebuffer_sRGB.txt GLX_EXT_framebuffer_sRGB + GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x20B2 diff --git a/auto/core/gl/GLX_MESA_swap_control b/auto/core/gl/GLX_MESA_swap_control index 4416519..eb6e933 100644 --- a/auto/core/gl/GLX_MESA_swap_control +++ b/auto/core/gl/GLX_MESA_swap_control @@ -1,5 +1,6 @@ GLX_MESA_swap_control http://cgit.freedesktop.org/mesa/mesa/plain/docs/MESA_swap_control.spec GLX_MESA_swap_control + int glXGetSwapIntervalMESA (void) int glXSwapIntervalMESA (unsigned int interval) diff --git a/auto/core/gl/GLX_NV_float_buffer b/auto/core/gl/GLX_NV_float_buffer index cc9185e..19b71e2 100644 --- a/auto/core/gl/GLX_NV_float_buffer +++ b/auto/core/gl/GLX_NV_float_buffer @@ -1,4 +1,5 @@ GLX_NV_float_buffer http://cvs1.nvidia.com/inc/GL/glxtokens.h GLX_NV_float_buffer + GLX_FLOAT_COMPONENTS_NV 0x20B0 diff --git a/auto/core/gl/GLX_NV_vertex_array_range b/auto/core/gl/GLX_NV_vertex_array_range index 11afe17..9250ec2 100644 --- a/auto/core/gl/GLX_NV_vertex_array_range +++ b/auto/core/gl/GLX_NV_vertex_array_range @@ -1,5 +1,6 @@ GLX_NV_vertex_array_range http://oss.sgi.com/projects/ogl-sample/registry/NV/vertex_array_range.txt GLX_NV_vertex_array_range + void * glXAllocateMemoryNV (GLsizei size, GLfloat readFrequency, GLfloat writeFrequency, GLfloat priority) void glXFreeMemoryNV (void *pointer) diff --git a/auto/core/gl/GLX_SGIS_shared_multisample b/auto/core/gl/GLX_SGIS_shared_multisample index 274e90f..a2f4e12 100644 --- a/auto/core/gl/GLX_SGIS_shared_multisample +++ b/auto/core/gl/GLX_SGIS_shared_multisample @@ -1,5 +1,6 @@ GLX_SGIS_shared_multisample GLX_SGIS_shared_multisample + GLX_MULTISAMPLE_SUB_RECT_WIDTH_SGIS 0x8026 GLX_MULTISAMPLE_SUB_RECT_HEIGHT_SGIS 0x8027 diff --git a/auto/core/gl/GLX_SGIX_hyperpipe b/auto/core/gl/GLX_SGIX_hyperpipe index 79ec302..80fd7d6 100644 --- a/auto/core/gl/GLX_SGIX_hyperpipe +++ b/auto/core/gl/GLX_SGIX_hyperpipe @@ -1,6 +1,7 @@ GLX_SGIX_hyperpipe http://oss.sgi.com/projects/ogl-sample/registry/SGIX/hyperpipe_group.txt GLX_SGIX_hyperpipe + GLX_HYPERPIPE_ID_SGIX 0x8030 GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX 80 GLX_HYPERPIPE_DISPLAY_PIPE_SGIX 0x00000001 diff --git a/auto/core/gl/GLX_SGIX_swap_barrier b/auto/core/gl/GLX_SGIX_swap_barrier index 57dd60d..95a65c1 100644 --- a/auto/core/gl/GLX_SGIX_swap_barrier +++ b/auto/core/gl/GLX_SGIX_swap_barrier @@ -1,5 +1,6 @@ GLX_SGIX_swap_barrier http://oss.sgi.com/projects/ogl-sample/registry/SGIX/swap_barrier.txt GLX_SGIX_swap_barrier + void glXBindSwapBarrierSGIX (Display *dpy, GLXDrawable drawable, int barrier) Bool glXQueryMaxSwapBarriersSGIX (Display *dpy, int screen, int *max) diff --git a/auto/core/gl/GLX_SGIX_swap_group b/auto/core/gl/GLX_SGIX_swap_group index 3530604..1eb1cff 100644 --- a/auto/core/gl/GLX_SGIX_swap_group +++ b/auto/core/gl/GLX_SGIX_swap_group @@ -1,4 +1,5 @@ GLX_SGIX_swap_group http://oss.sgi.com/projects/ogl-sample/registry/SGIX/swap_group.txt GLX_SGIX_swap_group + void glXJoinSwapGroupSGIX (Display *dpy, GLXDrawable drawable, GLXDrawable member) diff --git a/auto/core/gl/GLX_SGI_video_sync b/auto/core/gl/GLX_SGI_video_sync index dcdb968..74f1356 100644 --- a/auto/core/gl/GLX_SGI_video_sync +++ b/auto/core/gl/GLX_SGI_video_sync @@ -1,5 +1,6 @@ GLX_SGI_video_sync http://www.opengl.org/registry/specs/SGI/video_sync.txt GLX_SGI_video_sync + int glXGetVideoSyncSGI (unsigned int* count) int glXWaitVideoSyncSGI (int divisor, int remainder, unsigned int* count) diff --git a/auto/core/gl/GLX_SUN_video_resize b/auto/core/gl/GLX_SUN_video_resize index 0a0cefe..3a5a176 100644 --- a/auto/core/gl/GLX_SUN_video_resize +++ b/auto/core/gl/GLX_SUN_video_resize @@ -1,6 +1,7 @@ GLX_SUN_video_resize http://wwws.sun.com/software/graphics/opengl/extensions/glx_sun_video_resize.txt GLX_SUN_video_resize + GL_VIDEO_RESIZE_COMPENSATION_SUN 0x85CD GLX_VIDEO_RESIZE_SUN 0x8171 int glXVideoResizeSUN (Display* display, GLXDrawable window, float factor) diff --git a/auto/core/gl/GLX_VERSION_1_2 b/auto/core/gl/GLX_VERSION_1_2 index 39d7a09..8a12e84 100644 --- a/auto/core/gl/GLX_VERSION_1_2 +++ b/auto/core/gl/GLX_VERSION_1_2 @@ -1,4 +1,5 @@ GLX_VERSION_1_2 http://www.opengl.org/documentation/specs/glx/glx1.2.ps GLX_VERSION_1_2 + Display* glXGetCurrentDisplay (void) diff --git a/auto/core/gl/GLX_VERSION_1_3 b/auto/core/gl/GLX_VERSION_1_3 index 46eedb9..1cf24be 100644 --- a/auto/core/gl/GLX_VERSION_1_3 +++ b/auto/core/gl/GLX_VERSION_1_3 @@ -1,6 +1,7 @@ GLX_VERSION_1_3 http://www.opengl.org/documentation/specs/glx/glx1.3.pdf GLX_VERSION_1_3 + GLX_WINDOW_BIT 0x00000001 GLX_PIXMAP_BIT 0x00000002 GLX_PBUFFER_BIT 0x00000004 diff --git a/auto/core/gl/GLX_VERSION_1_4 b/auto/core/gl/GLX_VERSION_1_4 index 1382621..9b9de3e 100644 --- a/auto/core/gl/GLX_VERSION_1_4 +++ b/auto/core/gl/GLX_VERSION_1_4 @@ -1,6 +1,7 @@ GLX_VERSION_1_4 http://www.opengl.org/documentation/specs/glx/glx1.4.pdf GLX_VERSION_1_4 + GLX_SAMPLE_BUFFERS 100000 GLX_SAMPLES 100001 extern void ( * glXGetProcAddress (const GLubyte *procName)) (void); diff --git a/auto/core/gl/GL_APPLE_float_pixels b/auto/core/gl/GL_APPLE_float_pixels index 2bf7458..3eacd42 100644 --- a/auto/core/gl/GL_APPLE_float_pixels +++ b/auto/core/gl/GL_APPLE_float_pixels @@ -1,6 +1,7 @@ GL_APPLE_float_pixels http://www.opengl.org/registry/specs/APPLE/float_pixels.txt GL_APPLE_float_pixels + GL_HALF_APPLE 0x140B GL_COLOR_FLOAT_APPLE 0x8A0F GL_RGBA_FLOAT32_APPLE 0x8814 diff --git a/auto/core/gl/GL_APPLE_pixel_buffer b/auto/core/gl/GL_APPLE_pixel_buffer index 7449f29..1a8ad97 100644 --- a/auto/core/gl/GL_APPLE_pixel_buffer +++ b/auto/core/gl/GL_APPLE_pixel_buffer @@ -1,4 +1,5 @@ GL_APPLE_pixel_buffer GL_APPLE_pixel_buffer + GL_MIN_PBUFFER_VIEWPORT_DIMS_APPLE 0x8A10 diff --git a/auto/core/gl/GL_APPLE_texture_range b/auto/core/gl/GL_APPLE_texture_range index 9e3a678..e2bf85c 100644 --- a/auto/core/gl/GL_APPLE_texture_range +++ b/auto/core/gl/GL_APPLE_texture_range @@ -1,6 +1,7 @@ GL_APPLE_texture_range http://www.opengl.org/registry/specs/APPLE/texture_range.txt GL_APPLE_texture_range + GL_TEXTURE_STORAGE_HINT_APPLE 0x85BC GL_STORAGE_PRIVATE_APPLE 0x85BD GL_STORAGE_CACHED_APPLE 0x85BE diff --git a/auto/core/gl/GL_ARB_draw_instanced b/auto/core/gl/GL_ARB_draw_instanced index 4140bea..a730952 100644 --- a/auto/core/gl/GL_ARB_draw_instanced +++ b/auto/core/gl/GL_ARB_draw_instanced @@ -1,3 +1,4 @@ GL_ARB_draw_instanced http://www.opengl.org/registry/specs/ARB/draw_instanced.txt GL_ARB_draw_instanced + diff --git a/auto/core/gl/GL_ARB_imaging b/auto/core/gl/GL_ARB_imaging index c23a566..727adf0 100644 --- a/auto/core/gl/GL_ARB_imaging +++ b/auto/core/gl/GL_ARB_imaging @@ -1,6 +1,7 @@ GL_ARB_imaging GL_ARB_imaging + GL_CONSTANT_COLOR 0x8001 GL_ONE_MINUS_CONSTANT_COLOR 0x8002 GL_CONSTANT_ALPHA 0x8003 diff --git a/auto/core/gl/GL_ARB_instanced_arrays b/auto/core/gl/GL_ARB_instanced_arrays index b1c8873..1487d39 100644 --- a/auto/core/gl/GL_ARB_instanced_arrays +++ b/auto/core/gl/GL_ARB_instanced_arrays @@ -1,6 +1,7 @@ GL_ARB_instanced_arrays http://www.opengl.org/registry/specs/ARB/instanced_arrays.txt GL_ARB_instanced_arrays + GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB 0x88FE void glVertexAttribDivisorARB (GLuint index, GLuint divisor) void glDrawArraysInstancedARB (GLenum mode, GLint first, GLsizei count, GLsizei primcount) diff --git a/auto/core/gl/GL_ARB_internalformat_query2 b/auto/core/gl/GL_ARB_internalformat_query2 index 1210966..7af5091 100644 --- a/auto/core/gl/GL_ARB_internalformat_query2 +++ b/auto/core/gl/GL_ARB_internalformat_query2 @@ -1,6 +1,7 @@ GL_ARB_internalformat_query2 http://www.opengl.org/registry/specs/ARB/internalformat_query2.txt GL_ARB_internalformat_query2 + GL_INTERNALFORMAT_SUPPORTED 0x826F GL_INTERNALFORMAT_PREFERRED 0x8270 GL_INTERNALFORMAT_RED_SIZE 0x8271 diff --git a/auto/core/gl/GL_ARB_matrix_palette b/auto/core/gl/GL_ARB_matrix_palette index 2e22824..98b0d0b 100644 --- a/auto/core/gl/GL_ARB_matrix_palette +++ b/auto/core/gl/GL_ARB_matrix_palette @@ -1,6 +1,7 @@ GL_ARB_matrix_palette http://oss.sgi.com/projects/ogl-sample/registry/ARB/matrix_palette.txt GL_ARB_matrix_palette + GL_MATRIX_PALETTE_ARB 0x8840 GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841 GL_MAX_PALETTE_MATRICES_ARB 0x8842 diff --git a/auto/core/gl/GL_ARB_multitexture b/auto/core/gl/GL_ARB_multitexture index ee80791..46a9546 100644 --- a/auto/core/gl/GL_ARB_multitexture +++ b/auto/core/gl/GL_ARB_multitexture @@ -1,6 +1,7 @@ GL_ARB_multitexture http://oss.sgi.com/projects/ogl-sample/registry/ARB/multitexture.txt GL_ARB_multitexture + GL_TEXTURE0_ARB 0x84C0 GL_TEXTURE1_ARB 0x84C1 GL_TEXTURE2_ARB 0x84C2 diff --git a/auto/core/gl/GL_ARB_robustness b/auto/core/gl/GL_ARB_robustness index 3e4f976..82d48d8 100644 --- a/auto/core/gl/GL_ARB_robustness +++ b/auto/core/gl/GL_ARB_robustness @@ -1,6 +1,7 @@ GL_ARB_robustness http://www.opengl.org/registry/specs/ARB/robustness.txt GL_ARB_robustness + GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB 0x00000004 GL_LOSE_CONTEXT_ON_RESET_ARB 0x8252 GL_GUILTY_CONTEXT_RESET_ARB 0x8253 diff --git a/auto/core/gl/GL_ARB_separate_shader_objects b/auto/core/gl/GL_ARB_separate_shader_objects index 57ec75a..3d3d869 100644 --- a/auto/core/gl/GL_ARB_separate_shader_objects +++ b/auto/core/gl/GL_ARB_separate_shader_objects @@ -1,6 +1,7 @@ GL_ARB_separate_shader_objects http://www.opengl.org/registry/specs/ARB/separate_shader_objects.txt GL_ARB_separate_shader_objects + GL_VERTEX_SHADER_BIT 0x00000001 GL_FRAGMENT_SHADER_BIT 0x00000002 GL_GEOMETRY_SHADER_BIT 0x00000004 diff --git a/auto/core/gl/GL_ARB_vertex_attrib_64bit b/auto/core/gl/GL_ARB_vertex_attrib_64bit index a30aa06..68117c5 100644 --- a/auto/core/gl/GL_ARB_vertex_attrib_64bit +++ b/auto/core/gl/GL_ARB_vertex_attrib_64bit @@ -1,6 +1,7 @@ GL_ARB_vertex_attrib_64bit http://www.opengl.org/registry/specs/ARB/vertex_attrib_64bit.txt GL_ARB_vertex_attrib_64bit + 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/GL_ARB_vertex_blend b/auto/core/gl/GL_ARB_vertex_blend index 7beb75a..f4b3f58 100644 --- a/auto/core/gl/GL_ARB_vertex_blend +++ b/auto/core/gl/GL_ARB_vertex_blend @@ -1,6 +1,7 @@ GL_ARB_vertex_blend http://oss.sgi.com/projects/ogl-sample/registry/ARB/vertex_blend.txt GL_ARB_vertex_blend + GL_MAX_VERTEX_UNITS_ARB 0x86A4 GL_ACTIVE_VERTEX_UNITS_ARB 0x86A5 GL_WEIGHT_SUM_UNITY_ARB 0x86A6 diff --git a/auto/core/gl/GL_ATIX_point_sprites b/auto/core/gl/GL_ATIX_point_sprites index 0f4f574..d2434e7 100644 --- a/auto/core/gl/GL_ATIX_point_sprites +++ b/auto/core/gl/GL_ATIX_point_sprites @@ -1,6 +1,7 @@ GL_ATIX_point_sprites http://www.ati.com/developer/atiopengl.pdf GL_ATIX_point_sprites + GL_TEXTURE_POINT_MODE_ATIX 0x60B0 GL_TEXTURE_POINT_ONE_COORD_ATIX 0x60B1 GL_TEXTURE_POINT_SPRITE_ATIX 0x60B2 diff --git a/auto/core/gl/GL_ATIX_texture_env_combine3 b/auto/core/gl/GL_ATIX_texture_env_combine3 index 537426b..77f425d 100644 --- a/auto/core/gl/GL_ATIX_texture_env_combine3 +++ b/auto/core/gl/GL_ATIX_texture_env_combine3 @@ -1,6 +1,7 @@ GL_ATIX_texture_env_combine3 http://www.ati.com/developer/atiopengl.pdf GL_ATIX_texture_env_combine3 + GL_MODULATE_ADD_ATIX 0x8744 GL_MODULATE_SIGNED_ADD_ATIX 0x8745 GL_MODULATE_SUBTRACT_ATIX 0x8746 diff --git a/auto/core/gl/GL_ATIX_texture_env_route b/auto/core/gl/GL_ATIX_texture_env_route index 939ae09..d972fd1 100644 --- a/auto/core/gl/GL_ATIX_texture_env_route +++ b/auto/core/gl/GL_ATIX_texture_env_route @@ -1,6 +1,7 @@ GL_ATIX_texture_env_route http://www.ati.com/developer/sdk/RadeonSDK/Html/Info/ATIX_texture_env_route.txt GL_ATIX_texture_env_route + GL_SECONDARY_COLOR_ATIX 0x8747 GL_TEXTURE_OUTPUT_RGB_ATIX 0x8748 GL_TEXTURE_OUTPUT_ALPHA_ATIX 0x8749 diff --git a/auto/core/gl/GL_ATIX_vertex_shader_output_point_size b/auto/core/gl/GL_ATIX_vertex_shader_output_point_size index 277a313..85a6d58 100644 --- a/auto/core/gl/GL_ATIX_vertex_shader_output_point_size +++ b/auto/core/gl/GL_ATIX_vertex_shader_output_point_size @@ -1,4 +1,5 @@ GL_ATIX_vertex_shader_output_point_size http://www.ati.com/developer/atiopengl.pdf GL_ATIX_vertex_shader_output_point_size + GL_OUTPUT_POINT_SIZE_ATIX 0x610E diff --git a/auto/core/gl/GL_ATI_envmap_bumpmap b/auto/core/gl/GL_ATI_envmap_bumpmap index fbd9925..09a4112 100644 --- a/auto/core/gl/GL_ATI_envmap_bumpmap +++ b/auto/core/gl/GL_ATI_envmap_bumpmap @@ -1,6 +1,7 @@ GL_ATI_envmap_bumpmap http://oss.sgi.com/projects/ogl-sample/registry/ATI/envmap_bumpmap.txt GL_ATI_envmap_bumpmap + GL_BUMP_ROT_MATRIX_ATI 0x8775 GL_BUMP_ROT_MATRIX_SIZE_ATI 0x8776 GL_BUMP_NUM_TEX_UNITS_ATI 0x8777 diff --git a/auto/core/gl/GL_ATI_map_object_buffer b/auto/core/gl/GL_ATI_map_object_buffer index f401aad..6a683d0 100644 --- a/auto/core/gl/GL_ATI_map_object_buffer +++ b/auto/core/gl/GL_ATI_map_object_buffer @@ -1,5 +1,6 @@ GL_ATI_map_object_buffer http://www.opengl.org/registry/specs/ATI/map_object_buffer.txt GL_ATI_map_object_buffer + void * glMapObjectBufferATI (GLuint buffer) void glUnmapObjectBufferATI (GLuint buffer) diff --git a/auto/core/gl/GL_ATI_pn_triangles b/auto/core/gl/GL_ATI_pn_triangles index a61e27a..ca3923d 100644 --- a/auto/core/gl/GL_ATI_pn_triangles +++ b/auto/core/gl/GL_ATI_pn_triangles @@ -1,6 +1,7 @@ GL_ATI_pn_triangles http://www.opengl.org/registry/specs/ATI/pn_triangles.txt GL_ATI_pn_triangles + GL_PN_TRIANGLES_ATI 0x87F0 GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1 GL_PN_TRIANGLES_POINT_MODE_ATI 0x87F2 diff --git a/auto/core/gl/GL_ATI_separate_stencil b/auto/core/gl/GL_ATI_separate_stencil index be55bb4..b7237e5 100644 --- a/auto/core/gl/GL_ATI_separate_stencil +++ b/auto/core/gl/GL_ATI_separate_stencil @@ -1,6 +1,7 @@ GL_ATI_separate_stencil http://www.opengl.org/registry/specs/ATI/separate_stencil.txt GL_ATI_separate_stencil + GL_STENCIL_BACK_FUNC_ATI 0x8800 GL_STENCIL_BACK_FAIL_ATI 0x8801 GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802 diff --git a/auto/core/gl/GL_ATI_shader_texture_lod b/auto/core/gl/GL_ATI_shader_texture_lod index 5fbc624..e6e6c04 100644 --- a/auto/core/gl/GL_ATI_shader_texture_lod +++ b/auto/core/gl/GL_ATI_shader_texture_lod @@ -1,3 +1,4 @@ GL_ATI_shader_texture_lod GL_ATI_shader_texture_lod + diff --git a/auto/core/gl/GL_ATI_texture_compression_3dc b/auto/core/gl/GL_ATI_texture_compression_3dc index 2548b30..fc3ee44 100644 --- a/auto/core/gl/GL_ATI_texture_compression_3dc +++ b/auto/core/gl/GL_ATI_texture_compression_3dc @@ -1,4 +1,5 @@ GL_ATI_texture_compression_3dc GL_ATI_texture_compression_3dc + GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI 0x8837 diff --git a/auto/core/gl/GL_ATI_vertex_streams b/auto/core/gl/GL_ATI_vertex_streams index 060f844..f6e64fd 100644 --- a/auto/core/gl/GL_ATI_vertex_streams +++ b/auto/core/gl/GL_ATI_vertex_streams @@ -1,6 +1,7 @@ GL_ATI_vertex_streams http://www.opengl.org/registry/specs/ATI/vertex_streams.txt GL_ATI_vertex_streams + GL_MAX_VERTEX_STREAMS_ATI 0x876B GL_VERTEX_SOURCE_ATI 0x876C GL_VERTEX_STREAM0_ATI 0x876D diff --git a/auto/core/gl/GL_EXT_Cg_shader b/auto/core/gl/GL_EXT_Cg_shader index 34d3152..b2df900 100644 --- a/auto/core/gl/GL_EXT_Cg_shader +++ b/auto/core/gl/GL_EXT_Cg_shader @@ -1,5 +1,6 @@ GL_EXT_Cg_shader http://download.nvidia.com/developer/GLSL/GLSL%20Release%20Notes%20for%20Release%2060.pdf GL_EXT_Cg_shader + GL_CG_VERTEX_SHADER_EXT 0x890E GL_CG_FRAGMENT_SHADER_EXT 0x890F diff --git a/auto/core/gl/GL_EXT_bindable_uniform b/auto/core/gl/GL_EXT_bindable_uniform index 809123b..00ec270 100644 --- a/auto/core/gl/GL_EXT_bindable_uniform +++ b/auto/core/gl/GL_EXT_bindable_uniform @@ -1,6 +1,7 @@ GL_EXT_bindable_uniform http://developer.download.nvidia.com/opengl/specs/GL_EXT_bindable_uniform.txt GL_EXT_bindable_uniform + GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT 0x8DE2 GL_MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT 0x8DE3 GL_MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT 0x8DE4 diff --git a/auto/core/gl/GL_EXT_debug_marker b/auto/core/gl/GL_EXT_debug_marker index 9d0628c..ce9ffe4 100644 --- a/auto/core/gl/GL_EXT_debug_marker +++ b/auto/core/gl/GL_EXT_debug_marker @@ -1,6 +1,7 @@ GL_EXT_debug_marker http://www.khronos.org/registry/gles/extensions/EXT/EXT_debug_marker.txt GL_EXT_debug_marker + void glInsertEventMarkerEXT (GLsizei length, const GLchar* marker) void glPushGroupMarkerEXT (GLsizei length, const GLchar* marker) void glPopGroupMarkerEXT (void) diff --git a/auto/core/gl/GL_EXT_depth_bounds_test b/auto/core/gl/GL_EXT_depth_bounds_test index 62528b7..da2a453 100644 --- a/auto/core/gl/GL_EXT_depth_bounds_test +++ b/auto/core/gl/GL_EXT_depth_bounds_test @@ -1,6 +1,7 @@ GL_EXT_depth_bounds_test http://www.nvidia.com/dev_content/nvopenglspecs/GL_EXT_depth_bounds_test.txt GL_EXT_depth_bounds_test + GL_DEPTH_BOUNDS_TEST_EXT 0x8890 GL_DEPTH_BOUNDS_EXT 0x8891 void glDepthBoundsEXT (GLclampd zmin, GLclampd zmax) diff --git a/auto/core/gl/GL_EXT_draw_instanced b/auto/core/gl/GL_EXT_draw_instanced index e8e5425..ca7f17e 100644 --- a/auto/core/gl/GL_EXT_draw_instanced +++ b/auto/core/gl/GL_EXT_draw_instanced @@ -1,5 +1,6 @@ GL_EXT_draw_instanced http://developer.download.nvidia.com/opengl/specs/GL_EXT_draw_instanced.txt GL_EXT_draw_instanced + void glDrawArraysInstancedEXT (GLenum mode, GLint start, GLsizei count, GLsizei primcount) void glDrawElementsInstancedEXT (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount) diff --git a/auto/core/gl/GL_EXT_draw_range_elements b/auto/core/gl/GL_EXT_draw_range_elements index d495fe7..f5346de 100644 --- a/auto/core/gl/GL_EXT_draw_range_elements +++ b/auto/core/gl/GL_EXT_draw_range_elements @@ -1,6 +1,7 @@ GL_EXT_draw_range_elements http://oss.sgi.com/projects/ogl-sample/registry/EXT/draw_range_elements.txt GL_EXT_draw_range_elements + GL_MAX_ELEMENTS_VERTICES_EXT 0x80E8 GL_MAX_ELEMENTS_INDICES_EXT 0x80E9 void glDrawRangeElementsEXT (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices) diff --git a/auto/core/gl/GL_EXT_fog_coord b/auto/core/gl/GL_EXT_fog_coord index 5210d54..148866a 100644 --- a/auto/core/gl/GL_EXT_fog_coord +++ b/auto/core/gl/GL_EXT_fog_coord @@ -1,6 +1,7 @@ GL_EXT_fog_coord http://oss.sgi.com/projects/ogl-sample/registry/EXT/fog_coord.txt GL_EXT_fog_coord + GL_FOG_COORDINATE_SOURCE_EXT 0x8450 GL_FOG_COORDINATE_EXT 0x8451 GL_FRAGMENT_DEPTH_EXT 0x8452 diff --git a/auto/core/gl/GL_EXT_framebuffer_sRGB b/auto/core/gl/GL_EXT_framebuffer_sRGB index 4ca897b..2f4c6ff 100644 --- a/auto/core/gl/GL_EXT_framebuffer_sRGB +++ b/auto/core/gl/GL_EXT_framebuffer_sRGB @@ -1,5 +1,6 @@ GL_EXT_framebuffer_sRGB http://developer.download.nvidia.com/opengl/specs/GL_EXT_framebuffer_sRGB.txt GL_EXT_framebuffer_sRGB + GL_FRAMEBUFFER_SRGB_EXT 0x8DB9 GL_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x8DBA diff --git a/auto/core/gl/GL_EXT_geometry_shader4 b/auto/core/gl/GL_EXT_geometry_shader4 index f6f6785..a463c4c 100644 --- a/auto/core/gl/GL_EXT_geometry_shader4 +++ b/auto/core/gl/GL_EXT_geometry_shader4 @@ -1,6 +1,7 @@ GL_EXT_geometry_shader4 http://developer.download.nvidia.com/opengl/specs/GL_EXT_geometry_shader4.txt GL_EXT_geometry_shader4 + GL_GEOMETRY_SHADER_EXT 0x8DD9 GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT 0x8DDD GL_MAX_VERTEX_VARYING_COMPONENTS_EXT 0x8DDE diff --git a/auto/core/gl/GL_EXT_gpu_program_parameters b/auto/core/gl/GL_EXT_gpu_program_parameters index 9048c98..298bc36 100644 --- a/auto/core/gl/GL_EXT_gpu_program_parameters +++ b/auto/core/gl/GL_EXT_gpu_program_parameters @@ -1,5 +1,6 @@ GL_EXT_gpu_program_parameters http://developer.download.nvidia.com/opengl/specs/GL_EXT_gpu_program_parameters.txt GL_EXT_gpu_program_parameters + void glProgramEnvParameters4fvEXT (GLenum target, GLuint index, GLsizei count, const GLfloat* params) void glProgramLocalParameters4fvEXT (GLenum target, GLuint index, GLsizei count, const GLfloat* params) diff --git a/auto/core/gl/GL_EXT_gpu_shader4 b/auto/core/gl/GL_EXT_gpu_shader4 index e6b254d..7e95dbc 100644 --- a/auto/core/gl/GL_EXT_gpu_shader4 +++ b/auto/core/gl/GL_EXT_gpu_shader4 @@ -1,6 +1,7 @@ GL_EXT_gpu_shader4 http://developer.download.nvidia.com/opengl/specs/GL_EXT_gpu_shader4.txt GL_EXT_gpu_shader4 + GL_SAMPLER_1D_ARRAY_EXT 0x8DC0 GL_SAMPLER_2D_ARRAY_EXT 0x8DC1 GL_SAMPLER_BUFFER_EXT 0x8DC2 diff --git a/auto/core/gl/GL_EXT_packed_float b/auto/core/gl/GL_EXT_packed_float index bcb2255..15ac680 100644 --- a/auto/core/gl/GL_EXT_packed_float +++ b/auto/core/gl/GL_EXT_packed_float @@ -1,6 +1,7 @@ GL_EXT_packed_float http://developer.download.nvidia.com/opengl/specs/GL_EXT_packed_float.txt GL_EXT_packed_float + GL_R11F_G11F_B10F_EXT 0x8C3A GL_UNSIGNED_INT_10F_11F_11F_REV_EXT 0x8C3B GL_RGBA_SIGNED_COMPONENTS_EXT 0x8C3C diff --git a/auto/core/gl/GL_EXT_pixel_buffer_object b/auto/core/gl/GL_EXT_pixel_buffer_object index a7f8f2c..f685e4c 100644 --- a/auto/core/gl/GL_EXT_pixel_buffer_object +++ b/auto/core/gl/GL_EXT_pixel_buffer_object @@ -1,6 +1,7 @@ GL_EXT_pixel_buffer_object http://www.nvidia.com/dev_content/nvopenglspecs/GL_EXT_pixel_buffer_object.txt GL_EXT_pixel_buffer_object + GL_PIXEL_PACK_BUFFER_EXT 0x88EB GL_PIXEL_UNPACK_BUFFER_EXT 0x88EC GL_PIXEL_PACK_BUFFER_BINDING_EXT 0x88ED diff --git a/auto/core/gl/GL_EXT_secondary_color b/auto/core/gl/GL_EXT_secondary_color index 34a2a78..505761d 100644 --- a/auto/core/gl/GL_EXT_secondary_color +++ b/auto/core/gl/GL_EXT_secondary_color @@ -1,6 +1,7 @@ GL_EXT_secondary_color http://oss.sgi.com/projects/ogl-sample/registry/EXT/secondary_color.txt GL_EXT_secondary_color + GL_COLOR_SUM_EXT 0x8458 GL_CURRENT_SECONDARY_COLOR_EXT 0x8459 GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A diff --git a/auto/core/gl/GL_EXT_texture_array b/auto/core/gl/GL_EXT_texture_array index 11877f0..c5c2c9f 100644 --- a/auto/core/gl/GL_EXT_texture_array +++ b/auto/core/gl/GL_EXT_texture_array @@ -1,6 +1,7 @@ GL_EXT_texture_array http://developer.download.nvidia.com/opengl/specs/GL_EXT_texture_array.txt GL_EXT_texture_array + GL_TEXTURE_1D_ARRAY_EXT 0x8C18 GL_PROXY_TEXTURE_1D_ARRAY_EXT 0x8C19 GL_TEXTURE_2D_ARRAY_EXT 0x8C1A diff --git a/auto/core/gl/GL_EXT_texture_buffer_object b/auto/core/gl/GL_EXT_texture_buffer_object index c00e1f3..81b5835 100644 --- a/auto/core/gl/GL_EXT_texture_buffer_object +++ b/auto/core/gl/GL_EXT_texture_buffer_object @@ -1,6 +1,7 @@ GL_EXT_texture_buffer_object http://developer.download.nvidia.com/opengl/specs/GL_EXT_texture_buffer_object.txt GL_EXT_texture_buffer_object + GL_TEXTURE_BUFFER_EXT 0x8C2A GL_MAX_TEXTURE_BUFFER_SIZE_EXT 0x8C2B GL_TEXTURE_BINDING_BUFFER_EXT 0x8C2C diff --git a/auto/core/gl/GL_EXT_texture_compression_latc b/auto/core/gl/GL_EXT_texture_compression_latc index ddf8d26..e8fcacc 100644 --- a/auto/core/gl/GL_EXT_texture_compression_latc +++ b/auto/core/gl/GL_EXT_texture_compression_latc @@ -1,6 +1,7 @@ GL_EXT_texture_compression_latc http://developer.download.nvidia.com/opengl/specs/GL_EXT_texture_compression_latc.txt GL_EXT_texture_compression_latc + GL_COMPRESSED_LUMINANCE_LATC1_EXT 0x8C70 GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT 0x8C71 GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT 0x8C72 diff --git a/auto/core/gl/GL_EXT_texture_compression_rgtc b/auto/core/gl/GL_EXT_texture_compression_rgtc index 7c5c57f..054b7f0 100644 --- a/auto/core/gl/GL_EXT_texture_compression_rgtc +++ b/auto/core/gl/GL_EXT_texture_compression_rgtc @@ -1,6 +1,7 @@ GL_EXT_texture_compression_rgtc http://developer.download.nvidia.com/opengl/specs/GL_EXT_texture_compression_rgtc.txt GL_EXT_texture_compression_rgtc + GL_COMPRESSED_RED_RGTC1_EXT 0x8DBB GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD diff --git a/auto/core/gl/GL_EXT_texture_cube_map b/auto/core/gl/GL_EXT_texture_cube_map index 5909f48..73a2c73 100644 --- a/auto/core/gl/GL_EXT_texture_cube_map +++ b/auto/core/gl/GL_EXT_texture_cube_map @@ -1,6 +1,7 @@ GL_EXT_texture_cube_map http://www.nvidia.com/dev_content/nvopenglspecs/GL_EXT_texture_cube_map.txt GL_EXT_texture_cube_map + GL_NORMAL_MAP_EXT 0x8511 GL_REFLECTION_MAP_EXT 0x8512 GL_TEXTURE_CUBE_MAP_EXT 0x8513 diff --git a/auto/core/gl/GL_EXT_texture_edge_clamp b/auto/core/gl/GL_EXT_texture_edge_clamp index 4df0997..c0b3e2a 100644 --- a/auto/core/gl/GL_EXT_texture_edge_clamp +++ b/auto/core/gl/GL_EXT_texture_edge_clamp @@ -1,4 +1,5 @@ GL_EXT_texture_edge_clamp http://www.opengl.org/developers/documentation/Version1.2/1.2specs/texture_edge_clamp.txt GL_EXT_texture_edge_clamp + GL_CLAMP_TO_EDGE_EXT 0x812F diff --git a/auto/core/gl/GL_EXT_texture_integer b/auto/core/gl/GL_EXT_texture_integer index 1c57e40..43219cf 100644 --- a/auto/core/gl/GL_EXT_texture_integer +++ b/auto/core/gl/GL_EXT_texture_integer @@ -1,6 +1,7 @@ GL_EXT_texture_integer http://developer.download.nvidia.com/opengl/specs/GL_EXT_texture_integer.txt GL_EXT_texture_integer + GL_RGBA32UI_EXT 0x8D70 GL_RGB32UI_EXT 0x8D71 GL_ALPHA32UI_EXT 0x8D72 diff --git a/auto/core/gl/GL_EXT_texture_rectangle b/auto/core/gl/GL_EXT_texture_rectangle index 4028a9e..1394311 100644 --- a/auto/core/gl/GL_EXT_texture_rectangle +++ b/auto/core/gl/GL_EXT_texture_rectangle @@ -1,6 +1,7 @@ GL_EXT_texture_rectangle http://developer.apple.com/opengl/extensions/ext_texture_rectangle.html GL_EXT_texture_rectangle + GL_TEXTURE_RECTANGLE_EXT 0x84F5 GL_TEXTURE_BINDING_RECTANGLE_EXT 0x84F6 GL_PROXY_TEXTURE_RECTANGLE_EXT 0x84F7 diff --git a/auto/core/gl/GL_EXT_texture_shared_exponent b/auto/core/gl/GL_EXT_texture_shared_exponent index 4ff7efc..4c7d461 100644 --- a/auto/core/gl/GL_EXT_texture_shared_exponent +++ b/auto/core/gl/GL_EXT_texture_shared_exponent @@ -1,6 +1,7 @@ GL_EXT_texture_shared_exponent http://developer.download.nvidia.com/opengl/specs/GL_EXT_texture_shared_exponent.txt GL_EXT_texture_shared_exponent + GL_RGB9_E5_EXT 0x8C3D GL_UNSIGNED_INT_5_9_9_9_REV_EXT 0x8C3E GL_TEXTURE_SHARED_SIZE_EXT 0x8C3F diff --git a/auto/core/gl/GL_EXT_timer_query b/auto/core/gl/GL_EXT_timer_query index 390e6fc..530ba35 100644 --- a/auto/core/gl/GL_EXT_timer_query +++ b/auto/core/gl/GL_EXT_timer_query @@ -1,6 +1,7 @@ GL_EXT_timer_query http://www.nvidia.com/dev_content/nvopenglspecs/GL_EXT_timer_query.txt GL_EXT_timer_query + GL_TIME_ELAPSED_EXT 0x88BF void glGetQueryObjecti64vEXT (GLuint id, GLenum pname, GLint64EXT *params) void glGetQueryObjectui64vEXT (GLuint id, GLenum pname, GLuint64EXT *params) diff --git a/auto/core/gl/GL_EXT_vertex_shader b/auto/core/gl/GL_EXT_vertex_shader index 651fbc2..8d3314f 100644 --- a/auto/core/gl/GL_EXT_vertex_shader +++ b/auto/core/gl/GL_EXT_vertex_shader @@ -1,6 +1,7 @@ GL_EXT_vertex_shader http://oss.sgi.com/projects/ogl-sample/registry/EXT/vertex_shader.txt GL_EXT_vertex_shader + GL_VERTEX_SHADER_EXT 0x8780 GL_VERTEX_SHADER_BINDING_EXT 0x8781 GL_OP_INDEX_EXT 0x8782 diff --git a/auto/core/gl/GL_KTX_buffer_region b/auto/core/gl/GL_KTX_buffer_region index adc6c6f..ef281b1 100644 --- a/auto/core/gl/GL_KTX_buffer_region +++ b/auto/core/gl/GL_KTX_buffer_region @@ -1,6 +1,7 @@ GL_KTX_buffer_region GL_KTX_buffer_region + GL_KTX_FRONT_REGION 0x0 GL_KTX_BACK_REGION 0x1 GL_KTX_Z_REGION 0x2 diff --git a/auto/core/gl/GL_NVX_gpu_memory_info b/auto/core/gl/GL_NVX_gpu_memory_info index 6dd7bdd..a8d97b9 100644 --- a/auto/core/gl/GL_NVX_gpu_memory_info +++ b/auto/core/gl/GL_NVX_gpu_memory_info @@ -1,6 +1,7 @@ GL_NVX_gpu_memory_info http://developer.download.nvidia.com/opengl/specs/GL_NVX_gpu_memory_info.txt GL_NVX_gpu_memory_info + GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX 0x9047 GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX 0x9048 GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX 0x9049 diff --git a/auto/core/gl/GL_NV_depth_buffer_float b/auto/core/gl/GL_NV_depth_buffer_float index 493b245..421d266 100644 --- a/auto/core/gl/GL_NV_depth_buffer_float +++ b/auto/core/gl/GL_NV_depth_buffer_float @@ -1,6 +1,7 @@ GL_NV_depth_buffer_float http://developer.download.nvidia.com/opengl/specs/GL_NV_depth_buffer_float.txt GL_NV_depth_buffer_float + GL_DEPTH_COMPONENT32F_NV 0x8DAB GL_DEPTH32F_STENCIL8_NV 0x8DAC GL_FLOAT_32_UNSIGNED_INT_24_8_REV_NV 0x8DAD diff --git a/auto/core/gl/GL_NV_depth_range_unclamped b/auto/core/gl/GL_NV_depth_range_unclamped index 62b4e59..b63a0ee 100644 --- a/auto/core/gl/GL_NV_depth_range_unclamped +++ b/auto/core/gl/GL_NV_depth_range_unclamped @@ -1,6 +1,7 @@ GL_NV_depth_range_unclamped GL_NV_depth_range_unclamped + GL_SAMPLE_COUNT_BITS_NV 0x8864 GL_CURRENT_SAMPLE_COUNT_QUERY_NV 0x8865 GL_QUERY_RESULT_NV 0x8866 diff --git a/auto/core/gl/GL_NV_fragment_program2 b/auto/core/gl/GL_NV_fragment_program2 index 7fb59ee..79d4b63 100644 --- a/auto/core/gl/GL_NV_fragment_program2 +++ b/auto/core/gl/GL_NV_fragment_program2 @@ -1,6 +1,7 @@ GL_NV_fragment_program2 http://www.nvidia.com/dev_content/nvopenglspecs/GL_NV_fragment_program2.txt GL_NV_fragment_program2 + GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4 GL_MAX_PROGRAM_CALL_DEPTH_NV 0x88F5 GL_MAX_PROGRAM_IF_DEPTH_NV 0x88F6 diff --git a/auto/core/gl/GL_NV_fragment_program4 b/auto/core/gl/GL_NV_fragment_program4 index 0ae2598..edd4383 100644 --- a/auto/core/gl/GL_NV_fragment_program4 +++ b/auto/core/gl/GL_NV_fragment_program4 @@ -1,3 +1,4 @@ GL_NV_fragment_program4 http://developer.download.nvidia.com/opengl/specs/GL_NV_fragment_program4.txt GL_NV_gpu_program4 + diff --git a/auto/core/gl/GL_NV_fragment_program_option b/auto/core/gl/GL_NV_fragment_program_option index 7af9731..01b8ed6 100644 --- a/auto/core/gl/GL_NV_fragment_program_option +++ b/auto/core/gl/GL_NV_fragment_program_option @@ -1,3 +1,4 @@ GL_NV_fragment_program_option http://www.nvidia.com/dev_content/nvopenglspecs/GL_NV_fragment_program_option.txt GL_NV_fragment_program_option + diff --git a/auto/core/gl/GL_NV_framebuffer_multisample_coverage b/auto/core/gl/GL_NV_framebuffer_multisample_coverage index d1d0660..526d0f0 100644 --- a/auto/core/gl/GL_NV_framebuffer_multisample_coverage +++ b/auto/core/gl/GL_NV_framebuffer_multisample_coverage @@ -1,6 +1,7 @@ GL_NV_framebuffer_multisample_coverage http://developer.download.nvidia.com/opengl/specs/GL_NV_framebuffer_multisample_coverage.txt GL_NV_framebuffer_multisample_coverage + GL_RENDERBUFFER_COVERAGE_SAMPLES_NV 0x8CAB GL_RENDERBUFFER_COLOR_SAMPLES_NV 0x8E10 GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV 0x8E11 diff --git a/auto/core/gl/GL_NV_geometry_program4 b/auto/core/gl/GL_NV_geometry_program4 index 3f82b19..a6cb164 100644 --- a/auto/core/gl/GL_NV_geometry_program4 +++ b/auto/core/gl/GL_NV_geometry_program4 @@ -1,6 +1,7 @@ GL_NV_geometry_program4 http://developer.download.nvidia.com/opengl/specs/GL_NV_geometry_program4.txt GL_NV_gpu_program4 + GL_GEOMETRY_PROGRAM_NV 0x8C26 GL_MAX_PROGRAM_OUTPUT_VERTICES_NV 0x8C27 GL_MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV 0x8C28 diff --git a/auto/core/gl/GL_NV_geometry_shader4 b/auto/core/gl/GL_NV_geometry_shader4 index 2040c0d..1b00429 100644 --- a/auto/core/gl/GL_NV_geometry_shader4 +++ b/auto/core/gl/GL_NV_geometry_shader4 @@ -1,3 +1,4 @@ GL_NV_geometry_shader4 http://developer.download.nvidia.com/opengl/specs/GL_NV_geometry_shader4.txt GL_NV_geometry_shader4 + diff --git a/auto/core/gl/GL_NV_gpu_program4 b/auto/core/gl/GL_NV_gpu_program4 index 030f68e..19f7169 100644 --- a/auto/core/gl/GL_NV_gpu_program4 +++ b/auto/core/gl/GL_NV_gpu_program4 @@ -1,6 +1,7 @@ GL_NV_gpu_program4 http://developer.download.nvidia.com/opengl/specs/GL_NV_gpu_program4.txt GL_NV_gpu_program4 + GL_MIN_PROGRAM_TEXEL_OFFSET_NV 0x8904 GL_MAX_PROGRAM_TEXEL_OFFSET_NV 0x8905 GL_PROGRAM_ATTRIB_COMPONENTS_NV 0x8906 diff --git a/auto/core/gl/GL_NV_gpu_program5 b/auto/core/gl/GL_NV_gpu_program5 index 18bb28f..68079f3 100644 --- a/auto/core/gl/GL_NV_gpu_program5 +++ b/auto/core/gl/GL_NV_gpu_program5 @@ -1,6 +1,7 @@ GL_NV_gpu_program5 http://www.opengl.org/registry/specs/NV/gpu_program5.txt GL_NV_gpu_program5 + GL_MAX_GEOMETRY_PROGRAM_INVOCATIONS_NV 0x8E5A GL_MIN_FRAGMENT_INTERPOLATION_OFFSET_NV 0x8E5B GL_MAX_FRAGMENT_INTERPOLATION_OFFSET_NV 0x8E5C diff --git a/auto/core/gl/GL_NV_parameter_buffer_object b/auto/core/gl/GL_NV_parameter_buffer_object index d2525a1..91494e3 100644 --- a/auto/core/gl/GL_NV_parameter_buffer_object +++ b/auto/core/gl/GL_NV_parameter_buffer_object @@ -1,6 +1,7 @@ GL_NV_parameter_buffer_object http://developer.download.nvidia.com/opengl/specs/GL_NV_parameter_buffer_object.txt GL_NV_parameter_buffer_object + GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV 0x8DA2 GL_GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV 0x8DA3 GL_FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV 0x8DA4 diff --git a/auto/core/gl/GL_NV_present_video b/auto/core/gl/GL_NV_present_video index 893c74c..1a5b8ce 100644 --- a/auto/core/gl/GL_NV_present_video +++ b/auto/core/gl/GL_NV_present_video @@ -1,6 +1,7 @@ GL_NV_present_video http://www.opengl.org/registry/specs/NV/present_video.txt GL_NV_present_video + GL_FRAME_NV 0x8E26 GL_FIELDS_NV 0x8E27 GL_CURRENT_TIME_NV 0x8E28 diff --git a/auto/core/gl/GL_NV_tessellation_program5 b/auto/core/gl/GL_NV_tessellation_program5 index b663c97..75fd3c7 100644 --- a/auto/core/gl/GL_NV_tessellation_program5 +++ b/auto/core/gl/GL_NV_tessellation_program5 @@ -1,6 +1,7 @@ GL_NV_tessellation_program5 http://www.opengl.org/registry/specs/NV/tessellation_program5.txt GL_NV_gpu_program5 + GL_MAX_PROGRAM_PATCH_ATTRIBS_NV 0x86D8 GL_TESS_CONTROL_PROGRAM_NV 0x891E GL_TESS_EVALUATION_PROGRAM_NV 0x891F diff --git a/auto/core/gl/GL_NV_transform_feedback b/auto/core/gl/GL_NV_transform_feedback index fce4757..5f1816e 100644 --- a/auto/core/gl/GL_NV_transform_feedback +++ b/auto/core/gl/GL_NV_transform_feedback @@ -1,6 +1,7 @@ GL_NV_transform_feedback http://developer.download.nvidia.com/opengl/specs/GL_NV_transform_feedback.txt GL_NV_transform_feedback + GL_BACK_PRIMARY_COLOR_NV 0x8C77 GL_BACK_SECONDARY_COLOR_NV 0x8C78 GL_TEXTURE_COORD_NV 0x8C79 diff --git a/auto/core/gl/GL_NV_vdpau_interop b/auto/core/gl/GL_NV_vdpau_interop index 12251ad..f52949c 100644 --- a/auto/core/gl/GL_NV_vdpau_interop +++ b/auto/core/gl/GL_NV_vdpau_interop @@ -1,6 +1,7 @@ GL_NV_vdpau_interop http://www.opengl.org/registry/specs/NV/vdpau_interop.txt GL_NV_vdpau_interop + GL_SURFACE_STATE_NV 0x86EB GL_SURFACE_REGISTERED_NV 0x86FD GL_SURFACE_MAPPED_NV 0x8700 diff --git a/auto/core/gl/GL_NV_vertex_program2_option b/auto/core/gl/GL_NV_vertex_program2_option index 1fecc4c..3e3e0b7 100644 --- a/auto/core/gl/GL_NV_vertex_program2_option +++ b/auto/core/gl/GL_NV_vertex_program2_option @@ -1,5 +1,6 @@ GL_NV_vertex_program2_option http://www.nvidia.com/dev_content/nvopenglspecs/GL_NV_vertex_program2_option.txt GL_NV_vertex_program2_option + GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4 GL_MAX_PROGRAM_CALL_DEPTH_NV 0x88F5 diff --git a/auto/core/gl/GL_NV_vertex_program3 b/auto/core/gl/GL_NV_vertex_program3 index 6510e06..fbd3899 100644 --- a/auto/core/gl/GL_NV_vertex_program3 +++ b/auto/core/gl/GL_NV_vertex_program3 @@ -1,4 +1,5 @@ GL_NV_vertex_program3 http://www.nvidia.com/dev_content/nvopenglspecs/GL_NV_vertex_program3.txt GL_NV_vertex_program3 + MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C diff --git a/auto/core/gl/GL_NV_vertex_program4 b/auto/core/gl/GL_NV_vertex_program4 index c51d08a..b1ff7f8 100644 --- a/auto/core/gl/GL_NV_vertex_program4 +++ b/auto/core/gl/GL_NV_vertex_program4 @@ -1,4 +1,5 @@ GL_NV_vertex_program4 http://developer.download.nvidia.com/opengl/specs/GL_NV_vertex_program4.txt GL_NV_gpu_program4 + GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV 0x88FD diff --git a/auto/core/gl/GL_SGIX_shadow b/auto/core/gl/GL_SGIX_shadow index 2b34cc8..3580721 100644 --- a/auto/core/gl/GL_SGIX_shadow +++ b/auto/core/gl/GL_SGIX_shadow @@ -1,6 +1,7 @@ GL_SGIX_shadow http://oss.sgi.com/projects/ogl-sample/registry/SGIX/shadow.txt GL_SGIX_shadow + GL_TEXTURE_COMPARE_SGIX 0x819A GL_TEXTURE_COMPARE_OPERATOR_SGIX 0x819B GL_TEXTURE_LEQUAL_R_SGIX 0x819C diff --git a/auto/core/gl/GL_SUN_read_video_pixels b/auto/core/gl/GL_SUN_read_video_pixels index 1de7cc8..871e6f9 100644 --- a/auto/core/gl/GL_SUN_read_video_pixels +++ b/auto/core/gl/GL_SUN_read_video_pixels @@ -1,4 +1,5 @@ GL_SUN_read_video_pixels http://wwws.sun.com/software/graphics/opengl/extensions/gl_sun_read_video_pixels.txt GL_SUN_read_video_pixels + void glReadVideoPixelsSUN (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void* pixels) diff --git a/auto/core/gl/GL_VERSION_1_2 b/auto/core/gl/GL_VERSION_1_2 index f868670..fe610b6 100644 --- a/auto/core/gl/GL_VERSION_1_2 +++ b/auto/core/gl/GL_VERSION_1_2 @@ -1,6 +1,7 @@ GL_VERSION_1_2 http://www.opengl.org/documentation/specs/version1.2/opengl1.2.1.pdf + GL_UNSIGNED_BYTE_3_3_2 0x8032 GL_UNSIGNED_SHORT_4_4_4_4 0x8033 GL_UNSIGNED_SHORT_5_5_5_1 0x8034 diff --git a/auto/core/gl/GL_VERSION_1_2_1 b/auto/core/gl/GL_VERSION_1_2_1 index a6ecf24..42634cb 100644 --- a/auto/core/gl/GL_VERSION_1_2_1 +++ b/auto/core/gl/GL_VERSION_1_2_1 @@ -1,3 +1,4 @@ GL_VERSION_1_2_1 http://www.opengl.org/documentation/specs/version1.2/opengl1.2.1.pdf + diff --git a/auto/core/gl/GL_VERSION_1_3 b/auto/core/gl/GL_VERSION_1_3 index 0c531d4..d6342fa 100644 --- a/auto/core/gl/GL_VERSION_1_3 +++ b/auto/core/gl/GL_VERSION_1_3 @@ -1,6 +1,7 @@ GL_VERSION_1_3 http://www.opengl.org/documentation/specs/version1.3/glspec13.pdf + GL_TEXTURE0 0x84C0 GL_TEXTURE1 0x84C1 GL_TEXTURE2 0x84C2 diff --git a/auto/core/gl/GL_VERSION_1_4 b/auto/core/gl/GL_VERSION_1_4 index 2c9ba46..8d0724a 100644 --- a/auto/core/gl/GL_VERSION_1_4 +++ b/auto/core/gl/GL_VERSION_1_4 @@ -1,6 +1,7 @@ GL_VERSION_1_4 http://www.opengl.org/documentation/specs/version1.4/glspec14.pdf + GL_GENERATE_MIPMAP 0x8191 GL_GENERATE_MIPMAP_HINT 0x8192 GL_DEPTH_COMPONENT16 0x81A5 diff --git a/auto/core/gl/GL_VERSION_1_5 b/auto/core/gl/GL_VERSION_1_5 index ad53e9f..439ecb6 100644 --- a/auto/core/gl/GL_VERSION_1_5 +++ b/auto/core/gl/GL_VERSION_1_5 @@ -1,6 +1,7 @@ GL_VERSION_1_5 http://www.opengl.org/documentation/specs/version1.5/glspec15.pdf + GL_BUFFER_SIZE 0x8764 GL_BUFFER_USAGE 0x8765 GL_QUERY_COUNTER_BITS 0x8864 diff --git a/auto/core/gl/GL_VERSION_2_0 b/auto/core/gl/GL_VERSION_2_0 index f6479d0..5bf6988 100644 --- a/auto/core/gl/GL_VERSION_2_0 +++ b/auto/core/gl/GL_VERSION_2_0 @@ -1,6 +1,7 @@ GL_VERSION_2_0 http://www.opengl.org/documentation/specs/version2.0/glspec20.pdf + GL_BLEND_EQUATION_RGB GL_BLEND_EQUATION GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622 GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623 diff --git a/auto/core/gl/GL_VERSION_2_1 b/auto/core/gl/GL_VERSION_2_1 index 51aa95b..88ecce8 100644 --- a/auto/core/gl/GL_VERSION_2_1 +++ b/auto/core/gl/GL_VERSION_2_1 @@ -1,6 +1,7 @@ GL_VERSION_2_1 http://www.opengl.org/documentation/specs/version2.1/glspec21.pdf + GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F GL_PIXEL_PACK_BUFFER 0x88EB GL_PIXEL_UNPACK_BUFFER 0x88EC diff --git a/auto/core/gl/GL_VERSION_3_0 b/auto/core/gl/GL_VERSION_3_0 index c87cdab..4be5db0 100644 --- a/auto/core/gl/GL_VERSION_3_0 +++ b/auto/core/gl/GL_VERSION_3_0 @@ -1,6 +1,7 @@ GL_VERSION_3_0 https://www.opengl.org/registry/doc/glspec30.20080923.pdf +GL_ARB_framebuffer_object GL_ARB_map_buffer_range GL_ARB_uniform_buffer_object GL_ARB_vertex_array_object GL_COMPARE_REF_TO_TEXTURE GL_COMPARE_R_TO_TEXTURE_ARB GL_CLIP_DISTANCE0 GL_CLIP_PLANE0 GL_CLIP_DISTANCE1 GL_CLIP_PLANE1 diff --git a/auto/core/gl/GL_VERSION_3_1 b/auto/core/gl/GL_VERSION_3_1 index a829a77..c546704 100644 --- a/auto/core/gl/GL_VERSION_3_1 +++ b/auto/core/gl/GL_VERSION_3_1 @@ -1,6 +1,7 @@ GL_VERSION_3_1 https://www.opengl.org/registry/doc/glspec31.20090528.pdf +GL_ARB_copy_buffer GL_SAMPLER_2D_RECT 0x8B63 GL_SAMPLER_2D_RECT_SHADOW 0x8B64 GL_SAMPLER_BUFFER 0x8DC2 diff --git a/auto/core/gl/GL_VERSION_3_2 b/auto/core/gl/GL_VERSION_3_2 index 85cea08..a987541 100644 --- a/auto/core/gl/GL_VERSION_3_2 +++ b/auto/core/gl/GL_VERSION_3_2 @@ -1,6 +1,7 @@ GL_VERSION_3_2 https://www.opengl.org/registry/doc/glspec32.compatibility.20091207.pdf +GL_ARB_draw_elements_base_vertex GL_ARB_provoking_vertex GL_ARB_sync GL_ARB_texture_multisample GL_CONTEXT_CORE_PROFILE_BIT 0x00000001 GL_CONTEXT_COMPATIBILITY_PROFILE_BIT 0x00000002 GL_LINES_ADJACENCY 0x000A diff --git a/auto/core/gl/GL_VERSION_3_3 b/auto/core/gl/GL_VERSION_3_3 index bbd6914..a80dbcc 100644 --- a/auto/core/gl/GL_VERSION_3_3 +++ b/auto/core/gl/GL_VERSION_3_3 @@ -1,6 +1,7 @@ GL_VERSION_3_3 https://www.opengl.org/registry/doc/glspec33.compatibility.20100311.pdf + GL_RGB10_A2UI 0x906F GL_VERTEX_ATTRIB_ARRAY_DIVISOR 0x88FE void glVertexAttribDivisor (GLuint index, GLuint divisor) diff --git a/auto/core/gl/GL_VERSION_4_0 b/auto/core/gl/GL_VERSION_4_0 index a3a0dc2..3715b40 100644 --- a/auto/core/gl/GL_VERSION_4_0 +++ b/auto/core/gl/GL_VERSION_4_0 @@ -1,6 +1,7 @@ GL_VERSION_4_0 https://www.opengl.org/registry/doc/glspec40.compatibility.20100311.pdf + GL_SAMPLE_SHADING 0x8C36 GL_MIN_SAMPLE_SHADING_VALUE 0x8C37 GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5E diff --git a/auto/core/gl/GL_VERSION_4_1 b/auto/core/gl/GL_VERSION_4_1 index 91da382..6153c27 100644 --- a/auto/core/gl/GL_VERSION_4_1 +++ b/auto/core/gl/GL_VERSION_4_1 @@ -1,2 +1,3 @@ GL_VERSION_4_1 https://www.opengl.org/registry/doc/glspec41.compatibility.20100725.pdf + diff --git a/auto/core/gl/GL_VERSION_4_2 b/auto/core/gl/GL_VERSION_4_2 index d5c1708..ff12b4c 100644 --- a/auto/core/gl/GL_VERSION_4_2 +++ b/auto/core/gl/GL_VERSION_4_2 @@ -1,6 +1,7 @@ GL_VERSION_4_2 https://www.opengl.org/registry/doc/glspec42.compatibility.20120427.pdf + GL_COPY_READ_BUFFER_BINDING 0x8F36 GL_COPY_WRITE_BUFFER_BINDING 0x8F37 GL_TRANSFORM_FEEDBACK_ACTIVE 0x8E24 diff --git a/auto/core/gl/GL_VERSION_4_3 b/auto/core/gl/GL_VERSION_4_3 index dc2b408..32fc35b 100644 --- a/auto/core/gl/GL_VERSION_4_3 +++ b/auto/core/gl/GL_VERSION_4_3 @@ -1,5 +1,6 @@ GL_VERSION_4_3 https://www.opengl.org/registry/doc/glspec43.compatibility.20130214.pdf + GL_VERTEX_ATTRIB_ARRAY_LONG 0x874E GL_NUM_SHADING_LANGUAGE_VERSIONS 0x82E9 diff --git a/auto/core/gl/GL_VERSION_4_4 b/auto/core/gl/GL_VERSION_4_4 index 959c146..cf6416e 100644 --- a/auto/core/gl/GL_VERSION_4_4 +++ b/auto/core/gl/GL_VERSION_4_4 @@ -1,6 +1,7 @@ GL_VERSION_4_4 https://www.opengl.org/registry/doc/glspec44.compatibility.pdf + GL_MAX_VERTEX_ATTRIB_STRIDE 0x82E5 GL_PRIMITIVE_RESTART_FOR_PATCHES_SUPPORTED 0x8221 GL_TEXTURE_BUFFER_BINDING 0x8C2A diff --git a/auto/core/gl/GL_VERSION_4_5 b/auto/core/gl/GL_VERSION_4_5 index 3c06e85..1ecda61 100644 --- a/auto/core/gl/GL_VERSION_4_5 +++ b/auto/core/gl/GL_VERSION_4_5 @@ -1,6 +1,7 @@ GL_VERSION_4_5 https://www.opengl.org/registry/doc/glspec45.compatibility.pdf + GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT 0x00000004 GLenum glGetGraphicsResetStatus (void) void glGetnTexImage (GLenum tex, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid *pixels) diff --git a/auto/core/gl/GL_WIN_swap_hint b/auto/core/gl/GL_WIN_swap_hint index 6916189..9bb490b 100644 --- a/auto/core/gl/GL_WIN_swap_hint +++ b/auto/core/gl/GL_WIN_swap_hint @@ -1,4 +1,5 @@ GL_WIN_swap_hint http://msdn.microsoft.com/library/default.asp?url=/library/en-us/opengl/glfunc01_16zy.asp GL_WIN_swap_hint + void glAddSwapHintRectWIN (GLint x, GLint y, GLsizei width, GLsizei height) diff --git a/auto/core/gl/WGL_ARB_create_context b/auto/core/gl/WGL_ARB_create_context index 20b3119..7e7c163 100644 --- a/auto/core/gl/WGL_ARB_create_context +++ b/auto/core/gl/WGL_ARB_create_context @@ -1,6 +1,7 @@ WGL_ARB_create_context http://www.opengl.org/registry/specs/ARB/wgl_create_context.txt WGL_ARB_create_context + WGL_CONTEXT_DEBUG_BIT_ARB 0x0001 WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002 WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091 diff --git a/auto/core/gl/WGL_ATI_render_texture_rectangle b/auto/core/gl/WGL_ATI_render_texture_rectangle index 55df114..aba7be1 100644 --- a/auto/core/gl/WGL_ATI_render_texture_rectangle +++ b/auto/core/gl/WGL_ATI_render_texture_rectangle @@ -1,4 +1,5 @@ WGL_ATI_render_texture_rectangle WGL_ATI_render_texture_rectangle + WGL_TEXTURE_RECTANGLE_ATI 0x21A5 diff --git a/auto/core/gl/WGL_EXT_create_context_es2_profile b/auto/core/gl/WGL_EXT_create_context_es2_profile index ca9881a..3105737 100644 --- a/auto/core/gl/WGL_EXT_create_context_es2_profile +++ b/auto/core/gl/WGL_EXT_create_context_es2_profile @@ -1,4 +1,5 @@ WGL_EXT_create_context_es2_profile http://www.opengl.org/registry/specs/EXT/wgl_create_context_es2_profile.txt WGL_EXT_create_context_es2_profile + WGL_CONTEXT_ES2_PROFILE_BIT_EXT 0x00000004 diff --git a/auto/core/gl/WGL_EXT_create_context_es_profile b/auto/core/gl/WGL_EXT_create_context_es_profile index 6eb7cdd..5c7ce7e 100644 --- a/auto/core/gl/WGL_EXT_create_context_es_profile +++ b/auto/core/gl/WGL_EXT_create_context_es_profile @@ -1,4 +1,5 @@ WGL_EXT_create_context_es_profile http://www.opengl.org/registry/specs/EXT/wgl_create_context_es_profile.txt WGL_EXT_create_context_es_profile + WGL_CONTEXT_ES_PROFILE_BIT_EXT 0x00000004 diff --git a/auto/core/gl/WGL_EXT_framebuffer_sRGB b/auto/core/gl/WGL_EXT_framebuffer_sRGB index e4a4032..5f2f5b8 100644 --- a/auto/core/gl/WGL_EXT_framebuffer_sRGB +++ b/auto/core/gl/WGL_EXT_framebuffer_sRGB @@ -1,4 +1,5 @@ WGL_EXT_framebuffer_sRGB http://developer.download.nvidia.com/opengl/specs/GL_EXT_framebuffer_sRGB.txt WGL_EXT_framebuffer_sRGB + WGL_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x20A9 diff --git a/auto/core/gl/WGL_EXT_pixel_format_packed_float b/auto/core/gl/WGL_EXT_pixel_format_packed_float index 30925fc..662a993 100644 --- a/auto/core/gl/WGL_EXT_pixel_format_packed_float +++ b/auto/core/gl/WGL_EXT_pixel_format_packed_float @@ -1,4 +1,5 @@ WGL_EXT_pixel_format_packed_float http://developer.download.nvidia.com/opengl/specs/GL_EXT_packed_float.txt WGL_EXT_pixel_format_packed_float + WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT 0x20A8 diff --git a/auto/core/gl/WGL_NV_gpu_affinity b/auto/core/gl/WGL_NV_gpu_affinity index f722204..61ed3f1 100644 --- a/auto/core/gl/WGL_NV_gpu_affinity +++ b/auto/core/gl/WGL_NV_gpu_affinity @@ -1,6 +1,7 @@ WGL_NV_gpu_affinity http://developer.download.nvidia.com/opengl/specs/WGL_nv_gpu_affinity.txt WGL_NV_gpu_affinity + WGL_ERROR_INCOMPATIBLE_AFFINITY_MASKS_NV 0x20D0 WGL_ERROR_MISSING_AFFINITY_MASK_NV 0x20D1 BOOL wglEnumGpusNV (UINT iGpuIndex, HGPUNV *phGpu) diff --git a/auto/core/gl/WGL_NV_vertex_array_range b/auto/core/gl/WGL_NV_vertex_array_range index ca22d31..27b43ce 100644 --- a/auto/core/gl/WGL_NV_vertex_array_range +++ b/auto/core/gl/WGL_NV_vertex_array_range @@ -1,5 +1,6 @@ WGL_NV_vertex_array_range http://oss.sgi.com/projects/ogl-sample/registry/NV/vertex_array_range.txt WGL_NV_vertex_array_range + void * wglAllocateMemoryNV (GLsizei size, GLfloat readFrequency, GLfloat writeFrequency, GLfloat priority) void wglFreeMemoryNV (void *pointer) diff --git a/auto/doc/advanced.html b/auto/doc/advanced.html index 4bf2aa8..740a797 100644 --- a/auto/doc/advanced.html +++ b/auto/doc/advanced.html @@ -110,45 +110,6 @@ WGL_ATI_pixel_format_float
WGL_NV_float_buffer

-

Multiple Rendering Contexts (GLEW MX)

- -

Starting with release 1.2.0, thread-safe support for multiple -rendering contexts, possibly with different capabilities, is -available. Since this is not required by most users, it is not added -to the binary releases to maintain compatibility between different -versions. To include multi-context support, you have to do the -following:

-
    -
  1. Compile and use GLEW with the GLEW_MX preprocessor token -defined.
    2. -
  2. For each rendering context, create a GLEWContext object -that will be available as long as the rendering context exists.
    3. -
  3. Define a macro or function called glewGetContext() that -returns a pointer to the GLEWContext object associated with -the rendering context from which OpenGL/WGL/GLX calls are issued. This -dispatch mechanism is primitive, but generic. -
  4. Make sure that you call glewInit() after creating the -GLEWContext object in each rendering context. Note, that the -GLEWContext pointer returned by glewGetContext() has -to reside in global or thread-local memory. -
- -

Note that according to the MSDN -WGL documentation, you have to initialize the entry points for -every rendering context that use pixel formats with different -capabilities For example, the pixel formats provided by the generic -software OpenGL implementation by Microsoft vs. the hardware -accelerated pixel formats have different capabilities. GLEW by -default ignores this requirement, and does not define per-context -entry points (you can however do this using the steps described -above). Assuming a global namespace for the entry points works in -most situations, because typically all hardware accelerated pixel -formats provide the same entry points and capabilities. This means -that unless you use the multi-context version of GLEW, you need to -call glewInit() only once in your program, or more precisely, -once per process.

-

Separate Namespace

diff --git a/auto/doc/credits.html b/auto/doc/credits.html index 7f1b8d9..6c36de0 100644 --- a/auto/doc/credits.html +++ b/auto/doc/credits.html @@ -1,25 +1,2 @@ -

Credits

- -

-GLEW was developed by Milan -Ikits and Marcelo -Magallon. They also perform occasional maintainance to make sure -that GLEW stays in mint condition. Aaron Lefohn, Joe Kniss, and Chris -Wyman were the first users and also assisted with the design and -debugging process. The acronym GLEW originates from Aaron Lefohn. -Pasi Kärkkäinen identified and fixed several problems with -GLX and SDL. Nate Robins created the wglinfo utility, to -which modifications were made by Michael Wimmer. -

- -

Copyright

- -

-GLEW is originally derived from the EXTGL project by Lev Povalahev. -The source code is licensed under the Modified BSD -License, the Mesa 3-D License (MIT -License), and the Khronos License (MIT -License). The automatic code generation scripts are released under -the GNU GPL. -

+

+Author, copyright and licensing information on github.

diff --git a/auto/doc/index.html b/auto/doc/index.html index 88eef1a..ba91705 100644 --- a/auto/doc/index.html +++ b/auto/doc/index.html @@ -60,8 +60,9 @@ An up-to-date copy is also available using git Unsupported snapshots are also available:

Supported Extensions

diff --git a/auto/khronos/readme.pdf b/auto/khronos/readme.pdf new file mode 100644 index 0000000..7debab5 Binary files /dev/null and b/auto/khronos/readme.pdf differ diff --git a/auto/src/eglew_head.h b/auto/src/eglew_head.h new file mode 100644 index 0000000..df2f1d9 --- /dev/null +++ b/auto/src/eglew_head.h @@ -0,0 +1,88 @@ +#ifndef __eglew_h__ +#define __eglew_h__ +#define __EGLEW_H__ + +#ifdef __eglext_h_ +#error eglext.h included before eglew.h +#endif + +#if defined(__egl_h_) +#error egl.h included before eglew.h +#endif + +#define __eglext_h_ + +#define __egl_h_ + +#ifndef EGLAPIENTRY +#define EGLAPIENTRY +#endif +#ifndef EGLAPI +#define EGLAPI extern +#endif + +/* EGL Types */ +#include + +#include +#include + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +typedef int32_t EGLint; + +typedef unsigned int EGLBoolean; +typedef void *EGLDisplay; +typedef void *EGLConfig; +typedef void *EGLSurface; +typedef void *EGLContext; +typedef void (*__eglMustCastToProperFunctionPointerType)(void); + +typedef unsigned int EGLenum; +typedef void *EGLClientBuffer; + +typedef void *EGLSync; +typedef intptr_t EGLAttrib; +typedef khronos_utime_nanoseconds_t EGLTime; +typedef void *EGLImage; + +typedef void *EGLSyncKHR; +typedef intptr_t EGLAttribKHR; +typedef void *EGLLabelKHR; +typedef void *EGLObjectKHR; +typedef void (EGLAPIENTRY *EGLDEBUGPROCKHR)(EGLenum error,const char *command,EGLint messageType,EGLLabelKHR threadLabel,EGLLabelKHR objectLabel,const char* message); +typedef khronos_utime_nanoseconds_t EGLTimeKHR; +typedef void *EGLImageKHR; +typedef void *EGLStreamKHR; +typedef khronos_uint64_t EGLuint64KHR; +typedef int EGLNativeFileDescriptorKHR; +typedef khronos_ssize_t EGLsizeiANDROID; +typedef void (*EGLSetBlobFuncANDROID) (const void *key, EGLsizeiANDROID keySize, const void *value, EGLsizeiANDROID valueSize); +typedef EGLsizeiANDROID (*EGLGetBlobFuncANDROID) (const void *key, EGLsizeiANDROID keySize, void *value, EGLsizeiANDROID valueSize); +typedef void *EGLDeviceEXT; +typedef void *EGLOutputLayerEXT; +typedef void *EGLOutputPortEXT; +typedef void *EGLSyncNV; +typedef khronos_utime_nanoseconds_t EGLTimeNV; +typedef khronos_utime_nanoseconds_t EGLuint64NV; +typedef khronos_stime_nanoseconds_t EGLnsecsANDROID; + +struct EGLClientPixmapHI; + +#define EGL_DONT_CARE ((EGLint)-1) + +#define EGL_NO_CONTEXT ((EGLContext)0) +#define EGL_NO_DISPLAY ((EGLDisplay)0) +#define EGL_NO_IMAGE ((EGLImage)0) +#define EGL_NO_SURFACE ((EGLSurface)0) +#define EGL_NO_SYNC ((EGLSync)0) + +#define EGL_UNKNOWN ((EGLint)-1) + +#define EGL_DEFAULT_DISPLAY ((EGLNativeDisplayType)0) + +EGLAPI __eglMustCastToProperFunctionPointerType EGLAPIENTRY eglGetProcAddress (const char *procname); diff --git a/auto/src/eglew_mid.h b/auto/src/eglew_mid.h new file mode 100644 index 0000000..f94a149 --- /dev/null +++ b/auto/src/eglew_mid.h @@ -0,0 +1,4 @@ +/* ------------------------------------------------------------------------- */ + +#define EGLEW_FUN_EXPORT GLEW_FUN_EXPORT +#define EGLEW_VAR_EXPORT GLEW_VAR_EXPORT diff --git a/auto/src/eglew_tail.h b/auto/src/eglew_tail.h new file mode 100644 index 0000000..a91a76e --- /dev/null +++ b/auto/src/eglew_tail.h @@ -0,0 +1,15 @@ +/* ------------------------------------------------------------------------ */ + +GLEWAPI GLenum GLEWAPIENTRY eglewInit (EGLDisplay display); +GLEWAPI GLboolean GLEWAPIENTRY eglewIsSupported (const char *name); + +#define EGLEW_GET_VAR(x) (*(const GLboolean*)&x) +#define EGLEW_GET_FUN(x) x + +GLEWAPI GLboolean GLEWAPIENTRY eglewGetExtension (const char *name); + +#ifdef __cplusplus +} +#endif + +#endif /* __eglew_h__ */ diff --git a/auto/src/glew.rc b/auto/src/glew.rc index c5afe1c..e930220 100644 --- a/auto/src/glew.rc +++ b/auto/src/glew.rc @@ -1,34 +1,18 @@ #include -#ifdef GLEW_MX -# ifdef GLEW_STATIC -# ifdef _DEBUG -# define FILENAME "glew32mxsd.dll" -# else -# define FILENAME "glew32mxs.dll" -# endif -# else -# ifdef _DEBUG -# define FILENAME "glew32mxd.dll" -# else -# define FILENAME "glew32mx.dll" -# endif -# endif +#ifdef GLEW_STATIC +# ifdef _DEBUG +# define FILENAME "glew32sd.dll" +# else +# define FILENAME "glew32s.dll" +# endif #else -# ifdef GLEW_STATIC -# ifdef _DEBUG -# define FILENAME "glew32sd.dll" -# else -# define FILENAME "glew32s.dll" -# endif -# else -# ifdef _DEBUG -# define FILENAME "glew32d.dll" -# else -# define FILENAME "glew32.dll" -# endif -# endif +# ifdef _DEBUG +# define FILENAME "glew32d.dll" +# else +# define FILENAME "glew32.dll" +# endif #endif ///////////////////////////////////////////////////////////////////////////// diff --git a/auto/src/glew_head.c b/auto/src/glew_head.c index 1b4ed77..8fe8638 100644 --- a/auto/src/glew_head.c +++ b/auto/src/glew_head.c @@ -3,6 +3,8 @@ #if defined(GLEW_OSMESA) # define GLAPI extern # include +#elif defined(GLEW_EGL) +# include #elif defined(_WIN32) # include #elif !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) @@ -11,36 +13,8 @@ #include /* For size_t */ -/* - * Define glewGetContext and related helper macros. - */ -#ifdef GLEW_MX -# define glewGetContext() ctx -# ifdef _WIN32 -# define GLEW_CONTEXT_ARG_DEF_INIT GLEWContext* ctx -# define GLEW_CONTEXT_ARG_VAR_INIT ctx -# define wglewGetContext() ctx -# define WGLEW_CONTEXT_ARG_DEF_INIT WGLEWContext* ctx -# define WGLEW_CONTEXT_ARG_DEF_LIST WGLEWContext* ctx -# else /* _WIN32 */ -# define GLEW_CONTEXT_ARG_DEF_INIT void -# define GLEW_CONTEXT_ARG_VAR_INIT -# define glxewGetContext() ctx -# define GLXEW_CONTEXT_ARG_DEF_INIT void -# define GLXEW_CONTEXT_ARG_DEF_LIST GLXEWContext* ctx -# endif /* _WIN32 */ -# define GLEW_CONTEXT_ARG_DEF_LIST GLEWContext* ctx -#else /* GLEW_MX */ -# define GLEW_CONTEXT_ARG_DEF_INIT void -# define GLEW_CONTEXT_ARG_VAR_INIT -# define GLEW_CONTEXT_ARG_DEF_LIST void -# define WGLEW_CONTEXT_ARG_DEF_INIT void -# define WGLEW_CONTEXT_ARG_DEF_LIST void -# define GLXEW_CONTEXT_ARG_DEF_INIT void -# define GLXEW_CONTEXT_ARG_DEF_LIST void -#endif /* GLEW_MX */ - -#if defined(GLEW_REGAL) +#if defined(GLEW_EGL) +#elif defined(GLEW_REGAL) /* In GLEW_REGAL mode we call direcly into the linked libRegal.so glGetProcAddressREGAL for looking up @@ -92,7 +66,7 @@ void* NSGLGetProcAddress (const GLubyte *name) { static void* image = NULL; void* addr; - if (NULL == image) + if (NULL == image) { image = dlopen("/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL", RTLD_LAZY); } @@ -144,6 +118,8 @@ void* NSGLGetProcAddress (const GLubyte *name) # define glewGetProcAddress(name) regalGetProcAddress((const GLchar *)name) #elif defined(GLEW_OSMESA) # define glewGetProcAddress(name) OSMesaGetProcAddress((const char *)name) +#elif defined(GLEW_EGL) +# define glewGetProcAddress(name) eglGetProcAddress((const char *)name) #elif defined(_WIN32) # define glewGetProcAddress(name) wglGetProcAddress((LPCSTR)name) #elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX) @@ -163,34 +139,28 @@ void* NSGLGetProcAddress (const GLubyte *name) */ #undef GLEW_GET_VAR -#ifdef GLEW_MX -# define GLEW_GET_VAR(x) (glewGetContext()->x) -#else /* GLEW_MX */ # define GLEW_GET_VAR(x) (x) -#endif /* GLEW_MX */ #ifdef WGLEW_GET_VAR # undef WGLEW_GET_VAR -# ifdef GLEW_MX -# define WGLEW_GET_VAR(x) (wglewGetContext()->x) -# else /* GLEW_MX */ -# define WGLEW_GET_VAR(x) (x) -# endif /* GLEW_MX */ +# define WGLEW_GET_VAR(x) (x) #endif /* WGLEW_GET_VAR */ #ifdef GLXEW_GET_VAR # undef GLXEW_GET_VAR -# ifdef GLEW_MX -# define GLXEW_GET_VAR(x) (glxewGetContext()->x) -# else /* GLEW_MX */ -# define GLXEW_GET_VAR(x) (x) -# endif /* GLEW_MX */ +# define GLXEW_GET_VAR(x) (x) #endif /* GLXEW_GET_VAR */ +#ifdef EGLEW_GET_VAR +# undef EGLEW_GET_VAR +# define EGLEW_GET_VAR(x) (x) +#endif /* EGLEW_GET_VAR */ + /* * GLEW, just like OpenGL or GLU, does not rely on the standard C library. * These functions implement the functionality required in this file. */ + static GLuint _glewStrLen (const GLubyte* s) { GLuint i=0; @@ -204,9 +174,20 @@ static GLuint _glewStrCLen (const GLubyte* s, GLubyte c) GLuint i=0; if (s == NULL) return 0; while (s[i] != '\0' && s[i] != c) i++; - return (s[i] == '\0' || s[i] == c) ? i : 0; + return i; } +static GLuint _glewStrCopy(char *d, const char *s, char c) +{ + GLuint i=0; + if (s == NULL) return 0; + while (s[i] != '\0' && s[i] != c) { d[i] = s[i]; i++; } + d[i] = '\0'; + return i; +} + +#if !defined(GLEW_OSMESA) +#if !defined(__APPLE__) || defined(GLEW_APPLE_GLX) static GLboolean _glewStrSame (const GLubyte* a, const GLubyte* b, GLuint n) { GLuint i=0; @@ -215,6 +196,8 @@ static GLboolean _glewStrSame (const GLubyte* a, const GLubyte* b, GLuint n) while (i < n && a[i] != '\0' && b[i] != '\0' && a[i] == b[i]) i++; return i == n ? GL_TRUE : GL_FALSE; } +#endif +#endif static GLboolean _glewStrSame1 (const GLubyte** a, GLuint* na, const GLubyte* b, GLuint nb) { @@ -275,6 +258,8 @@ static GLboolean _glewStrSame3 (const GLubyte** a, GLuint* na, const GLubyte* b, * other extension names. Could use strtok() but the constant * string returned by glGetString might be in read-only memory. */ +#if !defined(GLEW_OSMESA) +#if !defined(__APPLE__) || defined(GLEW_APPLE_GLX) static GLboolean _glewSearchExtension (const char* name, const GLubyte *start, const GLubyte *end) { const GLubyte* p; @@ -288,3 +273,5 @@ static GLboolean _glewSearchExtension (const char* name, const GLubyte *start, c } return GL_FALSE; } +#endif +#endif diff --git a/auto/src/glew_head.h b/auto/src/glew_head.h index c5592e1..c19cefb 100644 --- a/auto/src/glew_head.h +++ b/auto/src/glew_head.h @@ -184,6 +184,9 @@ typedef _W64 int ptrdiff_t; #define GLEWAPIENTRY #endif +#define GLEW_VAR_EXPORT GLEWAPI +#define GLEW_FUN_EXPORT GLEWAPI + #ifdef __cplusplus extern "C" { #endif diff --git a/auto/src/glew_init_egl.c b/auto/src/glew_init_egl.c new file mode 100644 index 0000000..784285f --- /dev/null +++ b/auto/src/glew_init_egl.c @@ -0,0 +1,45 @@ + /* ------------------------------------------------------------------------ */ + +GLboolean eglewGetExtension (const char* name) +{ + const GLubyte* start; + const GLubyte* end; + + start = (const GLubyte*) eglQueryString(eglGetCurrentDisplay(), EGL_EXTENSIONS); + if (0 == start) return GL_FALSE; + end = start + _glewStrLen(start); + return _glewSearchExtension(name, start, end); +} + +GLenum eglewInit (EGLDisplay display) +{ + EGLint major, minor; + const GLubyte* extStart; + const GLubyte* extEnd; + PFNEGLINITIALIZEPROC initialize = NULL; + PFNEGLQUERYSTRINGPROC queryString = NULL; + + /* Load necessary entry points */ + initialize = (PFNEGLINITIALIZEPROC) glewGetProcAddress("eglInitialize"); + queryString = (PFNEGLQUERYSTRINGPROC) glewGetProcAddress("eglQueryString"); + if (!initialize || !queryString) + return 1; + + /* query EGK version */ + if (initialize(display, &major, &minor) != EGL_TRUE) + return 1; + + EGLEW_VERSION_1_5 = ( major > 1 ) || ( major == 1 && minor >= 5 ) ? GL_TRUE : GL_FALSE; + EGLEW_VERSION_1_4 = EGLEW_VERSION_1_5 == GL_TRUE || ( major == 1 && minor >= 4 ) ? GL_TRUE : GL_FALSE; + EGLEW_VERSION_1_3 = EGLEW_VERSION_1_4 == GL_TRUE || ( major == 1 && minor >= 3 ) ? GL_TRUE : GL_FALSE; + EGLEW_VERSION_1_2 = EGLEW_VERSION_1_3 == GL_TRUE || ( major == 1 && minor >= 2 ) ? GL_TRUE : GL_FALSE; + EGLEW_VERSION_1_1 = EGLEW_VERSION_1_2 == GL_TRUE || ( major == 1 && minor >= 1 ) ? GL_TRUE : GL_FALSE; + EGLEW_VERSION_1_0 = EGLEW_VERSION_1_1 == GL_TRUE || ( major == 1 && minor >= 0 ) ? GL_TRUE : GL_FALSE; + + /* query EGL extension string */ + extStart = (const GLubyte*) queryString(display, EGL_EXTENSIONS); + if (extStart == 0) + extStart = (const GLubyte *)""; + extEnd = extStart + _glewStrLen(extStart); + + /* initialize extensions */ diff --git a/auto/src/glew_init_gl.c b/auto/src/glew_init_gl.c index c438792..c153720 100644 --- a/auto/src/glew_init_gl.c +++ b/auto/src/glew_init_gl.c @@ -1,34 +1,100 @@ /* ------------------------------------------------------------------------- */ +static int _glewExtensionCompare(const char *s1, const char *s2) +{ + /* http://www.chanduthedev.com/2012/07/strcmp-implementation-in-c.html */ + while (*s1 || *s2) + { + if (*s1 > *s2) + return 1; + if (*s1 < *s2) + return -1; + s1++; + s2++; + } + return 0; +} + +static ptrdiff_t _glewBsearchExtension(const char* name) +{ + ptrdiff_t lo = 0, hi = sizeof(_glewExtensionLookup) / sizeof(char*) - 2; + + while (lo <= hi) + { + ptrdiff_t mid = (lo + hi) / 2; + const int cmp = _glewExtensionCompare(name, _glewExtensionLookup[mid]); + if (cmp < 0) hi = mid - 1; + else if (cmp > 0) lo = mid + 1; + else return mid; + } + return -1; +} + +static GLboolean *_glewGetExtensionString(const char *name) +{ + ptrdiff_t n = _glewBsearchExtension(name); + if (n >= 0) return &_glewExtensionString[n]; + return NULL; +} + +static GLboolean *_glewGetExtensionEnable(const char *name) +{ + ptrdiff_t n = _glewBsearchExtension(name); + if (n >= 0) return _glewExtensionEnabled[n]; + return NULL; +} + +static const char *_glewNextSpace(const char *i) +{ + const char *j = i; + if (j) + while (*j!=' ' && *j) ++j; + return j; +} + +static const char *_glewNextNonSpace(const char *i) +{ + const char *j = i; + if (j) + while (*j==' ') ++j; + return j; +} + GLboolean GLEWAPIENTRY glewGetExtension (const char* name) -{ - const GLubyte* start; - const GLubyte* end; - start = (const GLubyte*)glGetString(GL_EXTENSIONS); - if (start == 0) - return GL_FALSE; - end = start + _glewStrLen(start); - return _glewSearchExtension(name, start, end); +{ + GLboolean *enable = _glewGetExtensionString(name); + if (enable) + return *enable; + return GL_FALSE; } /* ------------------------------------------------------------------------- */ -#ifndef GLEW_MX -static -#endif -GLenum GLEWAPIENTRY glewContextInit (GLEW_CONTEXT_ARG_DEF_LIST) +typedef const GLubyte* (GLAPIENTRY * PFNGLGETSTRINGPROC) (GLenum name); +typedef void (GLAPIENTRY * PFNGLGETINTEGERVPROC) (GLenum pname, GLint *params); + +static GLenum GLEWAPIENTRY glewContextInit () { + PFNGLGETSTRINGPROC getString; const GLubyte* s; GLuint dot; GLint major, minor; - const GLubyte* extStart; - const GLubyte* extEnd; + size_t n; + + #ifdef _WIN32 + getString = glGetString; + #else + getString = (PFNGLGETSTRINGPROC) glewGetProcAddress((const GLubyte*)"glGetString"); + if (!getString) + return GLEW_ERROR_NO_GL_VERSION; + #endif + /* query opengl version */ - s = glGetString(GL_VERSION); + s = getString(GL_VERSION); dot = _glewStrCLen(s, '.'); if (dot == 0) return GLEW_ERROR_NO_GL_VERSION; - + major = s[dot-1]-'0'; minor = s[dot+1]-'0'; @@ -36,7 +102,6 @@ GLenum GLEWAPIENTRY glewContextInit (GLEW_CONTEXT_ARG_DEF_LIST) minor = 0; if (major<0 || major>9) return GLEW_ERROR_NO_GL_VERSION; - if (major == 1 && minor == 0) { @@ -54,20 +119,88 @@ GLenum GLEWAPIENTRY glewContextInit (GLEW_CONTEXT_ARG_DEF_LIST) GLEW_VERSION_3_2 = GLEW_VERSION_3_3 == GL_TRUE || ( major == 3 && minor >= 2 ) ? GL_TRUE : GL_FALSE; GLEW_VERSION_3_1 = GLEW_VERSION_3_2 == GL_TRUE || ( major == 3 && minor >= 1 ) ? GL_TRUE : GL_FALSE; GLEW_VERSION_3_0 = GLEW_VERSION_3_1 == GL_TRUE || ( major == 3 ) ? GL_TRUE : GL_FALSE; - GLEW_VERSION_2_1 = GLEW_VERSION_3_0 == GL_TRUE || ( major == 2 && minor >= 1 ) ? GL_TRUE : GL_FALSE; + GLEW_VERSION_2_1 = GLEW_VERSION_3_0 == GL_TRUE || ( major == 2 && minor >= 1 ) ? GL_TRUE : GL_FALSE; GLEW_VERSION_2_0 = GLEW_VERSION_2_1 == GL_TRUE || ( major == 2 ) ? GL_TRUE : GL_FALSE; GLEW_VERSION_1_5 = GLEW_VERSION_2_0 == GL_TRUE || ( major == 1 && minor >= 5 ) ? GL_TRUE : GL_FALSE; GLEW_VERSION_1_4 = GLEW_VERSION_1_5 == GL_TRUE || ( major == 1 && minor >= 4 ) ? GL_TRUE : GL_FALSE; GLEW_VERSION_1_3 = GLEW_VERSION_1_4 == GL_TRUE || ( major == 1 && minor >= 3 ) ? GL_TRUE : GL_FALSE; - GLEW_VERSION_1_2_1 = GLEW_VERSION_1_3 == GL_TRUE ? GL_TRUE : GL_FALSE; + GLEW_VERSION_1_2_1 = GLEW_VERSION_1_3 == GL_TRUE ? GL_TRUE : GL_FALSE; GLEW_VERSION_1_2 = GLEW_VERSION_1_2_1 == GL_TRUE || ( major == 1 && minor >= 2 ) ? GL_TRUE : GL_FALSE; GLEW_VERSION_1_1 = GLEW_VERSION_1_2 == GL_TRUE || ( major == 1 && minor >= 1 ) ? GL_TRUE : GL_FALSE; } - /* query opengl extensions string */ - extStart = glGetString(GL_EXTENSIONS); - if (extStart == 0) - extStart = (const GLubyte*)""; - extEnd = extStart + _glewStrLen(extStart); + for (n = 0; n < sizeof(_glewExtensionString) / sizeof(_glewExtensionString[0]); ++n) + _glewExtensionString[n] = GL_FALSE; - /* initialize extensions */ + if (GLEW_VERSION_3_0) + { + GLint n = 0; + GLint i; + PFNGLGETINTEGERVPROC getIntegerv; + PFNGLGETSTRINGIPROC getStringi; + const char *ext; + GLboolean *enable; + + #ifdef _WIN32 + getIntegerv = glGetIntegerv; + #else + getIntegerv = (PFNGLGETINTEGERVPROC) glewGetProcAddress((const GLubyte*)"glGetIntegerv"); + #endif + + if (getIntegerv) + getIntegerv(GL_NUM_EXTENSIONS, &n); + + /* glGetStringi is OpenGL 3.0 */ + getStringi = (PFNGLGETSTRINGIPROC) glewGetProcAddress((const GLubyte*)"glGetStringi"); + if (getStringi) + for (i = 0; i= (ptrdiff_t) sizeof(ext)) + continue; + _glewStrCopy(ext, i, ' '); + + /* Based on extension string(s), glewGetExtension purposes */ + enable = _glewGetExtensionString(ext); + if (enable) + *enable = GL_TRUE; + + /* Based on extension string(s), experimental mode, glewIsSupported purposes */ + enable = _glewGetExtensionEnable(ext); + if (enable) + *enable = GL_TRUE; + } + } + } diff --git a/auto/src/glew_init_glx.c b/auto/src/glew_init_glx.c index b54cca3..159e45d 100644 --- a/auto/src/glew_init_glx.c +++ b/auto/src/glew_init_glx.c @@ -12,17 +12,13 @@ GLboolean glxewGetExtension (const char* name) return _glewSearchExtension(name, start, end); } -#ifdef GLEW_MX -GLenum glxewContextInit (GLXEW_CONTEXT_ARG_DEF_LIST) -#else -GLenum glxewInit (GLXEW_CONTEXT_ARG_DEF_LIST) -#endif +GLenum glxewInit () { int major, minor; const GLubyte* extStart; const GLubyte* extEnd; /* initialize core GLX 1.2 */ - if (_glewInit_GLX_VERSION_1_2(GLEW_CONTEXT_ARG_VAR_INIT)) return GLEW_ERROR_GLX_VERSION_11_ONLY; + if (_glewInit_GLX_VERSION_1_2()) return GLEW_ERROR_GLX_VERSION_11_ONLY; /* initialize flags */ GLXEW_VERSION_1_0 = GL_TRUE; GLXEW_VERSION_1_1 = GL_TRUE; diff --git a/auto/src/glew_init_tail.c b/auto/src/glew_init_tail.c index ba68ccf..e21ce96 100644 --- a/auto/src/glew_init_tail.c +++ b/auto/src/glew_init_tail.c @@ -32,14 +32,18 @@ const GLubyte * GLEWAPIENTRY glewGetString (GLenum name) GLboolean glewExperimental = GL_FALSE; -#if !defined(GLEW_MX) - GLenum GLEWAPIENTRY glewInit (void) { GLenum r; +#if defined(GLEW_EGL) + PFNEGLGETCURRENTDISPLAYPROC getCurrentDisplay = NULL; +#endif r = glewContextInit(); if ( r != 0 ) return r; -#if defined(GLEW_OSMESA) || defined(__ANDROID__) || defined(__native_client__) || defined(__HAIKU__) +#if defined(GLEW_EGL) + getCurrentDisplay = (PFNEGLGETCURRENTDISPLAYPROC) glewGetProcAddress("eglGetCurrentDisplay"); + return eglewInit(getCurrentDisplay()); +#elif defined(GLEW_OSMESA) || defined(__ANDROID__) || defined(__native_client__) || defined(__HAIKU__) return r; #elif defined(_WIN32) return wglewInit(); @@ -50,4 +54,14 @@ GLenum GLEWAPIENTRY glewInit (void) #endif /* _WIN32 */ } -#endif /* !GLEW_MX */ +#if defined(_WIN32) && defined(GLEW_BUILD) && defined(__GNUC__) +/* GCC requires a DLL entry point even without any standard library included. */ +/* Types extracted from windows.h to avoid polluting the rest of the file. */ +int __stdcall DllMainCRTStartup(void* instance, unsigned reason, void* reserved) +{ + (void) instance; + (void) reason; + (void) reserved; + return 1; +} +#endif diff --git a/auto/src/glew_init_wgl.c b/auto/src/glew_init_wgl.c index cc731fe..978cf3c 100644 --- a/auto/src/glew_init_wgl.c +++ b/auto/src/glew_init_wgl.c @@ -20,11 +20,7 @@ GLboolean GLEWAPIENTRY wglewGetExtension (const char* name) return _glewSearchExtension(name, start, end); } -#ifdef GLEW_MX -GLenum GLEWAPIENTRY wglewContextInit (WGLEW_CONTEXT_ARG_DEF_LIST) -#else -GLenum GLEWAPIENTRY wglewInit (WGLEW_CONTEXT_ARG_DEF_LIST) -#endif +GLenum GLEWAPIENTRY wglewInit () { GLboolean crippled; const GLubyte* extStart; diff --git a/auto/src/glew_str_egl.c b/auto/src/glew_str_egl.c new file mode 100644 index 0000000..f0c52f9 --- /dev/null +++ b/auto/src/glew_str_egl.c @@ -0,0 +1,17 @@ + } + ret = (len == 0); + } + return ret; +} + +#elif defined(GLEW_EGL) + +GLboolean eglewIsSupported (const char* name) +{ + const GLubyte* pos = (const GLubyte*)name; + GLuint len = _glewStrLen(pos); + GLboolean ret = GL_TRUE; + while (ret && len > 0) + { + if(_glewStrSame1(&pos, &len, (const GLubyte*)"EGL_", 4)) + { diff --git a/auto/src/glew_str_glx.c b/auto/src/glew_str_glx.c index 785c23a..893d741 100644 --- a/auto/src/glew_str_glx.c +++ b/auto/src/glew_str_glx.c @@ -4,13 +4,9 @@ return ret; } -#elif !defined(GLEW_OSMESA) && !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && !defined(__APPLE__) || defined(GLEW_APPLE_GLX) +#elif !defined(GLEW_OSMESA) && !defined(GLEW_EGL) && !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && !defined(__APPLE__) || defined(GLEW_APPLE_GLX) -#if defined(GLEW_MX) -GLboolean glxewContextIsSupported (const GLXEWContext* ctx, const char* name) -#else GLboolean glxewIsSupported (const char* name) -#endif { const GLubyte* pos = (const GLubyte*)name; GLuint len = _glewStrLen(pos); diff --git a/auto/src/glew_str_head.c b/auto/src/glew_str_head.c index 1e8d963..fed3a0f 100644 --- a/auto/src/glew_str_head.c +++ b/auto/src/glew_str_head.c @@ -1,8 +1,4 @@ -#ifdef GLEW_MX -GLboolean GLEWAPIENTRY glewContextIsSupported (const GLEWContext* ctx, const char* name) -#else GLboolean GLEWAPIENTRY glewIsSupported (const char* name) -#endif { const GLubyte* pos = (const GLubyte*)name; GLuint len = _glewStrLen(pos); diff --git a/auto/src/glew_str_wgl.c b/auto/src/glew_str_wgl.c index 01055a4..db67b51 100644 --- a/auto/src/glew_str_wgl.c +++ b/auto/src/glew_str_wgl.c @@ -4,13 +4,9 @@ return ret; } -#if defined(_WIN32) && !defined(GLEW_OSMESA) +#if defined(_WIN32) && !defined(GLEW_EGL) && !defined(GLEW_OSMESA) -#if defined(GLEW_MX) -GLboolean GLEWAPIENTRY wglewContextIsSupported (const WGLEWContext* ctx, const char* name) -#else GLboolean GLEWAPIENTRY wglewIsSupported (const char* name) -#endif { const GLubyte* pos = (const GLubyte*)name; GLuint len = _glewStrLen(pos); diff --git a/auto/src/glew_tail.h b/auto/src/glew_tail.h index 92ac0bd..ce7ff3c 100644 --- a/auto/src/glew_tail.h +++ b/auto/src/glew_tail.h @@ -25,33 +25,17 @@ VERSION_MICRO GLEW_VERSION_MICRO_STRING */ /* API */ -#ifdef GLEW_MX - -typedef struct GLEWContextStruct GLEWContext; -GLEWAPI GLenum GLEWAPIENTRY glewContextInit (GLEWContext *ctx); -GLEWAPI GLboolean GLEWAPIENTRY glewContextIsSupported (const GLEWContext *ctx, const char *name); - -#define glewInit() glewContextInit(glewGetContext()) -#define glewIsSupported(x) glewContextIsSupported(glewGetContext(), x) -#define glewIsExtensionSupported(x) glewIsSupported(x) - -#define GLEW_GET_VAR(x) (*(const GLboolean*)&(glewGetContext()->x)) -#ifdef _WIN32 -# define GLEW_GET_FUN(x) glewGetContext()->x -#else -# define GLEW_GET_FUN(x) x -#endif - -#else /* GLEW_MX */ - GLEWAPI GLenum GLEWAPIENTRY glewInit (void); GLEWAPI GLboolean GLEWAPIENTRY glewIsSupported (const char *name); #define glewIsExtensionSupported(x) glewIsSupported(x) +#ifndef GLEW_GET_VAR #define GLEW_GET_VAR(x) (*(const GLboolean*)&x) -#define GLEW_GET_FUN(x) x +#endif -#endif /* GLEW_MX */ +#ifndef GLEW_GET_FUN +#define GLEW_GET_FUN(x) x +#endif GLEWAPI GLboolean glewExperimental; GLEWAPI GLboolean GLEWAPIENTRY glewGetExtension (const char *name); diff --git a/auto/src/glewinfo.rc b/auto/src/glewinfo.rc index 7a2d920..2f46bc5 100644 --- a/auto/src/glewinfo.rc +++ b/auto/src/glewinfo.rc @@ -1,18 +1,10 @@ #include -#ifdef GLEW_MX -# ifdef _DEBUG -# define FILENAME "glewinfo-mxd.exe" -# else -# define FILENAME "glewinfo-mx.exe" -# endif +#ifdef _DEBUG +# define FILENAME "glewinfod.exe" #else -# ifdef _DEBUG -# define FILENAME "glewinfod.exe" -# else -# define FILENAME "glewinfo.exe" -# endif +# define FILENAME "glewinfo.exe" #endif ///////////////////////////////////////////////////////////////////////////// diff --git a/auto/src/glewinfo_egl.c b/auto/src/glewinfo_egl.c new file mode 100644 index 0000000..877e722 --- /dev/null +++ b/auto/src/glewinfo_egl.c @@ -0,0 +1,6 @@ +} + +#elif defined(GLEW_EGL) + +static void eglewInfo () +{ diff --git a/auto/src/glewinfo_glx.c b/auto/src/glewinfo_glx.c index ead3051..e60b549 100644 --- a/auto/src/glewinfo_glx.c +++ b/auto/src/glewinfo_glx.c @@ -1,6 +1,6 @@ } -#elif !defined(GLEW_OSMESA) /* _UNIX */ +#elif !defined(GLEW_EGL) && !defined(GLEW_OSMESA) /* _UNIX */ static void glxewInfo () { diff --git a/auto/src/glewinfo_head.c b/auto/src/glewinfo_head.c index fd4bead..02089f6 100644 --- a/auto/src/glewinfo_head.c +++ b/auto/src/glewinfo_head.c @@ -2,7 +2,9 @@ #include #include #include -#if defined(GLEW_OSMESA) +#if defined(GLEW_EGL) +#include +#elif defined(GLEW_OSMESA) #define GLAPI extern #include #elif defined(_WIN32) @@ -21,23 +23,12 @@ static FILE* f; -#ifdef GLEW_MX -GLEWContext _glewctx; -#define glewGetContext() (&_glewctx) -#if defined(_WIN32) -WGLEWContext _wglewctx; -#define wglewGetContext() (&_wglewctx) -#elif !defined(GLEW_OSMESA) && !defined(__APPLE__) && !defined(__HAIKU__) || defined(GLEW_APPLE_GLX) -GLXEWContext _glxewctx; -#define glxewGetContext() (&_glxewctx) -#endif -#endif - /* Command-line parameters for GL context creation */ struct createParams { #if defined(GLEW_OSMESA) +#elif defined(GLEW_EGL) #elif defined(_WIN32) int pixelformat; #elif !defined(__APPLE__) && !defined(__HAIKU__) || defined(GLEW_APPLE_GLX) diff --git a/auto/src/glewinfo_tail.c b/auto/src/glewinfo_tail.c index 1999b06..30f25fd 100644 --- a/auto/src/glewinfo_tail.c +++ b/auto/src/glewinfo_tail.c @@ -7,9 +7,10 @@ int main (int argc, char** argv) { GLuint err; - struct createParams params = + struct createParams params = { #if defined(GLEW_OSMESA) +#elif defined(GLEW_EGL) #elif defined(_WIN32) -1, /* pixelformat */ #elif !defined(__HAIKU__) && !defined(__APPLE__) || defined(GLEW_APPLE_GLX) @@ -22,20 +23,26 @@ int main (int argc, char** argv) 0 /* flags */ }; +#if defined(GLEW_EGL) + typedef const GLubyte* (GLAPIENTRY * PFNGLGETSTRINGPROC) (GLenum name); + PFNGLGETSTRINGPROC getString; +#endif + if (glewParseArgs(argc-1, argv+1, ¶ms)) { fprintf(stderr, "Usage: glewinfo " #if defined(GLEW_OSMESA) +#elif defined(GLEW_EGL) #elif defined(_WIN32) - "[-pf ] " + "[-pf ] " #elif !defined(__HAIKU__) && !defined(__APPLE__) || defined(GLEW_APPLE_GLX) - "[-display ] " - "[-visual ] " + "[-display ] " + "[-visual ] " #endif - "[-version ] " - "[-profile core|compatibility] " - "[-flag debug|forward]" - "\n"); + "[-version ] " + "[-profile core|compatibility] " + "[-flag debug|forward]" + "\n"); return 1; } @@ -46,24 +53,24 @@ int main (int argc, char** argv) return 1; } glewExperimental = GL_TRUE; -#ifdef GLEW_MX - err = glewContextInit(glewGetContext()); -#if defined(GLEW_OSMESA) -#elif defined(_WIN32) - err = err || wglewContextInit(wglewGetContext()); -#elif !defined(__HAIKU__) && !defined(__APPLE__) || defined(GLEW_APPLE_GLX) - err = err || glxewContextInit(glxewGetContext()); -#endif - -#else err = glewInit(); -#endif if (GLEW_OK != err) { fprintf(stderr, "Error [main]: glewInit failed: %s\n", glewGetErrorString(err)); glewDestroyContext(); return 1; } + +#if defined(GLEW_EGL) + getString = (PFNGLGETSTRINGPROC) eglGetProcAddress("glGetString"); + if (!getString) + { + fprintf(stderr, "Error: eglGetProcAddress failed to fetch glGetString\n"); + glewDestroyContext(); + return 1; + } +#endif + #if defined(_WIN32) #if defined(_MSC_VER) && (_MSC_VER >= 1400) if (fopen_s(&f, "glewinfo.txt", "w") != 0) @@ -80,17 +87,26 @@ int main (int argc, char** argv) fprintf(f, "---------------------------\n\n"); fprintf(f, "GLEW version %s\n", glewGetString(GLEW_VERSION)); #if defined(GLEW_OSMESA) +#elif defined(GLEW_EGL) #elif defined(_WIN32) fprintf(f, "Reporting capabilities of pixelformat %d\n", params.pixelformat); #elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) - fprintf(f, "Reporting capabilities of display %s, visual 0x%x\n", + fprintf(f, "Reporting capabilities of display %s, visual 0x%x\n", params.display == NULL ? getenv("DISPLAY") : params.display, params.visual); #endif - fprintf(f, "Running on a %s from %s\n", - glGetString(GL_RENDERER), glGetString(GL_VENDOR)); +#if defined(GLEW_EGL) + fprintf(f, "Running on a %s from %s\n", + getString(GL_RENDERER), getString(GL_VENDOR)); + fprintf(f, "OpenGL version %s is supported\n", getString(GL_VERSION)); +#else + fprintf(f, "Running on a %s from %s\n", + glGetString(GL_RENDERER), glGetString(GL_VENDOR)); fprintf(f, "OpenGL version %s is supported\n", glGetString(GL_VERSION)); +#endif glewInfo(); #if defined(GLEW_OSMESA) +#elif defined(GLEW_EGL) + eglewInfo(); #elif defined(_WIN32) wglewInfo(); #else @@ -130,6 +146,7 @@ GLboolean glewParseArgs (int argc, char** argv, struct createParams *params) ++p; } #if defined(GLEW_OSMESA) +#elif defined(GLEW_EGL) #elif defined(_WIN32) else if (!strcmp(argv[p], "-pf") || !strcmp(argv[p], "-pixelformat")) { @@ -141,7 +158,7 @@ GLboolean glewParseArgs (int argc, char** argv, struct createParams *params) { if (++p >= argc) return GL_TRUE; params->display = argv[p++]; - } + } else if (!strcmp(argv[p], "-visual")) { if (++p >= argc) return GL_TRUE; @@ -156,7 +173,127 @@ GLboolean glewParseArgs (int argc, char** argv, struct createParams *params) /* ------------------------------------------------------------------------ */ -#if defined(GLEW_OSMESA) +#if defined(GLEW_EGL) +EGLDisplay display; +EGLContext ctx; + +/* See: http://stackoverflow.com/questions/12662227/opengl-es2-0-offscreen-context-for-fbo-rendering */ + +GLboolean glewCreateContext (struct createParams *params) +{ + EGLDeviceEXT devices[1]; + EGLint numDevices; + EGLSurface surface; + EGLint majorVersion, minorVersion; + EGLint configAttribs[] = { + EGL_SURFACE_TYPE, EGL_WINDOW_BIT, + EGL_RED_SIZE, 1, + EGL_GREEN_SIZE, 1, + EGL_BLUE_SIZE, 1, + EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT, + EGL_NONE + }; + static const EGLint contextAttribs[] = { + EGL_CONTEXT_CLIENT_VERSION, 2, + EGL_NONE + }; + static const EGLint pBufferAttribs[] = { + EGL_WIDTH, 128, + EGL_HEIGHT, 128, + EGL_NONE + }; + EGLConfig config; + EGLint numConfig; + EGLBoolean pBuffer; + + PFNEGLQUERYDEVICESEXTPROC queryDevices = NULL; + PFNEGLGETPLATFORMDISPLAYEXTPROC getPlatformDisplay = NULL; + PFNEGLGETERRORPROC getError = NULL; + PFNEGLGETDISPLAYPROC getDisplay = NULL; + PFNEGLINITIALIZEPROC initialize = NULL; + PFNEGLBINDAPIPROC bindAPI = NULL; + PFNEGLCHOOSECONFIGPROC chooseConfig = NULL; + PFNEGLCREATEWINDOWSURFACEPROC createWindowSurface = NULL; + PFNEGLCREATECONTEXTPROC createContext = NULL; + PFNEGLMAKECURRENTPROC makeCurrent = NULL; + PFNEGLCREATEPBUFFERSURFACEPROC createPbufferSurface = NULL; + + /* Load necessary entry points */ + queryDevices = (PFNEGLQUERYDEVICESEXTPROC) eglGetProcAddress("eglQueryDevicesEXT"); + getPlatformDisplay = (PFNEGLGETPLATFORMDISPLAYEXTPROC) eglGetProcAddress("eglGetPlatformDisplayEXT"); + getError = (PFNEGLGETERRORPROC) eglGetProcAddress("eglGetError"); + getDisplay = (PFNEGLGETDISPLAYPROC) eglGetProcAddress("eglGetDisplay"); + initialize = (PFNEGLINITIALIZEPROC) eglGetProcAddress("eglInitialize"); + bindAPI = (PFNEGLBINDAPIPROC) eglGetProcAddress("eglBindAPI"); + chooseConfig = (PFNEGLCHOOSECONFIGPROC) eglGetProcAddress("eglChooseConfig"); + createWindowSurface = (PFNEGLCREATEWINDOWSURFACEPROC) eglGetProcAddress("eglCreateWindowSurface"); + createPbufferSurface = (PFNEGLCREATEPBUFFERSURFACEPROC) eglGetProcAddress("eglCreatePbufferSurface"); + createContext = (PFNEGLCREATECONTEXTPROC) eglGetProcAddress("eglCreateContext"); + makeCurrent = (PFNEGLMAKECURRENTPROC) eglGetProcAddress("eglMakeCurrent"); + if (!getError || !getDisplay || !initialize || !bindAPI || !chooseConfig || !createWindowSurface || !createContext || !makeCurrent) + return GL_TRUE; + + pBuffer = 0; + display = EGL_NO_DISPLAY; + if (queryDevices && getPlatformDisplay) + { + queryDevices(1, devices, &numDevices); + if (numDevices==1) + { + /* Nvidia EGL doesn't need X11 for p-buffer surface */ + display = getPlatformDisplay(EGL_PLATFORM_DEVICE_EXT, devices[0], 0); + configAttribs[1] = EGL_PBUFFER_BIT; + pBuffer = 1; + } + } + if (display==EGL_NO_DISPLAY) + { + /* Fall-back to X11 surface, works on Mesa */ + display = getDisplay(EGL_DEFAULT_DISPLAY); + } + if (display == EGL_NO_DISPLAY) + return GL_TRUE; + + eglewInit(display); + + if (bindAPI(EGL_OPENGL_API) != EGL_TRUE) + return GL_TRUE; + + if (chooseConfig(display, configAttribs, &config, 1, &numConfig) != EGL_TRUE || (numConfig != 1)) + return GL_TRUE; + + ctx = createContext(display, config, EGL_NO_CONTEXT, pBuffer ? contextAttribs : NULL); + if (NULL == ctx) + return GL_TRUE; + + surface = EGL_NO_SURFACE; + /* Create a p-buffer surface if possible */ + if (pBuffer && createPbufferSurface) + { + surface = createPbufferSurface(display, config, pBufferAttribs); + } + /* Create a generic surface without a native window, if necessary */ + if (surface==EGL_NO_SURFACE) + { + surface = createWindowSurface(display, config, (EGLNativeWindowType) NULL, NULL); + } +#if 0 + if (surface == EGL_NO_SURFACE) + return GL_TRUE; +#endif + + if (makeCurrent(display, surface, surface, ctx) != EGL_TRUE) + return GL_TRUE; + + return GL_FALSE; +} + +void glewDestroyContext () +{ + if (NULL != ctx) eglDestroyContext(display, ctx); +} + +#elif defined(GLEW_OSMESA) OSMesaContext ctx; static const GLint osmFormat = GL_UNSIGNED_BYTE; @@ -201,7 +338,7 @@ GLboolean glewCreateContext (struct createParams* params) wc.lpszClassName = "GLEW"; if (0 == RegisterClass(&wc)) return GL_TRUE; /* create window */ - wnd = CreateWindow("GLEW", "GLEW", 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + wnd = CreateWindow("GLEW", "GLEW", 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, GetModuleHandle(NULL), NULL); if (NULL == wnd) return GL_TRUE; /* get the device context */ @@ -389,8 +526,8 @@ GLboolean glewCreateContext (struct createParams *params) cmap = XCreateColormap(dpy, RootWindow(dpy, vi->screen), vi->visual, AllocNone); swa.border_pixel = 0; swa.colormap = cmap; - wnd = XCreateWindow(dpy, RootWindow(dpy, vi->screen), - 0, 0, 1, 1, 0, vi->depth, InputOutput, vi->visual, + wnd = XCreateWindow(dpy, RootWindow(dpy, vi->screen), + 0, 0, 1, 1, 0, vi->depth, InputOutput, vi->visual, CWBorderPixel | CWColormap, &swa); /* make context current */ if (!glXMakeCurrent(dpy, wnd, ctx)) return GL_TRUE; diff --git a/auto/src/glewinfo_wgl.c b/auto/src/glewinfo_wgl.c index c80264e..9405667 100644 --- a/auto/src/glewinfo_wgl.c +++ b/auto/src/glewinfo_wgl.c @@ -2,7 +2,7 @@ /* ------------------------------------------------------------------------ */ -#if defined(_WIN32) && !defined(GLEW_OSMESA) +#if defined(_WIN32) && !defined(GLEW_EGL) && !defined(GLEW_OSMESA) static void wglewInfo () { diff --git a/auto/src/glxew_mid.h b/auto/src/glxew_mid.h index e9a3391..7fcf5d6 100644 --- a/auto/src/glxew_mid.h +++ b/auto/src/glxew_mid.h @@ -1,9 +1,4 @@ /* ------------------------------------------------------------------------- */ -#ifdef GLEW_MX -#define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT -#define GLXEW_VAR_EXPORT -#else #define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT #define GLXEW_VAR_EXPORT GLEW_VAR_EXPORT -#endif /* GLEW_MX */ diff --git a/auto/src/glxew_tail.h b/auto/src/glxew_tail.h index e086253..05ff1b1 100644 --- a/auto/src/glxew_tail.h +++ b/auto/src/glxew_tail.h @@ -1,26 +1,15 @@ /* ------------------------------------------------------------------------ */ -#ifdef GLEW_MX - -typedef struct GLXEWContextStruct GLXEWContext; -GLEWAPI GLenum GLEWAPIENTRY glxewContextInit (GLXEWContext *ctx); -GLEWAPI GLboolean GLEWAPIENTRY glxewContextIsSupported (const GLXEWContext *ctx, const char *name); - -#define glxewInit() glxewContextInit(glxewGetContext()) -#define glxewIsSupported(x) glxewContextIsSupported(glxewGetContext(), x) - -#define GLXEW_GET_VAR(x) (*(const GLboolean*)&(glxewGetContext()->x)) -#define GLXEW_GET_FUN(x) x - -#else /* GLEW_MX */ - GLEWAPI GLenum GLEWAPIENTRY glxewInit (); GLEWAPI GLboolean GLEWAPIENTRY glxewIsSupported (const char *name); +#ifndef GLXEW_GET_VAR #define GLXEW_GET_VAR(x) (*(const GLboolean*)&x) -#define GLXEW_GET_FUN(x) x +#endif -#endif /* GLEW_MX */ +#ifndef GLXEW_GET_FUN +#define GLXEW_GET_FUN(x) x +#endif GLEWAPI GLboolean GLEWAPIENTRY glxewGetExtension (const char *name); diff --git a/auto/src/header.html b/auto/src/header.html index f986557..80bc070 100644 --- a/auto/src/header.html +++ b/auto/src/header.html @@ -57,12 +57,15 @@ THE POSSIBILITY OF SUCH DAMAGE. - - + - - + + + + + +
Building
Installation
Source Generation
Credits & Copyright
Change Log

GitHub
Project Page
Bug Tracker
Issues
Pull Requests
Authors
Licensing

SourceForge Page

@@ -72,10 +75,11 @@ THE POSSIBILITY OF SUCH DAMAGE. - + diff --git a/auto/src/visualinfo.rc b/auto/src/visualinfo.rc index ed747df..5719592 100644 --- a/auto/src/visualinfo.rc +++ b/auto/src/visualinfo.rc @@ -1,18 +1,10 @@ #include -#ifdef GLEW_MX -# ifdef _DEBUG -# define FILENAME "visualinfo-mxd.exe" -# else -# define FILENAME "visualinfo-mx.exe" -# endif +#ifdef _DEBUG +# define FILENAME "visualinfod.exe" #else -# ifdef _DEBUG -# define FILENAME "visualinfod.exe" -# else -# define FILENAME "visualinfo.exe" -# endif +# define FILENAME "visualinfo.exe" #endif ///////////////////////////////////////////////////////////////////////////// diff --git a/auto/src/wglew_mid.h b/auto/src/wglew_mid.h index a0a5ade..25b1037 100644 --- a/auto/src/wglew_mid.h +++ b/auto/src/wglew_mid.h @@ -1,9 +1,4 @@ /* ------------------------------------------------------------------------- */ -#ifdef GLEW_MX -#define WGLEW_FUN_EXPORT -#define WGLEW_VAR_EXPORT -#else #define WGLEW_FUN_EXPORT GLEW_FUN_EXPORT #define WGLEW_VAR_EXPORT GLEW_VAR_EXPORT -#endif /* GLEW_MX */ diff --git a/auto/src/wglew_tail.h b/auto/src/wglew_tail.h index f48f36c..8971158 100644 --- a/auto/src/wglew_tail.h +++ b/auto/src/wglew_tail.h @@ -1,26 +1,15 @@ /* ------------------------------------------------------------------------- */ -#ifdef GLEW_MX - -typedef struct WGLEWContextStruct WGLEWContext; -GLEWAPI GLenum GLEWAPIENTRY wglewContextInit (WGLEWContext *ctx); -GLEWAPI GLboolean GLEWAPIENTRY wglewContextIsSupported (const WGLEWContext *ctx, const char *name); - -#define wglewInit() wglewContextInit(wglewGetContext()) -#define wglewIsSupported(x) wglewContextIsSupported(wglewGetContext(), x) - -#define WGLEW_GET_VAR(x) (*(const GLboolean*)&(wglewGetContext()->x)) -#define WGLEW_GET_FUN(x) wglewGetContext()->x - -#else /* GLEW_MX */ - GLEWAPI GLenum GLEWAPIENTRY wglewInit (); GLEWAPI GLboolean GLEWAPIENTRY wglewIsSupported (const char *name); +#ifndef WGLEW_GET_VAR #define WGLEW_GET_VAR(x) (*(const GLboolean*)&x) -#define WGLEW_GET_FUN(x) x +#endif -#endif /* GLEW_MX */ +#ifndef WGLEW_GET_FUN +#define WGLEW_GET_FUN(x) x +#endif GLEWAPI GLboolean GLEWAPIENTRY wglewGetExtension (const char *name); diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt index 1f458a7..9130e00 100644 --- a/build/cmake/CMakeLists.txt +++ b/build/cmake/CMakeLists.txt @@ -4,7 +4,9 @@ endif () project (glew) -cmake_minimum_required (VERSION 2.4) +cmake_minimum_required (VERSION 2.8.7) + +include(GNUInstallDirs) if (COMMAND cmake_policy) cmake_policy (SET CMP0003 NEW) @@ -13,8 +15,11 @@ endif() set(CMAKE_DEBUG_POSTFIX d) option (BUILD_UTILS "utilities" ON) -option (GLEW_REGAL "Regal mode" FALSE) -option (GLEW_OSMESA "OSMesa mode" FALSE) +option (GLEW_REGAL "Regal mode" OFF) +option (GLEW_OSMESA "OSMesa mode" OFF) +if (APPLE) + option (BUILD_FRAMEWORK "Build Framework bundle for OSX" OFF) +endif () set (GLEW_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../..) @@ -39,6 +44,8 @@ else () endif () find_package (OpenGL REQUIRED) +find_package (X11) + set (GLEW_LIBRARIES ${OPENGL_LIBRARIES}) add_definitions (-DGLEW_NO_GLU) @@ -65,39 +72,64 @@ if (GLEW_OSMESA) endif () add_definitions (-DGLEW_OSMESA) set (GLEW_LIBRARIES ${OSMESA_LIB_NAME} ${OPENGL_LIBRARIES}) + set (X11_LIBRARIES) endif () #### GLEW #### include_directories (${GLEW_DIR}/include) +set (GLEW_PUBLIC_HEADERS_FILES ${GLEW_DIR}/include/GL/wglew.h ${GLEW_DIR}/include/GL/glew.h ${GLEW_DIR}/include/GL/glxew.h) set (GLEW_SRC_FILES ${GLEW_DIR}/src/glew.c) if (WIN32) list (APPEND GLEW_SRC_FILES ${GLEW_DIR}/build/glew.rc) endif () -add_library (glew SHARED ${GLEW_SRC_FILES}) +add_library (glew SHARED ${GLEW_PUBLIC_HEADERS_FILES} ${GLEW_SRC_FILES}) set_target_properties (glew PROPERTIES COMPILE_DEFINITIONS "GLEW_BUILD" OUTPUT_NAME "${GLEW_LIB_NAME}" PREFIX "${DLL_PREFIX}") -add_library (glew_s STATIC ${GLEW_SRC_FILES}) +add_library (glew_s STATIC ${GLEW_PUBLIC_HEADERS_FILES} ${GLEW_SRC_FILES}) set_target_properties (glew_s PROPERTIES COMPILE_DEFINITIONS "GLEW_STATIC" OUTPUT_NAME "${GLEW_LIB_NAME}" PREFIX lib) -target_link_libraries (glew ${GLEW_LIBRARIES}) -target_link_libraries (glew_s ${GLEW_LIBRARIES}) -add_library(glewmx SHARED ${GLEW_SRC_FILES}) -set_target_properties (glewmx PROPERTIES COMPILE_DEFINITIONS "GLEW_BUILD;GLEW_MX" OUTPUT_NAME "${GLEW_LIB_NAME}mx" PREFIX "${DLL_PREFIX}") -add_library(glewmx_s STATIC ${GLEW_SRC_FILES}) -set_target_properties (glewmx_s PROPERTIES COMPILE_DEFINITIONS "GLEW_STATIC;GLEW_MX" OUTPUT_NAME "${GLEW_LIB_NAME}mx" PREFIX lib) -target_link_libraries (glewmx ${GLEW_LIBRARIES}) -target_link_libraries (glewmx_s ${GLEW_LIBRARIES}) +if (MSVC) + # add options from visual studio project + target_compile_definitions (glew PRIVATE "GLEW_BUILD;VC_EXTRALEAN") + target_compile_definitions (glew_s PRIVATE "GLEW_STATIC;VC_EXTRALEAN") + target_link_libraries (glew LINK_PRIVATE -BASE:0x62AA0000) + # kill security checks which are dependent on stdlib + target_compile_options (glew PRIVATE -GS-) + target_compile_options (glew_s PRIVATE -GS-) + # remove stdlib dependency + target_link_libraries (glew LINK_PRIVATE -nodefaultlib -noentry) +elseif (WIN32 AND ((CMAKE_C_COMPILER_ID MATCHES "GNU") OR (CMAKE_C_COMPILER_ID MATCHES "Clang"))) + # remove stdlib dependency on windows with GCC and Clang (for similar reasons + # as to MSVC - to allow it to be used with any Windows compiler) + target_compile_options (glew PRIVATE -fno-builtin -fno-stack-protector) + target_compile_options (glew_s PRIVATE -fno-builtin -fno-stack-protector) + target_link_libraries (glew LINK_PRIVATE -nostdlib) +endif () + +if (BUILD_FRAMEWORK) + set_target_properties(glew PROPERTIES + FRAMEWORK TRUE + FRAMEWORK_VERSION ${GLEW_VERSION} + MACOSX_FRAMEWORK_IDENTIFIER net.sourceforge.glew + MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${GLEW_VERSION} + MACOSX_FRAMEWORK_BUNDLE_VERSION ${GLEW_VERSION} + XCODE_ATTRIBUTE_INSTALL_PATH "@rpath" + PUBLIC_HEADER "${GLEW_PUBLIC_HEADERS_FILES}" + OUTPUT_NAME GLEW + ) +endif() + +target_link_libraries (glew LINK_PUBLIC ${GLEW_LIBRARIES}) +target_link_libraries (glew_s ${GLEW_LIBRARIES}) if(CMAKE_VERSION VERSION_LESS 2.8.12) set(MAYBE_EXPORT "") else() target_compile_definitions(glew_s INTERFACE "GLEW_STATIC") - target_compile_definitions(glewmx INTERFACE "GLEW_MX") - target_compile_definitions(glewmx_s INTERFACE "GLEW_STATIC;GLEW_MX") - foreach(t glew glew_s glewmx glewmx_s) + foreach(t glew glew_s) target_include_directories(${t} PUBLIC $) endforeach() set(MAYBE_EXPORT EXPORT glew-targets) @@ -105,18 +137,19 @@ endif() set(targets_to_install "") if(NOT DEFINED BUILD_SHARED_LIBS OR BUILD_SHARED_LIBS) - list(APPEND targets_to_install glew glewmx) + list(APPEND targets_to_install glew) endif() if(NOT DEFINED BUILD_SHARED_LIBS OR NOT BUILD_SHARED_LIBS) - list(APPEND targets_to_install glew_s glewmx_s) + list(APPEND targets_to_install glew_s) endif() install ( TARGETS ${targets_to_install} ${MAYBE_EXPORT} - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + FRAMEWORK DESTINATION ${CMAKE_INSTALL_PREFIX} ) if (BUILD_UTILS) @@ -126,6 +159,9 @@ if (BUILD_UTILS) endif () add_executable (glewinfo ${GLEWINFO_SRC_FILES}) target_link_libraries (glewinfo glew) + if (NOT WIN32) + target_link_libraries(glewinfo ${X11_LIBRARIES}) + endif () set (VISUALINFO_SRC_FILES ${GLEW_DIR}/src/visualinfo.c) if (WIN32) @@ -133,40 +169,47 @@ if (BUILD_UTILS) endif () add_executable (visualinfo ${VISUALINFO_SRC_FILES}) target_link_libraries (visualinfo glew) + if (NOT WIN32) + target_link_libraries(visualinfo ${X11_LIBRARIES}) + endif () install ( TARGETS glewinfo visualinfo - DESTINATION bin) + DESTINATION ${CMAKE_INSTALL_BINDIR}) endif () set (prefix ${CMAKE_INSTALL_PREFIX}) -set (exec_prefix \${prefix}) -set (libdir \${prefix}/lib) -set (includedir \${prefix}/include) -set (includedir \${prefix}/include) +set (exec_prefix ${CMAKE_INSTALL_PREFIX}) +set (libdir ${CMAKE_INSTALL_FULL_LIBDIR}) +set (includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}) set (version ${GLEW_VERSION}) set (libname ${GLEW_LIB_NAME}) set (cflags) set (requireslib glu) configure_file (${GLEW_DIR}/glew.pc.in ${GLEW_DIR}/glew.pc @ONLY) -set (cflags "-DGLEW_MX") -set (libname ${GLEW_LIB_NAME}mx) -configure_file (${GLEW_DIR}/glew.pc.in ${GLEW_DIR}/glewmx.pc @ONLY) -install(FILES ${GLEW_DIR}/glew.pc ${GLEW_DIR}/glewmx.pc - DESTINATION lib/pkgconfig +install(FILES ${GLEW_DIR}/glew.pc + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) +if(WIN32 AND (NOT MSVC_VERSION LESS 1600) AND (NOT CMAKE_VERSION VERSION_LESS "3.1")) + install( + FILES $ + DESTINATION ${CMAKE_INSTALL_LIBDIR} + CONFIGURATIONS Debug RelWithDebInfo + ) +endif() + install (FILES ${GLEW_DIR}/include/GL/wglew.h ${GLEW_DIR}/include/GL/glew.h ${GLEW_DIR}/include/GL/glxew.h - DESTINATION include/GL) + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GL) if(MAYBE_EXPORT) - install(EXPORT glew-targets DESTINATION lib/cmake/glew + install(EXPORT glew-targets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/glew NAMESPACE GLEW::) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/glew-config.cmake ${CMAKE_CURRENT_SOURCE_DIR}/CopyImportedTargetProperties.cmake - DESTINATION lib/cmake/glew) + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/glew) endif() diff --git a/build/cmake/glew-config.cmake b/build/cmake/glew-config.cmake index 29efcbe..0b79c0b 100644 --- a/build/cmake/glew-config.cmake +++ b/build/cmake/glew-config.cmake @@ -1,23 +1,23 @@ # This config-module creates the following import libraries: # -# - GLEW::glew and GLEW::glewmx shared libs -# - GLEW::glew_s and GLEW::glewmx_s static libs +# - GLEW::glew shared lib +# - GLEW::glew_s static lib # -# Additionally GLEW::GLEW and GLEW::GLEWMX will be created as an +# Additionally GLEW::GLEW will be created as an # copy of either the shared (default) or the static libs. # # Dependending on the setting of BUILD_SHARED_LIBS at GLEW build time # either the static or shared versions may not be available. # # Set GLEW_USE_STATIC_LIBS to OFF or ON to force using the shared -# or static libs for GLEW::GLEW and GLEW::GLEWMX +# or static lib for GLEW::GLEW # include(${CMAKE_CURRENT_LIST_DIR}/glew-targets.cmake) include(${CMAKE_CURRENT_LIST_DIR}/CopyImportedTargetProperties.cmake) -# decide which import library (glew/glew_s and glewmx/glewmx_s) -# needs to be copied to GLEW::GLEW and GLEW::GLEWMX +# decide which import library (glew/glew_s) +# needs to be copied to GLEW::GLEW set(_glew_target_postfix "") set(_glew_target_type SHARED) if(DEFINED GLEW_USE_STATIC_LIBS) @@ -37,7 +37,7 @@ endif() # CMake doesn't allow creating ALIAS lib for an IMPORTED lib # so create imported ones and copy the properties -foreach(_glew_target glew glewmx) +foreach(_glew_target glew) set(_glew_src_target "GLEW::${_glew_target}${_glew_target_postfix}") string(TOUPPER "GLEW::${_glew_target}" _glew_dest_target) if(TARGET ${_glew_dest_target}) diff --git a/build/vc10/glew.sln b/build/vc10/glew.sln index 9a2d169..a3d671e 100644 --- a/build/vc10/glew.sln +++ b/build/vc10/glew.sln @@ -11,76 +11,40 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "visualinfo", "visualinfo.vc EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug MX|Win32 = Debug MX|Win32 - Debug MX|x64 = Debug MX|x64 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 - Release MX|Win32 = Release MX|Win32 - Release MX|x64 = Release MX|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug MX|Win32.ActiveCfg = Debug MX|Win32 - {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug MX|Win32.Build.0 = Debug MX|Win32 - {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug MX|x64.ActiveCfg = Debug MX|x64 - {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug MX|x64.Build.0 = Debug MX|x64 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug|Win32.ActiveCfg = Debug|Win32 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug|Win32.Build.0 = Debug|Win32 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug|x64.ActiveCfg = Debug|x64 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug|x64.Build.0 = Debug|x64 - {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release MX|Win32.ActiveCfg = Release MX|Win32 - {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release MX|Win32.Build.0 = Release MX|Win32 - {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release MX|x64.ActiveCfg = Release MX|x64 - {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release MX|x64.Build.0 = Release MX|x64 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release|Win32.ActiveCfg = Release|Win32 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release|Win32.Build.0 = Release|Win32 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release|x64.ActiveCfg = Release|x64 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release|x64.Build.0 = Release|x64 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug MX|Win32.ActiveCfg = Debug MX|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug MX|Win32.Build.0 = Debug MX|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug MX|x64.ActiveCfg = Debug MX|x64 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug MX|x64.Build.0 = Debug MX|x64 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|Win32.ActiveCfg = Debug|Win32 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|Win32.Build.0 = Debug|Win32 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|x64.ActiveCfg = Debug|x64 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|x64.Build.0 = Debug|x64 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release MX|Win32.ActiveCfg = Release MX|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release MX|Win32.Build.0 = Release MX|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release MX|x64.ActiveCfg = Release MX|x64 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release MX|x64.Build.0 = Release MX|x64 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|Win32.ActiveCfg = Release|Win32 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|Win32.Build.0 = Release|Win32 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|x64.ActiveCfg = Release|x64 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|x64.Build.0 = Release|x64 - {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug MX|Win32.ActiveCfg = Debug MX|Win32 - {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug MX|Win32.Build.0 = Debug MX|Win32 - {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug MX|x64.ActiveCfg = Debug MX|x64 - {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug MX|x64.Build.0 = Debug MX|x64 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug|Win32.ActiveCfg = Debug|Win32 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug|Win32.Build.0 = Debug|Win32 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug|x64.ActiveCfg = Debug|x64 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug|x64.Build.0 = Debug|x64 - {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release MX|Win32.ActiveCfg = Release MX|Win32 - {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release MX|Win32.Build.0 = Release MX|Win32 - {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release MX|x64.ActiveCfg = Release MX|x64 - {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release MX|x64.Build.0 = Release MX|x64 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release|Win32.ActiveCfg = Release|Win32 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release|Win32.Build.0 = Release|Win32 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release|x64.ActiveCfg = Release|x64 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release|x64.Build.0 = Release|x64 - {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug MX|Win32.ActiveCfg = Debug MX|Win32 - {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug MX|Win32.Build.0 = Debug MX|Win32 - {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug MX|x64.ActiveCfg = Debug MX|x64 - {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug MX|x64.Build.0 = Debug MX|x64 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug|Win32.ActiveCfg = Debug|Win32 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug|Win32.Build.0 = Debug|Win32 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug|x64.ActiveCfg = Debug|x64 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug|x64.Build.0 = Debug|x64 - {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release MX|Win32.ActiveCfg = Release MX|Win32 - {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release MX|Win32.Build.0 = Release MX|Win32 - {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release MX|x64.ActiveCfg = Release MX|x64 - {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release MX|x64.Build.0 = Release MX|x64 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release|Win32.ActiveCfg = Release|Win32 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release|Win32.Build.0 = Release|Win32 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release|x64.ActiveCfg = Release|x64 diff --git a/build/vc10/glew_shared.vcxproj b/build/vc10/glew_shared.vcxproj index 41a9a54..e1149d9 100644 --- a/build/vc10/glew_shared.vcxproj +++ b/build/vc10/glew_shared.vcxproj @@ -1,14 +1,6 @@ - - Debug MX - Win32 - - - Debug MX - x64 - Debug Win32 @@ -17,14 +9,6 @@ Debug x64 - - Release MX - Win32 - - - Release MX - x64 - Release Win32 @@ -48,14 +32,6 @@ DynamicLibrary false - - DynamicLibrary - false - - - DynamicLibrary - false - DynamicLibrary false @@ -64,14 +40,6 @@ DynamicLibrary false - - DynamicLibrary - false - - - DynamicLibrary - false - @@ -81,37 +49,13 @@ - - - - - - - - - - - - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - glew32mx - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - glew32mx - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ @@ -124,18 +68,6 @@ false glew32 - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - glew32mxd - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - glew32mxd - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ @@ -148,81 +80,6 @@ false glew32d - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - $(INCLUDE_DIR) - WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_MX;GLEW_BUILD;%(PreprocessorDefinitions) - - - true - NDEBUG;%(PreprocessorDefinitions) - true - Win32 - - - 0x0409 - NDEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - true - Console - $(OutDir)$(TargetName)$(TargetExt) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib - 0x62AA0000 - opengl32.lib;%(AdditionalDependencies) - /ignore:4089 - - - - - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - $(INCLUDE_DIR) - WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_MX;GLEW_BUILD;%(PreprocessorDefinitions) - - - true - NDEBUG;%(PreprocessorDefinitions) - true - - - 0x0409 - NDEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - true - Console - $(OutDir)$(TargetName)$(TargetExt) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib - 0x62AA0000 - opengl32.lib;%(AdditionalDependencies) - /ignore:4089 - - - - MultiThreaded @@ -234,6 +91,7 @@ Level3 $(INCLUDE_DIR) WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_BUILD;%(PreprocessorDefinitions) + false true @@ -259,6 +117,8 @@ /ignore:4089 + true + true @@ -272,6 +132,7 @@ Level3 $(INCLUDE_DIR) WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_BUILD;%(PreprocessorDefinitions) + false true @@ -296,81 +157,8 @@ /ignore:4089 - - - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - $(INCLUDE_DIR) - WIN32;WIN32_MEAN_AND_LEAN;VC_EXTRALEAN;GLEW_MX;GLEW_BUILD;%(PreprocessorDefinitions) - EnableFastChecks - - - true - _DEBUG;%(PreprocessorDefinitions) - true - Win32 - - - 0x0409 - _DEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - true - true - Console - $(OutDir)$(TargetName)$(TargetExt) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib - 0x62AA0000 - opengl32.lib;%(AdditionalDependencies) - - - - - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - $(INCLUDE_DIR) - WIN32;WIN32_MEAN_AND_LEAN;VC_EXTRALEAN;GLEW_MX;GLEW_BUILD;%(PreprocessorDefinitions) - EnableFastChecks - - - true - _DEBUG;%(PreprocessorDefinitions) - true - - - 0x0409 - _DEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - true - true - Console - $(OutDir)$(TargetName)$(TargetExt) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib - 0x62AA0000 - opengl32.lib;%(AdditionalDependencies) - - + true + true @@ -384,6 +172,7 @@ EnableFastChecks Level3 $(INCLUDE_DIR) + false true @@ -422,6 +211,7 @@ EnableFastChecks Level3 $(INCLUDE_DIR) + false true diff --git a/build/vc10/glew_static.vcxproj b/build/vc10/glew_static.vcxproj index 5dccd6a..949db96 100644 --- a/build/vc10/glew_static.vcxproj +++ b/build/vc10/glew_static.vcxproj @@ -1,14 +1,6 @@ - - Debug MX - Win32 - - - Debug MX - x64 - Debug Win32 @@ -17,14 +9,6 @@ Debug x64 - - Release MX - Win32 - - - Release MX - x64 - Release Win32 @@ -56,16 +40,6 @@ false MultiByte - - StaticLibrary - false - MultiByte - - - StaticLibrary - false - MultiByte - StaticLibrary false @@ -76,16 +50,6 @@ false MultiByte - - StaticLibrary - false - MultiByte - - - StaticLibrary - false - MultiByte - @@ -101,35 +65,13 @@ - - - - - - - - - - - - - - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - glew32mxsd - - - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - glew32mxsd - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ @@ -140,16 +82,6 @@ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ glew32s - - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - glew32mxs - - - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - glew32mxs - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ @@ -168,56 +100,6 @@ $(LIB_DIR)\$(Configuration)\$(PlatformName)\ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - ../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - EnableFastChecks - - - 0x0409 - _DEBUG;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - - - true - - - true - $(OutDir)$(TargetName)$(TargetExt) - MachineX86 - - - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - ../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - EnableFastChecks - - - 0x0409 - _DEBUG;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - - - true - - - true - $(OutDir)$(TargetName)$(TargetExt) - MachineX64 - - MultiThreaded @@ -229,6 +111,7 @@ Level3 ../../include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_STATIC;%(PreprocessorDefinitions) + false 0x0409 @@ -254,6 +137,7 @@ Level3 ../../include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_STATIC;%(PreprocessorDefinitions) + false 0x0409 @@ -268,56 +152,6 @@ MachineX64 - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - - - 0x0409 - NDEBUG;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - - - true - - - true - $(OutDir)$(TargetName)$(TargetExt) - MachineX86 - - - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - - - 0x0409 - NDEBUG;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - - - true - - - true - $(OutDir)$(TargetName)$(TargetExt) - MachineX64 - - MultiThreadedDebugDLL @@ -328,6 +162,7 @@ Level3 WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_STATIC;%(PreprocessorDefinitions) EnableFastChecks + false 0x0409 @@ -352,6 +187,7 @@ Level3 WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_STATIC;%(PreprocessorDefinitions) EnableFastChecks + false 0x0409 diff --git a/build/vc10/glewinfo.vcxproj b/build/vc10/glewinfo.vcxproj index 04a0675..5361664 100644 --- a/build/vc10/glewinfo.vcxproj +++ b/build/vc10/glewinfo.vcxproj @@ -1,14 +1,6 @@ - - Debug MX - Win32 - - - Debug MX - x64 - Debug Win32 @@ -17,14 +9,6 @@ Debug x64 - - Release MX - Win32 - - - Release MX - x64 - Release Win32 @@ -62,22 +46,6 @@ Application false - - Application - false - - - Application - false - - - Application - false - - - Application - false - @@ -99,43 +67,7 @@ - - - - - - - - - - - - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - glewinfo-mx - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - glewinfo-mx - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - glewinfo-mxd - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - glewinfo-mxd - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ @@ -170,124 +102,6 @@ glewinfo tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - WIN32;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - .\..\..\bin\glewinfo.tlb - - - 0x0409 - NDEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - Console - $(OutDir)$(TargetName)$(TargetExt) - glew32mxs.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - WIN32;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - .\..\..\bin\glewinfo.tlb - - - 0x0409 - NDEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - Console - $(OutDir)$(TargetName)$(TargetExt) - glew32mxs.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - EnableFastChecks - - - .\..\..\bin\glewinfo.tlb - - - 0x0409 - _DEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - true - Console - $(OutDir)$(TargetName)$(TargetExt) - glew32mxsd.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - EnableFastChecks - - - .\..\..\bin\glewinfo.tlb - - - 0x0409 - _DEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - true - Console - $(OutDir)$(TargetName)$(TargetExt) - glew32mxsd.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - MultiThreadedDebugDLL diff --git a/build/vc10/visualinfo.vcxproj b/build/vc10/visualinfo.vcxproj index d05ff9d..f684265 100644 --- a/build/vc10/visualinfo.vcxproj +++ b/build/vc10/visualinfo.vcxproj @@ -1,14 +1,6 @@ - - Debug MX - Win32 - - - Debug MX - x64 - Debug Win32 @@ -17,14 +9,6 @@ Debug x64 - - Release MX - Win32 - - - Release MX - x64 - Release Win32 @@ -54,14 +38,6 @@ Application false - - Application - false - - - Application - false - Application false @@ -70,14 +46,6 @@ Application false - - Application - false - - - Application - false - @@ -93,37 +61,13 @@ - - - - - - - - - - - - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - visualinfo-mxd - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - visualinfo-mxd - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ @@ -136,18 +80,6 @@ false visualinfod - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - visualinfo-mx - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - visualinfo-mx - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ @@ -169,66 +101,6 @@ ..\..\bin/ visualinfo - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - EnableFastChecks - - - .\..\..\bin\visualinfo.tlb - - - 0x0409 - _DEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - true - Console - $(OutDir)$(TargetName)$(TargetExt) - glew32mxsd.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - EnableFastChecks - - - .\..\..\bin\visualinfo.tlb - - - 0x0409 - _DEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - true - Console - $(OutDir)$(TargetName)$(TargetExt) - glew32mxsd.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - MultiThreadedDebugDLL @@ -289,64 +161,6 @@ $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - .\..\..\bin\visualinfo.tlb - - - 0x0409 - NDEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - Console - $(OutDir)$(TargetName)$(TargetExt) - glew32mxs.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - WIN32;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - .\..\..\bin\visualinfo.tlb - - - 0x0409 - NDEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - Console - $(OutDir)$(TargetName)$(TargetExt) - glew32mxs.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - MultiThreaded diff --git a/build/vc12/glew.sln b/build/vc12/glew.sln index 9a2d169..a3d671e 100644 --- a/build/vc12/glew.sln +++ b/build/vc12/glew.sln @@ -11,76 +11,40 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "visualinfo", "visualinfo.vc EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug MX|Win32 = Debug MX|Win32 - Debug MX|x64 = Debug MX|x64 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 - Release MX|Win32 = Release MX|Win32 - Release MX|x64 = Release MX|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug MX|Win32.ActiveCfg = Debug MX|Win32 - {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug MX|Win32.Build.0 = Debug MX|Win32 - {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug MX|x64.ActiveCfg = Debug MX|x64 - {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug MX|x64.Build.0 = Debug MX|x64 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug|Win32.ActiveCfg = Debug|Win32 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug|Win32.Build.0 = Debug|Win32 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug|x64.ActiveCfg = Debug|x64 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug|x64.Build.0 = Debug|x64 - {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release MX|Win32.ActiveCfg = Release MX|Win32 - {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release MX|Win32.Build.0 = Release MX|Win32 - {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release MX|x64.ActiveCfg = Release MX|x64 - {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release MX|x64.Build.0 = Release MX|x64 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release|Win32.ActiveCfg = Release|Win32 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release|Win32.Build.0 = Release|Win32 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release|x64.ActiveCfg = Release|x64 {55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release|x64.Build.0 = Release|x64 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug MX|Win32.ActiveCfg = Debug MX|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug MX|Win32.Build.0 = Debug MX|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug MX|x64.ActiveCfg = Debug MX|x64 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug MX|x64.Build.0 = Debug MX|x64 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|Win32.ActiveCfg = Debug|Win32 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|Win32.Build.0 = Debug|Win32 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|x64.ActiveCfg = Debug|x64 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|x64.Build.0 = Debug|x64 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release MX|Win32.ActiveCfg = Release MX|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release MX|Win32.Build.0 = Release MX|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release MX|x64.ActiveCfg = Release MX|x64 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release MX|x64.Build.0 = Release MX|x64 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|Win32.ActiveCfg = Release|Win32 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|Win32.Build.0 = Release|Win32 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|x64.ActiveCfg = Release|x64 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|x64.Build.0 = Release|x64 - {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug MX|Win32.ActiveCfg = Debug MX|Win32 - {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug MX|Win32.Build.0 = Debug MX|Win32 - {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug MX|x64.ActiveCfg = Debug MX|x64 - {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug MX|x64.Build.0 = Debug MX|x64 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug|Win32.ActiveCfg = Debug|Win32 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug|Win32.Build.0 = Debug|Win32 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug|x64.ActiveCfg = Debug|x64 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug|x64.Build.0 = Debug|x64 - {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release MX|Win32.ActiveCfg = Release MX|Win32 - {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release MX|Win32.Build.0 = Release MX|Win32 - {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release MX|x64.ActiveCfg = Release MX|x64 - {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release MX|x64.Build.0 = Release MX|x64 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release|Win32.ActiveCfg = Release|Win32 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release|Win32.Build.0 = Release|Win32 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release|x64.ActiveCfg = Release|x64 {8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release|x64.Build.0 = Release|x64 - {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug MX|Win32.ActiveCfg = Debug MX|Win32 - {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug MX|Win32.Build.0 = Debug MX|Win32 - {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug MX|x64.ActiveCfg = Debug MX|x64 - {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug MX|x64.Build.0 = Debug MX|x64 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug|Win32.ActiveCfg = Debug|Win32 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug|Win32.Build.0 = Debug|Win32 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug|x64.ActiveCfg = Debug|x64 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug|x64.Build.0 = Debug|x64 - {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release MX|Win32.ActiveCfg = Release MX|Win32 - {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release MX|Win32.Build.0 = Release MX|Win32 - {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release MX|x64.ActiveCfg = Release MX|x64 - {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release MX|x64.Build.0 = Release MX|x64 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release|Win32.ActiveCfg = Release|Win32 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release|Win32.Build.0 = Release|Win32 {79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release|x64.ActiveCfg = Release|x64 diff --git a/build/vc12/glew_shared.vcxproj b/build/vc12/glew_shared.vcxproj index af9d7b7..b52bcc4 100644 --- a/build/vc12/glew_shared.vcxproj +++ b/build/vc12/glew_shared.vcxproj @@ -1,14 +1,6 @@  - - Debug MX - Win32 - - - Debug MX - x64 - Debug Win32 @@ -17,14 +9,6 @@ Debug x64 - - Release MX - Win32 - - - Release MX - x64 - Release Win32 @@ -50,16 +34,6 @@ false v120 - - DynamicLibrary - false - v120 - - - DynamicLibrary - false - v120 - DynamicLibrary false @@ -70,16 +44,6 @@ false v120 - - DynamicLibrary - false - v120 - - - DynamicLibrary - false - v120 - @@ -89,37 +53,13 @@ - - - - - - - - - - - - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - glew32mx - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - glew32mx - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ @@ -132,18 +72,6 @@ false glew32 - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - glew32mxd - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - glew32mxd - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ @@ -156,81 +84,6 @@ false glew32d - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - $(INCLUDE_DIR) - WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_MX;GLEW_BUILD;%(PreprocessorDefinitions) - - - true - NDEBUG;%(PreprocessorDefinitions) - true - Win32 - - - 0x0409 - NDEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - true - Console - $(OutDir)$(TargetName)$(TargetExt) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib - 0x62AA0000 - opengl32.lib;%(AdditionalDependencies) - /ignore:4089 - - - - - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - $(INCLUDE_DIR) - WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_MX;GLEW_BUILD;%(PreprocessorDefinitions) - - - true - NDEBUG;%(PreprocessorDefinitions) - true - - - 0x0409 - NDEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - true - Console - $(OutDir)$(TargetName)$(TargetExt) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib - 0x62AA0000 - opengl32.lib;%(AdditionalDependencies) - /ignore:4089 - - - - MultiThreaded @@ -242,6 +95,7 @@ Level3 $(INCLUDE_DIR) WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_BUILD;%(PreprocessorDefinitions) + false true @@ -267,6 +121,8 @@ /ignore:4089 + true + true @@ -280,6 +136,7 @@ Level3 $(INCLUDE_DIR) WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_BUILD;%(PreprocessorDefinitions) + false true @@ -304,81 +161,8 @@ /ignore:4089 - - - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - $(INCLUDE_DIR) - WIN32;WIN32_MEAN_AND_LEAN;VC_EXTRALEAN;GLEW_MX;GLEW_BUILD;%(PreprocessorDefinitions) - EnableFastChecks - - - true - _DEBUG;%(PreprocessorDefinitions) - true - Win32 - - - 0x0409 - _DEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - true - true - Console - $(OutDir)$(TargetName)$(TargetExt) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib - 0x62AA0000 - opengl32.lib;%(AdditionalDependencies) - - - - - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - $(INCLUDE_DIR) - WIN32;WIN32_MEAN_AND_LEAN;VC_EXTRALEAN;GLEW_MX;GLEW_BUILD;%(PreprocessorDefinitions) - EnableFastChecks - - - true - _DEBUG;%(PreprocessorDefinitions) - true - - - 0x0409 - _DEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - true - true - Console - $(OutDir)$(TargetName)$(TargetExt) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib - 0x62AA0000 - opengl32.lib;%(AdditionalDependencies) - - + true + true @@ -392,6 +176,7 @@ EnableFastChecks Level3 $(INCLUDE_DIR) + false true @@ -430,6 +215,7 @@ EnableFastChecks Level3 $(INCLUDE_DIR) + false true @@ -469,4 +255,4 @@ - \ No newline at end of file + diff --git a/build/vc12/glew_static.vcxproj b/build/vc12/glew_static.vcxproj index 85c4be5..61adc41 100644 --- a/build/vc12/glew_static.vcxproj +++ b/build/vc12/glew_static.vcxproj @@ -1,14 +1,6 @@  - - Debug MX - Win32 - - - Debug MX - x64 - Debug Win32 @@ -17,14 +9,6 @@ Debug x64 - - Release MX - Win32 - - - Release MX - x64 - Release Win32 @@ -58,18 +42,6 @@ MultiByte v120 - - StaticLibrary - false - MultiByte - v120 - - - StaticLibrary - false - MultiByte - v120 - StaticLibrary false @@ -82,18 +54,6 @@ MultiByte v120 - - StaticLibrary - false - MultiByte - v120 - - - StaticLibrary - false - MultiByte - v120 - @@ -109,35 +69,13 @@ - - - - - - - - - - - - - - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - glew32mxsd - - - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - glew32mxsd - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ @@ -148,16 +86,6 @@ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ glew32s - - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - glew32mxs - - - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - glew32mxs - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ @@ -176,56 +104,6 @@ $(LIB_DIR)\$(Configuration)\$(PlatformName)\ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - ../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - EnableFastChecks - - - 0x0409 - _DEBUG;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - - - true - - - true - $(OutDir)$(TargetName)$(TargetExt) - MachineX86 - - - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - ../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - EnableFastChecks - - - 0x0409 - _DEBUG;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - - - true - - - true - $(OutDir)$(TargetName)$(TargetExt) - MachineX64 - - MultiThreaded @@ -237,6 +115,7 @@ Level3 ../../include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_STATIC;%(PreprocessorDefinitions) + false 0x0409 @@ -262,6 +141,7 @@ Level3 ../../include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_STATIC;%(PreprocessorDefinitions) + false 0x0409 @@ -276,56 +156,6 @@ MachineX64 - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - - - 0x0409 - NDEBUG;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - - - true - - - true - $(OutDir)$(TargetName)$(TargetExt) - MachineX86 - - - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - - - 0x0409 - NDEBUG;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions) - - - true - - - true - $(OutDir)$(TargetName)$(TargetExt) - MachineX64 - - MultiThreadedDebugDLL @@ -336,6 +166,7 @@ Level3 WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_STATIC;%(PreprocessorDefinitions) EnableFastChecks + false 0x0409 @@ -360,6 +191,7 @@ Level3 WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_STATIC;%(PreprocessorDefinitions) EnableFastChecks + false 0x0409 diff --git a/build/vc12/glewinfo.vcxproj b/build/vc12/glewinfo.vcxproj index 4a82364..8b38665 100644 --- a/build/vc12/glewinfo.vcxproj +++ b/build/vc12/glewinfo.vcxproj @@ -1,14 +1,6 @@  - - Debug MX - Win32 - - - Debug MX - x64 - Debug Win32 @@ -17,14 +9,6 @@ Debug x64 - - Release MX - Win32 - - - Release MX - x64 - Release Win32 @@ -66,26 +50,6 @@ false v120 - - Application - false - v120 - - - Application - false - v120 - - - Application - false - v120 - - - Application - false - v120 - @@ -107,43 +71,7 @@ - - - - - - - - - - - - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - glewinfo-mx - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - glewinfo-mx - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - glewinfo-mxd - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - glewinfo-mxd - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ @@ -178,124 +106,6 @@ glewinfo tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - WIN32;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - .\..\..\bin\glewinfo.tlb - - - 0x0409 - NDEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - Console - $(OutDir)$(TargetName)$(TargetExt) - glew32mxs.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - WIN32;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - .\..\..\bin\glewinfo.tlb - - - 0x0409 - NDEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - Console - $(OutDir)$(TargetName)$(TargetExt) - glew32mxs.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - EnableFastChecks - - - .\..\..\bin\glewinfo.tlb - - - 0x0409 - _DEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - true - Console - $(OutDir)$(TargetName)$(TargetExt) - glew32mxsd.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - EnableFastChecks - - - .\..\..\bin\glewinfo.tlb - - - 0x0409 - _DEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - true - Console - $(OutDir)$(TargetName)$(TargetExt) - glew32mxsd.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - MultiThreadedDebugDLL diff --git a/build/vc12/visualinfo.vcxproj b/build/vc12/visualinfo.vcxproj index e6e2a8b..20b9e6a 100644 --- a/build/vc12/visualinfo.vcxproj +++ b/build/vc12/visualinfo.vcxproj @@ -1,14 +1,6 @@  - - Debug MX - Win32 - - - Debug MX - x64 - Debug Win32 @@ -17,14 +9,6 @@ Debug x64 - - Release MX - Win32 - - - Release MX - x64 - Release Win32 @@ -56,16 +40,6 @@ false v120 - - Application - false - v120 - - - Application - false - v120 - Application false @@ -76,16 +50,6 @@ false v120 - - Application - false - v120 - - - Application - false - v120 - @@ -101,37 +65,13 @@ - - - - - - - - - - - - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - visualinfo-mxd - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - visualinfo-mxd - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ @@ -144,18 +84,6 @@ false visualinfod - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - visualinfo-mx - - - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ - tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ - false - visualinfo-mx - $(BIN_DIR)\$(Configuration)\$(PlatformName)\ tmp\$(TargetName)\$(Configuration)\$(PlatformName)\ @@ -177,66 +105,6 @@ ..\..\bin/ visualinfo - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - EnableFastChecks - - - .\..\..\bin\visualinfo.tlb - - - 0x0409 - _DEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - true - Console - $(OutDir)$(TargetName)$(TargetExt) - glew32mxsd.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - EnableFastChecks - - - .\..\..\bin\visualinfo.tlb - - - 0x0409 - _DEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - true - Console - $(OutDir)$(TargetName)$(TargetExt) - glew32mxsd.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - MultiThreadedDebugDLL @@ -297,64 +165,6 @@ $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - .\..\..\bin\visualinfo.tlb - - - 0x0409 - NDEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - Console - $(OutDir)$(TargetName)$(TargetExt) - glew32mxs.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - WIN32;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - .\..\..\bin\visualinfo.tlb - - - 0x0409 - NDEBUG;GLEW_MX;%(PreprocessorDefinitions) - - - true - - - true - Console - $(OutDir)$(TargetName)$(TargetExt) - glew32mxs.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies) - $(LIB_DIR)\$(Configuration)\$(PlatformName)\ - - MultiThreaded diff --git a/build/vc6/Makefile b/build/vc6/Makefile index 9f0ab41..5a4f5d6 100644 --- a/build/vc6/Makefile +++ b/build/vc6/Makefile @@ -8,13 +8,6 @@ default: "glewinfo - Win32 Release" \ "visualinfo - Win32 Release" /build -mx: - $(MSDEV) glew.dsw /make \ - "glew_static - Win32 Release MX" \ - "glew_shared - Win32 Release MX" \ - "glewinfo - Win32 Release MX" \ - "visualinfo - Win32 Release MX" /build - debug: $(MSDEV) glew.dsw /make \ "glew_static - Win32 Debug" \ diff --git a/build/vc6/glew_shared.dsp b/build/vc6/glew_shared.dsp index 4ef3c7f..8b576b8 100644 --- a/build/vc6/glew_shared.dsp +++ b/build/vc6/glew_shared.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -CFG=glew_shared - Win32 Debug MX +CFG=glew_shared - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -19,8 +19,6 @@ CFG=glew_shared - Win32 Debug MX !MESSAGE !MESSAGE "glew_shared - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "glew_shared - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "glew_shared - Win32 Debug MX" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "glew_shared - Win32 Release MX" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project @@ -44,8 +42,8 @@ RSC=rc.exe # PROP Intermediate_Dir "shared/release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLEW_EXPORTS" /YX /FD /c -# ADD CPP /nologo /W3 /O2 /I "../../include" /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRALEAN" /D "GLEW_BUILD" /YX /FD /c +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLEW_EXPORTS" /YX /FD /c /GS- +# ADD CPP /nologo /W3 /O2 /I "../../include" /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRALEAN" /D "GLEW_BUILD" /YX /FD /c /GS- # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -56,7 +54,7 @@ BSC32=bscmake.exe LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 # ADD LINK32 opengl32.lib /nologo /dll /pdb:none /machine:I386 /out:"../../bin/glew32.dll" /ignore:4089 -# ADD LINK32 /base:0x62AA0000 +# ADD LINK32 /base:0x62AA0000 /nodefaultlib /noentry !ELSEIF "$(CFG)" == "glew_shared - Win32 Debug" @@ -71,8 +69,8 @@ LINK32=link.exe # PROP Intermediate_Dir "shared/debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLEW_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Zi /Od /I "../../include" /D "WIN32" /D "WIN32_MEAN_AND_LEAN" /D "VC_EXTRALEAN" /D "GLEW_BUILD" /YX /FD /GZ /c +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLEW_EXPORTS" /YX /FD /GZ /c /GS- +# ADD CPP /nologo /MDd /W3 /Zi /Od /I "../../include" /D "WIN32" /D "WIN32_MEAN_AND_LEAN" /D "VC_EXTRALEAN" /D "GLEW_BUILD" /YX /FD /GZ /c /GS- # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -86,72 +84,12 @@ LINK32=link.exe # SUBTRACT LINK32 /pdb:none # ADD LINK32 /base:0x62AA0000 -!ELSEIF "$(CFG)" == "glew_shared - Win32 Debug MX" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "glew_shared___Win32_Debug_MX" -# PROP BASE Intermediate_Dir "glew_shared___Win32_Debug_MX" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../../lib" -# PROP Intermediate_Dir "shared/debug-mx" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /I "../../include" /D "WIN32" /D "WIN32_MEAN_AND_LEAN" /D "VC_EXTRALEAN" /D "GLEW_BUILD" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Zi /Od /I "../../include" /D "WIN32" /D "WIN32_MEAN_AND_LEAN" /D "VC_EXTRALEAN" /D "GLEW_MX" /D "GLEW_BUILD" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "GLEW_MX" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 opengl32.lib /nologo /dll /incremental:no /pdb:"../../lib/glew32d.pdb" /debug /machine:I386 /out:"../../lib/glew32d.dll" /implib:"../../lib/glew32d.lib" /pdbtype:sept -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 opengl32.lib /nologo /dll /incremental:no /debug /machine:I386 /out:"../../bin/glew32mxd.dll" /pdbtype:sept -# SUBTRACT LINK32 /pdb:none -# ADD LINK32 /base:0x62AA0000 - -!ELSEIF "$(CFG)" == "glew_shared - Win32 Release MX" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "glew_shared___Win32_Release_MX" -# PROP BASE Intermediate_Dir "glew_shared___Win32_Release_MX" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../../lib" -# PROP Intermediate_Dir "shared/release-mx" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /O2 /I "../../include" /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRALEAN" /D "GLEW_BUILD" /YX /FD /c -# ADD CPP /nologo /W3 /O2 /I "../../include" /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRALEAN" /D "GLEW_MX" /D "GLEW_BUILD" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "GLEW_MX" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 opengl32.lib /nologo /dll /pdb:none /machine:I386 /out:"../../lib/glew32.dll" /implib:"../../lib/glew32.lib" /ignore:4089 -# ADD LINK32 opengl32.lib /nologo /dll /pdb:none /machine:I386 /out:"../../bin/glew32mx.dll" /ignore:4089 -# ADD LINK32 /base:0x62AA0000 - !ENDIF # Begin Target # Name "glew_shared - Win32 Release" # Name "glew_shared - Win32 Debug" -# Name "glew_shared - Win32 Debug MX" -# Name "glew_shared - Win32 Release MX" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/build/vc6/glew_static.dsp b/build/vc6/glew_static.dsp index 3f29255..d6bd3d6 100644 --- a/build/vc6/glew_static.dsp +++ b/build/vc6/glew_static.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=glew_static - Win32 Debug MX +CFG=glew_static - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -19,8 +19,6 @@ CFG=glew_static - Win32 Debug MX !MESSAGE !MESSAGE "glew_static - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "glew_static - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "glew_static - Win32 Debug MX" (based on "Win32 (x86) Static Library") -!MESSAGE "glew_static - Win32 Release MX" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -42,8 +40,8 @@ RSC=rc.exe # PROP Output_Dir "../../lib" # PROP Intermediate_Dir "static/release" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRALEAN" /D "GLEW_STATIC" /YX /FD /c +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c /GS- +# ADD CPP /nologo /W3 /GX /O2 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRALEAN" /D "GLEW_STATIC" /YX /FD /c /GS- # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" /d "GLEW_STATIC" BSC32=bscmake.exe @@ -76,60 +74,12 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo /out:"../../lib/glew32sd.lib" -!ELSEIF "$(CFG)" == "glew_static - Win32 Debug MX" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "glew_static___Win32_Debug_MX" -# PROP BASE Intermediate_Dir "glew_static___Win32_Debug_MX" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../../lib" -# PROP Intermediate_Dir "static/debug-mx" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRALEAN" /D "GLEW_STATIC" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRALEAN" /D "GLEW_MX" /D "GLEW_STATIC" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "GLEW_MX" /d "GLEW_STATIC" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"../../lib/glew32sd.lib" -# ADD LIB32 /nologo /out:"../../lib/glew32mxsd.lib" - -!ELSEIF "$(CFG)" == "glew_static - Win32 Release MX" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "glew_static___Win32_Release_MX" -# PROP BASE Intermediate_Dir "glew_static___Win32_Release_MX" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../../lib" -# PROP Intermediate_Dir "static/release-mx" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRALEAN" /D "GLEW_STATIC" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRALEAN" /D "GLEW_MX" /D "GLEW_STATIC" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "GLEW_MX" /d "GLEW_STATIC" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"../../lib/glew32s.lib" -# ADD LIB32 /nologo /out:"../../lib/glew32mxs.lib" - !ENDIF # Begin Target # Name "glew_static - Win32 Release" # Name "glew_static - Win32 Debug" -# Name "glew_static - Win32 Debug MX" -# Name "glew_static - Win32 Release MX" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/build/vc6/glewinfo.dsp b/build/vc6/glewinfo.dsp index 423c1eb..95a599d 100644 --- a/build/vc6/glewinfo.dsp +++ b/build/vc6/glewinfo.dsp @@ -19,8 +19,6 @@ CFG=glewinfo - Win32 Debug MX !MESSAGE !MESSAGE "glewinfo - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE "glewinfo - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "glewinfo - Win32 Debug MX" (based on "Win32 (x86) Console Application") -!MESSAGE "glewinfo - Win32 Release MX" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -79,66 +77,12 @@ LINK32=link.exe # ADD LINK32 ../../lib/glew32sd.lib opengl32.lib gdi32.lib user32.lib /nologo /subsystem:console /incremental:no /pdb:"static/debug/glewinfod.pdb" /debug /machine:I386 /out:"../../bin/glewinfod.exe" /pdbtype:sept # SUBTRACT LINK32 /pdb:none -!ELSEIF "$(CFG)" == "glewinfo - Win32 Debug MX" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "glewinfo___Win32_Debug_MX" -# PROP BASE Intermediate_Dir "glewinfo___Win32_Debug_MX" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../../bin" -# PROP Intermediate_Dir "static/debug-mx" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "GLEW_STATIC" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "GLEW_MX" /D "GLEW_STATIC" /D "_CRT_SECURE_NO_WARNINGS" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "GLEW_MX" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 ../../lib/glew32sd.lib opengl32.lib gdi32.lib user32.lib /nologo /subsystem:console /incremental:no /pdb:"static/debug/glewinfod.pdb" /debug /machine:I386 /out:"../../bin/glewinfod.exe" /pdbtype:sept -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 ../../lib/glew32mxsd.lib opengl32.lib gdi32.lib user32.lib /nologo /subsystem:console /incremental:no /pdb:"static/debug/glewinfod.pdb" /debug /machine:I386 /out:"../../bin/glewinfo-mxd.exe" /pdbtype:sept -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "glewinfo - Win32 Release MX" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "glewinfo___Win32_Release_MX" -# PROP BASE Intermediate_Dir "glewinfo___Win32_Release_MX" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../../bin" -# PROP Intermediate_Dir "static/release-mx" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /I "../../include" /D "WIN32" /D "WIN32_MEAN_AND_LEAN" /D "VC_EXTRALEAN" /D "GLEW_STATIC" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "../../include" /D "WIN32" /D "WIN32_MEAN_AND_LEAN" /D "VC_EXTRALEAN" /D "GLEW_MX" /D "GLEW_STATIC" /D "_CRT_SECURE_NO_WARNINGS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "GLEW_MX" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 ../../lib/glew32s.lib opengl32.lib gdi32.lib user32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 ../../lib/glew32mxs.lib opengl32.lib gdi32.lib user32.lib /nologo /subsystem:console /machine:I386 /out:"../../bin/glewinfo-mx.exe" - !ENDIF # Begin Target # Name "glewinfo - Win32 Release" # Name "glewinfo - Win32 Debug" -# Name "glewinfo - Win32 Debug MX" -# Name "glewinfo - Win32 Release MX" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/build/vc6/visualinfo.dsp b/build/vc6/visualinfo.dsp index 289f1c6..adcc814 100644 --- a/build/vc6/visualinfo.dsp +++ b/build/vc6/visualinfo.dsp @@ -19,8 +19,6 @@ CFG=visualinfo - Win32 Debug MX !MESSAGE !MESSAGE "visualinfo - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE "visualinfo - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "visualinfo - Win32 Debug MX" (based on "Win32 (x86) Console Application") -!MESSAGE "visualinfo - Win32 Release MX" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -79,66 +77,12 @@ LINK32=link.exe # ADD LINK32 ../../lib/glew32sd.lib glu32.lib opengl32.lib gdi32.lib user32.lib kernel32.lib /nologo /subsystem:console /incremental:no /pdb:"static/debug/visualinfod.pdb" /debug /machine:I386 /out:"../../bin/visualinfod.exe" /pdbtype:sept # SUBTRACT LINK32 /pdb:none -!ELSEIF "$(CFG)" == "visualinfo - Win32 Debug MX" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "visualinfo___Win32_Debug_MX" -# PROP BASE Intermediate_Dir "visualinfo___Win32_Debug_MX" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../../bin" -# PROP Intermediate_Dir "static/debug-mx" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "GLEW_STATIC" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "GLEW_MX" /D "GLEW_STATIC" /D "_CRT_SECURE_NO_WARNINGS" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "GLEW_MX" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 ../../lib/glew32sd.lib glu32.lib opengl32.lib gdi32.lib user32.lib kernel32.lib /nologo /subsystem:console /incremental:no /pdb:"static/debug/visualinfod.pdb" /debug /machine:I386 /out:"../../bin/visualinfod.exe" /pdbtype:sept -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 ../../lib/glew32mxsd.lib glu32.lib opengl32.lib gdi32.lib user32.lib kernel32.lib /nologo /subsystem:console /incremental:no /pdb:"static/debug/visualinfod.pdb" /debug /machine:I386 /out:"../../bin/visualinfo-mxd.exe" /pdbtype:sept -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "visualinfo - Win32 Release MX" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "visualinfo___Win32_Release_MX" -# PROP BASE Intermediate_Dir "visualinfo___Win32_Release_MX" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../../bin" -# PROP Intermediate_Dir "static/release-mx" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /I "../../include" /D "WIN32" /D "WIN32_MEAN_AND_LEAN" /D "VC_EXTRALEAN" /D "GLEW_STATIC" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "../../include" /D "WIN32" /D "WIN32_MEAN_AND_LEAN" /D "VC_EXTRALEAN" /D "GLEW_MX" /D "GLEW_STATIC" /D "_CRT_SECURE_NO_WARNINGS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "GLEW_MX" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 ../../lib/glew32s.lib glu32.lib opengl32.lib gdi32.lib user32.lib kernel32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 ../../lib/glew32mxs.lib glu32.lib opengl32.lib gdi32.lib user32.lib kernel32.lib /nologo /subsystem:console /machine:I386 /out:"../../bin/visualinfo-mx.exe" - !ENDIF # Begin Target # Name "visualinfo - Win32 Release" # Name "visualinfo - Win32 Debug" -# Name "visualinfo - Win32 Debug MX" -# Name "visualinfo - Win32 Release MX" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/config/Makefile.cygming b/config/Makefile.cygming index a356c5c..dcd7b21 100644 --- a/config/Makefile.cygming +++ b/config/Makefile.cygming @@ -9,6 +9,8 @@ LD := gcc -mno-cygwin LN := LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32 LDFLAGS.EXTRA = -L$(LIBDIR) +CFLAGS.EXTRA += -fno-builtin -fno-stack-protector +LDFLAGS.EXTRA += -nostdlib WARN = -Wall -W POPT = -O2 BIN.SUFFIX = .exe @@ -17,8 +19,3 @@ LIB.DEVLNK = lib$(NAME).dll.a # for mingw this is the dll import lib LIB.SHARED = $(NAME).dll LIB.STATIC = lib$(NAME).a # the static lib will be broken LDFLAGS.SO = -shared -Wl,-soname,$(LIB.SONAME) -Wl,--out-implib,lib/$(LIB.DEVLNK) -LIB.SONAME.MX = lib$(NAME)mx.dll -LIB.DEVLNK.MX = lib$(NAME)mx.dll.a # for mingw this is the dll import lib -LIB.SHARED.MX = $(NAME)mx.dll -LIB.STATIC.MX = lib$(NAME)mx.a # the static lib will be broken -LDFLAGS.SO.MX = -shared -Wl,-soname,$(LIB.SONAME.MX) -Wl,--out-implib,lib/$(LIB.DEVLNK.MX) diff --git a/config/Makefile.cygwin b/config/Makefile.cygwin index 8600fd0..bc7e2fd 100644 --- a/config/Makefile.cygwin +++ b/config/Makefile.cygwin @@ -17,8 +17,3 @@ LIB.DEVLNK = lib$(NAME).dll.a LIB.SHARED = cyg$(NAME)-$(GLEW_MAJOR)-$(GLEW_MINOR).dll LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -shared -Wl,--out-implib,lib/$(LIB.DEVLNK) -LIB.SONAME.MX = cyg$(NAME)mx-$(GLEW_MAJOR)-$(GLEW_MINOR).dll -LIB.DEVLNK.MX = lib$(NAME)mx.dll.a -LIB.SHARED.MX = cyg$(NAME)mx-$(GLEW_MAJOR)-$(GLEW_MINOR).dll -LIB.STATIC.MX = lib$(NAME)mx.a -LDFLAGS.SO.MX = -shared -Wl,--out-implib,lib/$(LIB.DEVLNK.MX) diff --git a/config/Makefile.darwin b/config/Makefile.darwin index 93b2052..7a2d01e 100644 --- a/config/Makefile.darwin +++ b/config/Makefile.darwin @@ -23,8 +23,3 @@ LIB.DEVLNK = lib$(NAME).dylib LIB.SHARED = lib$(NAME).$(SO_VERSION).dylib LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR) -LIB.SONAME.MX = lib$(NAME)mx.$(SO_MAJOR).dylib -LIB.DEVLNK.MX = lib$(NAME)mx.dylib -LIB.SHARED.MX = lib$(NAME)mx.$(SO_VERSION).dylib -LIB.STATIC.MX = lib$(NAME)mx.a -LDFLAGS.SO.MX = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED.MX) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR) diff --git a/config/Makefile.darwin-ppc b/config/Makefile.darwin-ppc index 7dd99ff..6ffbfab 100644 --- a/config/Makefile.darwin-ppc +++ b/config/Makefile.darwin-ppc @@ -22,8 +22,3 @@ LIB.DEVLNK = lib$(NAME).dylib LIB.SHARED = lib$(NAME).$(SO_VERSION).dylib LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR) -LIB.SONAME.MX = lib$(NAME)mx.$(SO_MAJOR).dylib -LIB.DEVLNK.MX = lib$(NAME)mx.dylib -LIB.SHARED.MX = lib$(NAME)mx.$(SO_VERSION).dylib -LIB.STATIC.MX = lib$(NAME)mx.a -LDFLAGS.SO.MX = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED.MX) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR) diff --git a/config/Makefile.darwin-universal b/config/Makefile.darwin-universal index dfd4eef..120bf92 100644 --- a/config/Makefile.darwin-universal +++ b/config/Makefile.darwin-universal @@ -25,8 +25,3 @@ LIB.DEVLNK = lib$(NAME).dylib LIB.SHARED = lib$(NAME).$(SO_VERSION).dylib LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR) -LIB.SONAME.MX = lib$(NAME)mx.$(SO_MAJOR).dylib -LIB.DEVLNK.MX = lib$(NAME)mx.dylib -LIB.SHARED.MX = lib$(NAME)mx.$(SO_VERSION).dylib -LIB.STATIC.MX = lib$(NAME)mx.a -LDFLAGS.SO.MX = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED.MX) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR) diff --git a/config/Makefile.darwin-x86_64 b/config/Makefile.darwin-x86_64 index 437bad4..274036a 100644 --- a/config/Makefile.darwin-x86_64 +++ b/config/Makefile.darwin-x86_64 @@ -22,8 +22,3 @@ LIB.DEVLNK = lib$(NAME).dylib LIB.SHARED = lib$(NAME).$(SO_VERSION).dylib LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR) -LIB.SONAME.MX = lib$(NAME)mx.$(SO_MAJOR).dylib -LIB.DEVLNK.MX = lib$(NAME)mx.dylib -LIB.SHARED.MX = lib$(NAME)mx.$(SO_VERSION).dylib -LIB.STATIC.MX = lib$(NAME)mx.a -LDFLAGS.SO.MX = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED.MX) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR) diff --git a/config/Makefile.fedora-mingw32 b/config/Makefile.fedora-mingw32 index f27db34..9bad92a 100644 --- a/config/Makefile.fedora-mingw32 +++ b/config/Makefile.fedora-mingw32 @@ -2,10 +2,11 @@ # http://www.mingw.org/ # # $ make SYSTEM=fedora-mingw32 -# include config/Makefile.linux-mingw32 CC := i686-pc-mingw32-gcc LD := i686-pc-mingw32-ld LDFLAGS.GL += -L/usr/i686-pc-mingw32/sys-root/mingw/lib +CFLAGS.EXTRA += -fno-builtin -fno-stack-protector +LDFLAGS.EXTRA += -nostdlib diff --git a/config/Makefile.freebsd b/config/Makefile.freebsd index ca2771d..4fb9b6a 100644 --- a/config/Makefile.freebsd +++ b/config/Makefile.freebsd @@ -15,8 +15,3 @@ 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) diff --git a/config/Makefile.gnu b/config/Makefile.gnu index b7c58be..8d4f07e 100644 --- a/config/Makefile.gnu +++ b/config/Makefile.gnu @@ -15,8 +15,3 @@ LIB.DEVLNK = lib$(NAME).so LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -shared -Wl,-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 -Wl,-soname=$(LIB.SONAME.MX) diff --git a/config/Makefile.haiku b/config/Makefile.haiku index ce832f9..b8b7bd1 100644 --- a/config/Makefile.haiku +++ b/config/Makefile.haiku @@ -1,9 +1,6 @@ NAME = $(GLEW_NAME) CC = cc LD = cc -ifneq (undefined, $(origin GLEW_MX)) - CFLAGS.EXTRA = -DGLEW_MX -endif LDFLAGS.GL = -lGL LDFLAGS.STATIC = -Wl,-Bstatic @@ -21,9 +18,3 @@ LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -shared -Wl,-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 -Wl,-soname=$(LIB.SONAME.MX) - diff --git a/config/Makefile.irix b/config/Makefile.irix index a1be5ee..ef8f830 100644 --- a/config/Makefile.irix +++ b/config/Makefile.irix @@ -15,8 +15,3 @@ 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) diff --git a/config/Makefile.kfreebsd b/config/Makefile.kfreebsd index faf1046..e2ff5c3 100644 --- a/config/Makefile.kfreebsd +++ b/config/Makefile.kfreebsd @@ -15,8 +15,3 @@ LIB.DEVLNK = lib$(NAME).so LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -shared -Wl,-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 -Wl,-soname $(LIB.SONAME.MX) diff --git a/config/Makefile.linux b/config/Makefile.linux index 6b9da03..50b813c 100644 --- a/config/Makefile.linux +++ b/config/Makefile.linux @@ -25,14 +25,10 @@ POPT = -O2 CFLAGS.EXTRA += -fPIC CFLAGS.EXTRA += -Wcast-qual CFLAGS.EXTRA += -ansi -pedantic +CFLAGS.EXTRA += -fno-stack-protector 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 -Wl,-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 -Wl,-soname=$(LIB.SONAME.MX) diff --git a/config/Makefile.linux-clang b/config/Makefile.linux-clang index dd14f4f..2992b89 100644 --- a/config/Makefile.linux-clang +++ b/config/Makefile.linux-clang @@ -25,14 +25,10 @@ POPT = -O2 CFLAGS.EXTRA += -fPIC CFLAGS.EXTRA += -Wcast-qual CFLAGS.EXTRA += -ansi -pedantic +CFLAGS.EXTRA += -fno-stack-protector 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 -Wl,-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 -Wl,-soname=$(LIB.SONAME.MX) diff --git a/config/Makefile.linux-clang-egl b/config/Makefile.linux-clang-egl new file mode 100644 index 0000000..ca06419 --- /dev/null +++ b/config/Makefile.linux-clang-egl @@ -0,0 +1,4 @@ +include config/Makefile.linux-clang + +LDFLAGS.GL = -lEGL -lGL +CFLAGS.EXTRA += -DGLEW_EGL diff --git a/config/Makefile.linux-egl b/config/Makefile.linux-egl new file mode 100644 index 0000000..bcdc3cb --- /dev/null +++ b/config/Makefile.linux-egl @@ -0,0 +1,4 @@ +include config/Makefile.linux + +LDFLAGS.GL = -lEGL -lGL +CFLAGS.EXTRA += -DGLEW_EGL diff --git a/config/Makefile.linux-mingw-w64 b/config/Makefile.linux-mingw-w64 index bedf166..175f5a9 100644 --- a/config/Makefile.linux-mingw-w64 +++ b/config/Makefile.linux-mingw-w64 @@ -10,6 +10,8 @@ LD := i686-w64-mingw32-ld LN := STRIP := LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32 +CFLAGS.EXTRA += -fno-builtin -fno-stack-protector +LDFLAGS.EXTRA += -nostdlib WARN = -Wall -W POPT = -O2 BIN.SUFFIX = .exe @@ -18,8 +20,3 @@ LIB.DEVLNK = lib$(NAME).dll.a # for mingw this is the dll import lib LIB.SHARED = $(NAME).dll LIB.STATIC = lib$(NAME).a # the static lib will be broken LDFLAGS.SO = -shared -soname $(LIB.SONAME) --out-implib lib/$(LIB.DEVLNK) -LIB.SONAME.MX = lib$(NAME)mx.dll -LIB.DEVLNK.MX = lib$(NAME)mx.dll.a # for mingw this is the dll import lib -LIB.SHARED.MX = $(NAME)mx.dll -LIB.STATIC.MX = lib$(NAME)mx.a # the static lib will be broken -LDFLAGS.SO.MX = -shared -soname $(LIB.SONAME.MX) --out-implib lib/$(LIB.DEVLNK.MX) diff --git a/config/Makefile.linux-mingw32 b/config/Makefile.linux-mingw32 index fdb2239..12dfb99 100644 --- a/config/Makefile.linux-mingw32 +++ b/config/Makefile.linux-mingw32 @@ -2,7 +2,6 @@ # http://www.mingw.org/ # # $ make SYSTEM=linux-mingw32 -# NAME := glew32 HOST := i586-mingw32msvc @@ -11,6 +10,8 @@ LD := $(HOST)-ld LN := STRIP := LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32 +CFLAGS.EXTRA += -fno-builtin -fno-stack-protector +#LDFLAGS.EXTRA += -nostdlib WARN = -Wall -W POPT = -O2 BIN.SUFFIX = .exe @@ -19,8 +20,3 @@ LIB.DEVLNK = lib$(NAME).dll.a # for mingw this is the dll import lib LIB.SHARED = $(NAME).dll LIB.STATIC = lib$(NAME).a # the static lib will be broken LDFLAGS.SO = -shared -soname $(LIB.SONAME) --out-implib lib/$(LIB.DEVLNK) -LIB.SONAME.MX = lib$(NAME)mx.dll -LIB.DEVLNK.MX = lib$(NAME)mx.dll.a # for mingw this is the dll import lib -LIB.SHARED.MX = $(NAME)mx.dll -LIB.STATIC.MX = lib$(NAME)mx.a # the static lib will be broken -LDFLAGS.SO.MX = -shared -soname $(LIB.SONAME.MX) --out-implib lib/$(LIB.DEVLNK.MX) diff --git a/config/Makefile.linux-mingw64 b/config/Makefile.linux-mingw64 index 0e19f6c..f3e47a2 100644 --- a/config/Makefile.linux-mingw64 +++ b/config/Makefile.linux-mingw64 @@ -2,7 +2,6 @@ # http://www.mingw.org/ # # $ make SYSTEM=linux-mingw64 -# NAME := glew32 HOST := i686-w64-mingw32 @@ -11,6 +10,8 @@ LD := $(HOST)-ld LN := STRIP := LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32 +CFLAGS.EXTRA += -fno-builtin -fno-stack-protector +#LDFLAGS.EXTRA += -nostdlib WARN = -Wall -W POPT = -O2 BIN.SUFFIX = .exe @@ -19,8 +20,3 @@ LIB.DEVLNK = lib$(NAME).dll.a # for mingw this is the dll import lib LIB.SHARED = $(NAME).dll LIB.STATIC = lib$(NAME).a # the static lib will be broken LDFLAGS.SO = -shared -soname $(LIB.SONAME) --out-implib lib/$(LIB.DEVLNK) -LIB.SONAME.MX = lib$(NAME)mx.dll -LIB.DEVLNK.MX = lib$(NAME)mx.dll.a # for mingw this is the dll import lib -LIB.SHARED.MX = $(NAME)mx.dll -LIB.STATIC.MX = lib$(NAME)mx.a # the static lib will be broken -LDFLAGS.SO.MX = -shared -soname $(LIB.SONAME.MX) --out-implib lib/$(LIB.DEVLNK.MX) diff --git a/config/Makefile.mingw b/config/Makefile.mingw index f1fb194..3f413ee 100644 --- a/config/Makefile.mingw +++ b/config/Makefile.mingw @@ -1,10 +1,12 @@ NAME = glew32 # use gcc for linking, with ld it does not work -CC := gcc +CC := gcc -fno-builtin LD := gcc LN := LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32 LDFLAGS.EXTRA = -L/mingw/lib +CFLAGS.EXTRA += -fno-builtin -fno-stack-protector +LDFLAGS.EXTRA += -nostdlib WARN = -Wall -W POPT = -O2 BIN.SUFFIX = .exe @@ -13,8 +15,3 @@ LIB.DEVLNK = lib$(NAME).dll.a # for mingw this is the dll import lib LIB.SHARED = $(NAME).dll LIB.STATIC = lib$(NAME).a # the static lib will be broken LDFLAGS.SO = -shared -Wl,-soname,$(LIB.SONAME) -Wl,--out-implib,lib/$(LIB.DEVLNK) -LIB.SONAME.MX = lib$(NAME)mx.dll -LIB.DEVLNK.MX = lib$(NAME)mx.dll.a # for mingw this is the dll import lib -LIB.SHARED.MX = $(NAME)mx.dll -LIB.STATIC.MX = lib$(NAME)mx.a # the static lib will be broken -LDFLAGS.SO.MX = -shared -Wl,-soname,$(LIB.SONAME.MX) -Wl,--out-implib,lib/$(LIB.DEVLNK.MX) diff --git a/config/Makefile.mingw-win32 b/config/Makefile.mingw-win32 new file mode 100644 index 0000000..347efd6 --- /dev/null +++ b/config/Makefile.mingw-win32 @@ -0,0 +1,5 @@ +include config/Makefile.mingw + +POPT := -march=i686 -mtune=generic -O2 +CFLAGS.EXTRA += -m32 +LDFLAGS.EXTRA += -m32 diff --git a/config/Makefile.msys b/config/Makefile.msys new file mode 100644 index 0000000..b5187af --- /dev/null +++ b/config/Makefile.msys @@ -0,0 +1,19 @@ +NAME = glew32 +# use gcc for linking, with ld it does not work +CC := gcc +LD := gcc +LN := +CFLAGS.EXTRA += -D_WIN32 +LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32 +LDFLAGS.EXTRA = +CFLAGS.EXTRA += -fno-builtin -fno-stack-protector +LDFLAGS.EXTRA += -nostdlib +LIBDIR = $(GLEW_DEST)/bin +WARN = -Wall -W +POPT = -O2 +BIN.SUFFIX = .exe +LIB.SONAME = lib$(NAME).dll +LIB.DEVLNK = lib$(NAME).dll.a # for mingw this is the dll import lib +LIB.SHARED = $(NAME).dll +LIB.STATIC = lib$(NAME).a # the static lib will be broken +LDFLAGS.SO = -shared -Wl,-soname,$(LIB.SONAME) -Wl,--out-implib,lib/$(LIB.DEVLNK) diff --git a/config/Makefile.msys-win32 b/config/Makefile.msys-win32 new file mode 100644 index 0000000..160d3eb --- /dev/null +++ b/config/Makefile.msys-win32 @@ -0,0 +1,5 @@ +include config/Makefile.msys + +POPT := -march=i686 -mtune=generic -O2 +CFLAGS.EXTRA += -m32 +LDFLAGS.EXTRA += -m32 diff --git a/config/Makefile.msys-win64 b/config/Makefile.msys-win64 new file mode 100644 index 0000000..c1c785a --- /dev/null +++ b/config/Makefile.msys-win64 @@ -0,0 +1,5 @@ +include config/Makefile.msys + +POPT := -mtune=generic -O2 +CFLAGS.EXTRA += -m64 +LDFLAGS.EXTRA += -m64 diff --git a/config/Makefile.nacl-32 b/config/Makefile.nacl-32 index 2a5cec7..2182cee 100644 --- a/config/Makefile.nacl-32 +++ b/config/Makefile.nacl-32 @@ -29,8 +29,3 @@ 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 index 37cb6e9..d6135ea 100644 --- a/config/Makefile.nacl-64 +++ b/config/Makefile.nacl-64 @@ -29,8 +29,3 @@ 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.netbsd b/config/Makefile.netbsd index 6da47b1..d2db8a9 100644 --- a/config/Makefile.netbsd +++ b/config/Makefile.netbsd @@ -15,8 +15,3 @@ 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) diff --git a/config/Makefile.openbsd b/config/Makefile.openbsd index ade993e..b64910c 100644 --- a/config/Makefile.openbsd +++ b/config/Makefile.openbsd @@ -15,8 +15,3 @@ 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) diff --git a/config/Makefile.solaris b/config/Makefile.solaris index 96e6d1f..bb2455f 100644 --- a/config/Makefile.solaris +++ b/config/Makefile.solaris @@ -12,7 +12,3 @@ LIB.SONAME = lib$(NAME).so.$(SO_MAJOR) LIB.DEVLNK = lib$(NAME).so LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a -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 diff --git a/config/Makefile.solaris-gcc b/config/Makefile.solaris-gcc index d66395b..24a8531 100644 --- a/config/Makefile.solaris-gcc +++ b/config/Makefile.solaris-gcc @@ -13,8 +13,3 @@ LIB.DEVLNK = lib$(NAME).so LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -shared -Wl,-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 -Wl,-soname=$(LIB.SONAME.MX) diff --git a/config/config.guess b/config/config.guess index dbfb978..3d2c450 100755 --- a/config/config.guess +++ b/config/config.guess @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2015 Free Software Foundation, Inc. +# Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2015-01-01' +timestamp='2016-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -27,7 +27,7 @@ timestamp='2015-01-01' # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # # Please send patches to . @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2015 Free Software Foundation, Inc. +Copyright 1992-2016 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -168,20 +168,27 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + /sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || \ + echo unknown)` case "${UNAME_MACHINE_ARCH}" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; + earmv*) + arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` + machine=${arch}${endian}-unknown + ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) + arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ @@ -197,6 +204,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in os=netbsd ;; esac + # Determine ABI tags. + case "${UNAME_MACHINE_ARCH}" in + earm*) + expr='s/^earmv[0-9]/-eabi/;s/eb$//' + abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + ;; + esac # The OS release # Debian GNU/NetBSD machines have a different userland, and # thus, need a distinct triplet. However, they do not need @@ -207,13 +221,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" + echo "${machine}-${os}${release}${abi}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` @@ -223,6 +237,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} exit ;; + *:LibertyBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/LibertyBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} + exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; @@ -235,6 +253,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} exit ;; + *:Sortix:*:*) + echo ${UNAME_MACHINE}-unknown-sortix + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -933,6 +954,9 @@ EOF crisv32:Linux:*:*) echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; + e2k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; frv:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -945,6 +969,9 @@ EOF ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; + k1om:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -1021,7 +1048,7 @@ EOF echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} @@ -1100,7 +1127,7 @@ EOF # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that + # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. echo i586-pc-msdosdjgpp exit ;; @@ -1370,6 +1397,9 @@ EOF x86_64:VMkernel:*:*) echo ${UNAME_MACHINE}-unknown-esx exit ;; + amd64:Isilon\ OneFS:*:*) + echo x86_64-unknown-onefs + exit ;; esac cat >&2 < - - + - - + + + + + +
Last Update: 08-10-15
Last Update: 01-31-16
OpenGL Logo
GitHub Logo
+ Travis Logo
SourceForge Logo
Building
Installation
Source Generation
Credits & Copyright
Change Log

GitHub
Project Page
Bug Tracker
Issues
Pull Requests
Authors
Licensing

SourceForge Page

@@ -72,10 +75,11 @@ THE POSSIBILITY OF SUCH DAMAGE. - + @@ -204,45 +208,6 @@ WGL_ATI_pixel_format_float
WGL_NV_float_buffer

-

Multiple Rendering Contexts (GLEW MX)

- -

Starting with release 1.2.0, thread-safe support for multiple -rendering contexts, possibly with different capabilities, is -available. Since this is not required by most users, it is not added -to the binary releases to maintain compatibility between different -versions. To include multi-context support, you have to do the -following:

-
    -
  1. Compile and use GLEW with the GLEW_MX preprocessor token -defined.
    2. -
  2. For each rendering context, create a GLEWContext object -that will be available as long as the rendering context exists.
    3. -
  3. Define a macro or function called glewGetContext() that -returns a pointer to the GLEWContext object associated with -the rendering context from which OpenGL/WGL/GLX calls are issued. This -dispatch mechanism is primitive, but generic. -
  4. Make sure that you call glewInit() after creating the -GLEWContext object in each rendering context. Note, that the -GLEWContext pointer returned by glewGetContext() has -to reside in global or thread-local memory. -
- -

Note that according to the MSDN -WGL documentation, you have to initialize the entry points for -every rendering context that use pixel formats with different -capabilities For example, the pixel formats provided by the generic -software OpenGL implementation by Microsoft vs. the hardware -accelerated pixel formats have different capabilities. GLEW by -default ignores this requirement, and does not define per-context -entry points (you can however do this using the steps described -above). Assuming a global namespace for the entry points works in -most situations, because typically all hardware accelerated pixel -formats provide the same entry points and capabilities. This means -that unless you use the multi-context version of GLEW, you need to -call glewInit() only once in your program, or more precisely, -once per process.

-

Separate Namespace

diff --git a/doc/basic.html b/doc/basic.html index 038a155..0480ef7 100644 --- a/doc/basic.html +++ b/doc/basic.html @@ -57,12 +57,15 @@ THE POSSIBILITY OF SUCH DAMAGE.

- - + - - + + + + + +
Last Update: 08-10-15
Last Update: 01-31-16
OpenGL Logo
GitHub Logo
+ Travis Logo
SourceForge Logo
Building
Installation
Source Generation
Credits & Copyright
Change Log

GitHub
Project Page
Bug Tracker
Issues
Pull Requests
Authors
Licensing

SourceForge Page

@@ -72,10 +75,11 @@ THE POSSIBILITY OF SUCH DAMAGE. - + diff --git a/doc/build.html b/doc/build.html index ba0d681..7f15d62 100644 --- a/doc/build.html +++ b/doc/build.html @@ -57,12 +57,15 @@ THE POSSIBILITY OF SUCH DAMAGE. - - + - - + + + + + +
Last Update: 08-10-15
Last Update: 01-31-16
OpenGL Logo
GitHub Logo
+ Travis Logo
SourceForge Logo
Building
Installation
Source Generation
Credits & Copyright
Change Log

GitHub
Project Page
Bug Tracker
Issues
Pull Requests
Authors
Licensing

SourceForge Page

@@ -72,10 +75,11 @@ THE POSSIBILITY OF SUCH DAMAGE. - + diff --git a/doc/credits.html b/doc/credits.html index 259ace5..a2846a9 100644 --- a/doc/credits.html +++ b/doc/credits.html @@ -57,12 +57,15 @@ THE POSSIBILITY OF SUCH DAMAGE. - - + - - + + + + + +
Last Update: 08-10-15
Last Update: 01-31-16
OpenGL Logo
GitHub Logo
+ Travis Logo
SourceForge Logo
Building
Installation
Source Generation
Credits & Copyright
Change Log

GitHub
Project Page
Bug Tracker
Issues
Pull Requests
Authors
Licensing

SourceForge Page

@@ -72,10 +75,11 @@ THE POSSIBILITY OF SUCH DAMAGE. - + @@ -92,31 +96,8 @@ THE POSSIBILITY OF SUCH DAMAGE. -

Credits

- -

-GLEW was developed by Milan -Ikits and Marcelo -Magallon. They also perform occasional maintainance to make sure -that GLEW stays in mint condition. Aaron Lefohn, Joe Kniss, and Chris -Wyman were the first users and also assisted with the design and -debugging process. The acronym GLEW originates from Aaron Lefohn. -Pasi Kärkkäinen identified and fixed several problems with -GLX and SDL. Nate Robins created the wglinfo utility, to -which modifications were made by Michael Wimmer. -

- -

Copyright

- -

-GLEW is originally derived from the EXTGL project by Lev Povalahev. -The source code is licensed under the Modified BSD -License, the Mesa 3-D License (MIT -License), and the Khronos License (MIT -License). The automatic code generation scripts are released under -the GNU GPL. -

+

+Author, copyright and licensing information on github.

Last Update: 08-10-15
Last Update: 01-31-16
OpenGL Logo
GitHub Logo
+ Travis Logo
SourceForge Logo
diff --git a/doc/glew.html b/doc/glew.html index 1b26e5f..c507511 100644 --- a/doc/glew.html +++ b/doc/glew.html @@ -57,12 +57,15 @@ THE POSSIBILITY OF SUCH DAMAGE. Building Installation Source Generation -Credits & Copyright Change Log - +
GitHub -Project Page -Bug Tracker +Issues +Pull Requests +Authors +Licensing +
+SourceForge Page
@@ -72,10 +75,11 @@ THE POSSIBILITY OF SUCH DAMAGE. - + @@ -116,584 +120,598 @@ THE POSSIBILITY OF SUCH DAMAGE. - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + - - - - - - + + + + - - + + + + + + - - - - - - + + - - - - - - - - - + + + + + + - + + + + + + + + + + - + - - - - + - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + - - + + + - - + + - - - - - - - + + - + + + + + + + - + - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - - - - - - - + - - - + + + + + + + + + + +
Last Update: 08-10-15
Last Update: 01-31-16
OpenGL Logo
GitHub Logo
+ Travis Logo
SourceForge Logo
18 AMD_sample_positions
19 AMD_seamless_cubemap_per_texture
20 AMD_shader_atomic_counter_ops
21 AMD_shader_stencil_export
22 AMD_shader_stencil_value_export
23 AMD_shader_trinary_minmax
24 AMD_sparse_texture
25 AMD_stencil_operation_extended
26 AMD_texture_texture4
27 AMD_transform_feedback3_lines_triangles
28 AMD_transform_feedback4
29 AMD_vertex_shader_layer
30 AMD_vertex_shader_tessellator
31 AMD_vertex_shader_viewport_index
21 AMD_shader_explicit_vertex_parameter
22 AMD_shader_stencil_export
23 AMD_shader_stencil_value_export
24 AMD_shader_trinary_minmax
25 AMD_sparse_texture
26 AMD_stencil_operation_extended
27 AMD_texture_texture4
28 AMD_transform_feedback3_lines_triangles
29 AMD_transform_feedback4
30 AMD_vertex_shader_layer
31 AMD_vertex_shader_tessellator
32 AMD_vertex_shader_viewport_index

32 ANGLE_depth_texture
33 ANGLE_framebuffer_blit
34 ANGLE_framebuffer_multisample
35 ANGLE_instanced_arrays
36 ANGLE_pack_reverse_row_order
37 ANGLE_program_binary
38 ANGLE_texture_compression_dxt1
39 ANGLE_texture_compression_dxt3
40 ANGLE_texture_compression_dxt5
41 ANGLE_texture_usage
42 ANGLE_timer_query
43 ANGLE_translated_shader_source
33 ANGLE_depth_texture
34 ANGLE_framebuffer_blit
35 ANGLE_framebuffer_multisample
36 ANGLE_instanced_arrays
37 ANGLE_pack_reverse_row_order
38 ANGLE_program_binary
39 ANGLE_texture_compression_dxt1
40 ANGLE_texture_compression_dxt3
41 ANGLE_texture_compression_dxt5
42 ANGLE_texture_usage
43 ANGLE_timer_query
44 ANGLE_translated_shader_source

44 APPLE_aux_depth_stencil
45 APPLE_client_storage
46 APPLE_element_array
47 APPLE_fence
48 APPLE_float_pixels
49 APPLE_flush_buffer_range
50 APPLE_object_purgeable
51 APPLE_pixel_buffer
52 APPLE_rgb_422
53 APPLE_row_bytes
54 APPLE_specular_vector
55 APPLE_texture_range
56 APPLE_transform_hint
57 APPLE_vertex_array_object
58 APPLE_vertex_array_range
59 APPLE_vertex_program_evaluators
60 APPLE_ycbcr_422
45 APPLE_aux_depth_stencil
46 APPLE_client_storage
47 APPLE_element_array
48 APPLE_fence
49 APPLE_float_pixels
50 APPLE_flush_buffer_range
51 APPLE_object_purgeable
52 APPLE_pixel_buffer
53 APPLE_rgb_422
54 APPLE_row_bytes
55 APPLE_specular_vector
56 APPLE_texture_range
57 APPLE_transform_hint
58 APPLE_vertex_array_object
59 APPLE_vertex_array_range
60 APPLE_vertex_program_evaluators
61 APPLE_ycbcr_422

61 ARB_ES2_compatibility
62 ARB_ES3_1_compatibility
63 ARB_ES3_2_compatibility
64 ARB_ES3_compatibility
65 ARB_arrays_of_arrays
66 ARB_base_instance
67 ARB_bindless_texture
68 ARB_blend_func_extended
69 ARB_buffer_storage
70 ARB_cl_event
71 ARB_clear_buffer_object
72 ARB_clear_texture
73 ARB_clip_control
74 ARB_color_buffer_float
75 ARB_compatibility
76 ARB_compressed_texture_pixel_storage
77 ARB_compute_shader
78 ARB_compute_variable_group_size
79 ARB_conditional_render_inverted
80 ARB_conservative_depth
81 ARB_copy_buffer
82 ARB_copy_image
83 ARB_cull_distance
84 ARB_debug_output
85 ARB_depth_buffer_float
86 ARB_depth_clamp
87 ARB_depth_texture
88 ARB_derivative_control
89 ARB_direct_state_access
90 ARB_draw_buffers
91 ARB_draw_buffers_blend
92 ARB_draw_elements_base_vertex
93 ARB_draw_indirect
94 ARB_draw_instanced
95 ARB_enhanced_layouts
96 ARB_explicit_attrib_location
97 ARB_explicit_uniform_location
98 ARB_fragment_coord_conventions
99 ARB_fragment_layer_viewport
100 ARB_fragment_program
101 ARB_fragment_program_shadow
102 ARB_fragment_shader
103 ARB_fragment_shader_interlock
104 ARB_framebuffer_no_attachments
105 ARB_framebuffer_object
106 ARB_framebuffer_sRGB
107 ARB_geometry_shader4
108 ARB_get_program_binary
109 ARB_get_texture_sub_image
110 ARB_gpu_shader5
111 ARB_gpu_shader_fp64
112 ARB_gpu_shader_int64
113 ARB_half_float_pixel
114 ARB_half_float_vertex
115 ARB_imaging
116 ARB_indirect_parameters
117 ARB_instanced_arrays
118 ARB_internalformat_query
119 ARB_internalformat_query2
120 ARB_invalidate_subdata
121 ARB_map_buffer_alignment
122 ARB_map_buffer_range
123 ARB_matrix_palette
124 ARB_multi_bind
125 ARB_multi_draw_indirect
126 ARB_multisample
127 ARB_multitexture
128 ARB_occlusion_query
129 ARB_occlusion_query2
130 ARB_parallel_shader_compile
131 ARB_pipeline_statistics_query
132 ARB_pixel_buffer_object
133 ARB_point_parameters
134 ARB_point_sprite
135 ARB_post_depth_coverage
136 ARB_program_interface_query
137 ARB_provoking_vertex
138 ARB_query_buffer_object
139 ARB_robust_buffer_access_behavior
140 ARB_robustness
141 ARB_robustness_application_isolation
142 ARB_robustness_share_group_isolation
143 ARB_sample_locations
144 ARB_sample_shading
145 ARB_sampler_objects
146 ARB_seamless_cube_map
147 ARB_seamless_cubemap_per_texture
148 ARB_separate_shader_objects
149 ARB_shader_atomic_counter_ops
150 ARB_shader_atomic_counters
151 ARB_shader_ballot
152 ARB_shader_bit_encoding
153 ARB_shader_clock
154 ARB_shader_draw_parameters
155 ARB_shader_group_vote
156 ARB_shader_image_load_store
157 ARB_shader_image_size
158 ARB_shader_objects
159 ARB_shader_precision
160 ARB_shader_stencil_export
161 ARB_shader_storage_buffer_object
162 ARB_shader_subroutine
163 ARB_shader_texture_image_samples
164 ARB_shader_texture_lod
165 ARB_shader_viewport_layer_array
166 ARB_shading_language_100
167 ARB_shading_language_420pack
168 ARB_shading_language_include
169 ARB_shading_language_packing
170 ARB_shadow
171 ARB_shadow_ambient
172 ARB_sparse_buffer
173 ARB_sparse_texture
174 ARB_sparse_texture2
175 ARB_sparse_texture_clamp
176 ARB_stencil_texturing
177 ARB_sync
178 ARB_tessellation_shader
179 ARB_texture_barrier
180 ARB_texture_border_clamp
181 ARB_texture_buffer_object
182 ARB_texture_buffer_object_rgb32
183 ARB_texture_buffer_range
184 ARB_texture_compression
185 ARB_texture_compression_bptc
186 ARB_texture_compression_rgtc
187 ARB_texture_cube_map
188 ARB_texture_cube_map_array
189 ARB_texture_env_add
190 ARB_texture_env_combine
191 ARB_texture_env_crossbar
192 ARB_texture_env_dot3
193 ARB_texture_filter_minmax
194 ARB_texture_float
195 ARB_texture_gather
196 ARB_texture_mirror_clamp_to_edge
197 ARB_texture_mirrored_repeat
198 ARB_texture_multisample
199 ARB_texture_non_power_of_two
200 ARB_texture_query_levels
201 ARB_texture_query_lod
202 ARB_texture_rectangle
203 ARB_texture_rg
204 ARB_texture_rgb10_a2ui
205 ARB_texture_stencil8
206 ARB_texture_storage
207 ARB_texture_storage_multisample
208 ARB_texture_swizzle
209 ARB_texture_view
210 ARB_timer_query
211 ARB_transform_feedback2
212 ARB_transform_feedback3
213 ARB_transform_feedback_instanced
214 ARB_transform_feedback_overflow_query
215 ARB_transpose_matrix
216 ARB_uniform_buffer_object
217 ARB_vertex_array_bgra
218 ARB_vertex_array_object
219 ARB_vertex_attrib_64bit
220 ARB_vertex_attrib_binding
221 ARB_vertex_blend
222 ARB_vertex_buffer_object
223 ARB_vertex_program
224 ARB_vertex_shader
225 ARB_vertex_type_10f_11f_11f_rev
226 ARB_vertex_type_2_10_10_10_rev
227 ARB_viewport_array
228 ARB_window_pos
62 ARB_ES2_compatibility
63 ARB_ES3_1_compatibility
64 ARB_ES3_2_compatibility
65 ARB_ES3_compatibility
66 ARB_arrays_of_arrays
67 ARB_base_instance
68 ARB_bindless_texture
69 ARB_blend_func_extended
70 ARB_buffer_storage
71 ARB_cl_event
72 ARB_clear_buffer_object
73 ARB_clear_texture
74 ARB_clip_control
75 ARB_color_buffer_float
76 ARB_compatibility
77 ARB_compressed_texture_pixel_storage
78 ARB_compute_shader
79 ARB_compute_variable_group_size
80 ARB_conditional_render_inverted
81 ARB_conservative_depth
82 ARB_copy_buffer
83 ARB_copy_image
84 ARB_cull_distance
85 ARB_debug_output
86 ARB_depth_buffer_float
87 ARB_depth_clamp
88 ARB_depth_texture
89 ARB_derivative_control
90 ARB_direct_state_access
91 ARB_draw_buffers
92 ARB_draw_buffers_blend
93 ARB_draw_elements_base_vertex
94 ARB_draw_indirect
95 ARB_draw_instanced
96 ARB_enhanced_layouts
97 ARB_explicit_attrib_location
98 ARB_explicit_uniform_location
99 ARB_fragment_coord_conventions
100 ARB_fragment_layer_viewport
101 ARB_fragment_program
102 ARB_fragment_program_shadow
103 ARB_fragment_shader
104 ARB_fragment_shader_interlock
105 ARB_framebuffer_no_attachments
106 ARB_framebuffer_object
107 ARB_framebuffer_sRGB
108 ARB_geometry_shader4
109 ARB_get_program_binary
110 ARB_get_texture_sub_image
111 ARB_gpu_shader5
112 ARB_gpu_shader_fp64
113 ARB_gpu_shader_int64
114 ARB_half_float_pixel
115 ARB_half_float_vertex
116 ARB_imaging
117 ARB_indirect_parameters
118 ARB_instanced_arrays
119 ARB_internalformat_query
120 ARB_internalformat_query2
121 ARB_invalidate_subdata
122 ARB_map_buffer_alignment
123 ARB_map_buffer_range
124 ARB_matrix_palette
125 ARB_multi_bind
126 ARB_multi_draw_indirect
127 ARB_multisample
128 ARB_multitexture
129 ARB_occlusion_query
130 ARB_occlusion_query2
131 ARB_parallel_shader_compile
132 ARB_pipeline_statistics_query
133 ARB_pixel_buffer_object
134 ARB_point_parameters
135 ARB_point_sprite
136 ARB_post_depth_coverage
137 ARB_program_interface_query
138 ARB_provoking_vertex
139 ARB_query_buffer_object
140 ARB_robust_buffer_access_behavior
141 ARB_robustness
142 ARB_robustness_application_isolation
143 ARB_robustness_share_group_isolation
144 ARB_sample_locations
145 ARB_sample_shading
146 ARB_sampler_objects
147 ARB_seamless_cube_map
148 ARB_seamless_cubemap_per_texture
149 ARB_separate_shader_objects
150 ARB_shader_atomic_counter_ops
151 ARB_shader_atomic_counters
152 ARB_shader_ballot
153 ARB_shader_bit_encoding
154 ARB_shader_clock
155 ARB_shader_draw_parameters
156 ARB_shader_group_vote
157 ARB_shader_image_load_store
158 ARB_shader_image_size
159 ARB_shader_objects
160 ARB_shader_precision
161 ARB_shader_stencil_export
162 ARB_shader_storage_buffer_object
163 ARB_shader_subroutine
164 ARB_shader_texture_image_samples
165 ARB_shader_texture_lod
166 ARB_shader_viewport_layer_array
167 ARB_shading_language_100
168 ARB_shading_language_420pack
169 ARB_shading_language_include
170 ARB_shading_language_packing
171 ARB_shadow
172 ARB_shadow_ambient
173 ARB_sparse_buffer
174 ARB_sparse_texture
175 ARB_sparse_texture2
176 ARB_sparse_texture_clamp
177 ARB_stencil_texturing
178 ARB_sync
179 ARB_tessellation_shader
180 ARB_texture_barrier
181 ARB_texture_border_clamp
182 ARB_texture_buffer_object
183 ARB_texture_buffer_object_rgb32
184 ARB_texture_buffer_range
185 ARB_texture_compression
186 ARB_texture_compression_bptc
187 ARB_texture_compression_rgtc
188 ARB_texture_cube_map
189 ARB_texture_cube_map_array
190 ARB_texture_env_add
191 ARB_texture_env_combine
192 ARB_texture_env_crossbar
193 ARB_texture_env_dot3
194 ARB_texture_filter_minmax
195 ARB_texture_float
196 ARB_texture_gather
197 ARB_texture_mirror_clamp_to_edge
198 ARB_texture_mirrored_repeat
199 ARB_texture_multisample
200 ARB_texture_non_power_of_two
201 ARB_texture_query_levels
202 ARB_texture_query_lod
203 ARB_texture_rectangle
204 ARB_texture_rg
205 ARB_texture_rgb10_a2ui
206 ARB_texture_stencil8
207 ARB_texture_storage
208 ARB_texture_storage_multisample
209 ARB_texture_swizzle
210 ARB_texture_view
211 ARB_timer_query
212 ARB_transform_feedback2
213 ARB_transform_feedback3
214 ARB_transform_feedback_instanced
215 ARB_transform_feedback_overflow_query
216 ARB_transpose_matrix
217 ARB_uniform_buffer_object
218 ARB_vertex_array_bgra
219 ARB_vertex_array_object
220 ARB_vertex_attrib_64bit
221 ARB_vertex_attrib_binding
222 ARB_vertex_blend
223 ARB_vertex_buffer_object
224 ARB_vertex_program
225 ARB_vertex_shader
226 ARB_vertex_type_10f_11f_11f_rev
227 ARB_vertex_type_2_10_10_10_rev
228 ARB_viewport_array
229 ARB_window_pos

229 ATIX_point_sprites
230 ATIX_texture_env_combine3
231 ATIX_texture_env_route
232 ATIX_vertex_shader_output_point_size
230 ATIX_point_sprites
231 ATIX_texture_env_combine3
232 ATIX_texture_env_route
233 ATIX_vertex_shader_output_point_size

233 ATI_draw_buffers
234 ATI_element_array
235 ATI_envmap_bumpmap
236 ATI_fragment_shader
237 ATI_map_object_buffer
238 ATI_meminfo
239 ATI_pn_triangles
240 ATI_separate_stencil
241 ATI_shader_texture_lod
242 ATI_text_fragment_shader
243 ATI_texture_compression_3dc
244 ATI_texture_env_combine3
245 ATI_texture_float
246 ATI_texture_mirror_once
247 ATI_vertex_array_object
248 ATI_vertex_attrib_array_object
249 ATI_vertex_streams
234 ATI_draw_buffers
235 ATI_element_array
236 ATI_envmap_bumpmap
237 ATI_fragment_shader
238 ATI_map_object_buffer
239 ATI_meminfo
240 ATI_pn_triangles
241 ATI_separate_stencil
242 ATI_shader_texture_lod
243 ATI_text_fragment_shader
244 ATI_texture_compression_3dc
245 ATI_texture_env_combine3
246 ATI_texture_float
247 ATI_texture_mirror_once
248 ATI_vertex_array_object
249 ATI_vertex_attrib_array_object
250 ATI_vertex_streams

250 EXT_422_pixels
251 EXT_Cg_shader
252 EXT_abgr
253 EXT_bgra
254 EXT_bindable_uniform
255 EXT_blend_color
256 EXT_blend_equation_separate
257 EXT_blend_func_separate
258 EXT_blend_logic_op
259 EXT_blend_minmax
260 EXT_blend_subtract
261 EXT_clip_volume_hint
262 EXT_cmyka
263 EXT_color_subtable
264 EXT_compiled_vertex_array
265 EXT_convolution
266 EXT_coordinate_frame
267 EXT_copy_texture
268 EXT_cull_vertex
269 EXT_debug_label
270 EXT_debug_marker
271 EXT_depth_bounds_test
272 EXT_direct_state_access
273 EXT_draw_buffers2
274 EXT_draw_instanced
275 EXT_draw_range_elements
276 EXT_fog_coord
277 EXT_fragment_lighting
278 EXT_framebuffer_blit
279 EXT_framebuffer_multisample
280 EXT_framebuffer_multisample_blit_scaled
281 EXT_framebuffer_object
282 EXT_framebuffer_sRGB
283 EXT_geometry_shader4
284 EXT_gpu_program_parameters
285 EXT_gpu_shader4
286 EXT_histogram
287 EXT_index_array_formats
288 EXT_index_func
289 EXT_index_material
290 EXT_index_texture
291 EXT_light_texture
292 EXT_misc_attribute
293 EXT_multi_draw_arrays
294 EXT_multisample
295 EXT_packed_depth_stencil
296 EXT_packed_float
297 EXT_packed_pixels
298 EXT_paletted_texture
299 EXT_pixel_buffer_object
300 EXT_pixel_transform
301 EXT_pixel_transform_color_table
302 EXT_point_parameters
303 EXT_polygon_offset
304 EXT_polygon_offset_clamp
305 EXT_post_depth_coverage
306 EXT_provoking_vertex
307 EXT_raster_multisample
308 EXT_rescale_normal
309 EXT_scene_marker
310 EXT_secondary_color
311 EXT_separate_shader_objects
312 EXT_separate_specular_color
313 EXT_shader_image_load_formatted
314 EXT_shader_image_load_store
315 EXT_shader_integer_mix
316 EXT_shadow_funcs
317 EXT_shared_texture_palette
318 EXT_sparse_texture2
319 EXT_stencil_clear_tag
320 EXT_stencil_two_side
321 EXT_stencil_wrap
322 EXT_subtexture
323 EXT_texture
324 EXT_texture3D
325 EXT_texture_array
326 EXT_texture_buffer_object
327 EXT_texture_compression_dxt1
328 EXT_texture_compression_latc
329 EXT_texture_compression_rgtc
330 EXT_texture_compression_s3tc
331 EXT_texture_cube_map
332 EXT_texture_edge_clamp
333 EXT_texture_env
334 EXT_texture_env_add
335 EXT_texture_env_combine
336 EXT_texture_env_dot3
337 EXT_texture_filter_anisotropic
338 EXT_texture_filter_minmax
339 EXT_texture_integer
340 EXT_texture_lod_bias
341 EXT_texture_mirror_clamp
342 EXT_texture_object
343 EXT_texture_perturb_normal
344 EXT_texture_rectangle
345 EXT_texture_sRGB
346 EXT_texture_sRGB_decode
347 EXT_texture_shared_exponent
348 EXT_texture_snorm
349 EXT_texture_swizzle
350 EXT_timer_query
351 EXT_transform_feedback
352 EXT_vertex_array
353 EXT_vertex_array_bgra
354 EXT_vertex_attrib_64bit
355 EXT_vertex_shader
356 EXT_vertex_weighting
357 EXT_x11_sync_object
251 EGL_NV_robustness_video_memory_purge

358 GREMEDY_frame_terminator
359 GREMEDY_string_marker
252 EXT_422_pixels
253 EXT_Cg_shader
254 EXT_abgr
255 EXT_bgra
256 EXT_bindable_uniform
257 EXT_blend_color
258 EXT_blend_equation_separate
259 EXT_blend_func_separate
260 EXT_blend_logic_op
261 EXT_blend_minmax
262 EXT_blend_subtract
263 EXT_clip_volume_hint
264 EXT_cmyka
265 EXT_color_subtable
266 EXT_compiled_vertex_array
267 EXT_convolution
268 EXT_coordinate_frame
269 EXT_copy_texture
270 EXT_cull_vertex
271 EXT_debug_label
272 EXT_debug_marker
273 EXT_depth_bounds_test
274 EXT_direct_state_access
275 EXT_draw_buffers2
276 EXT_draw_instanced
277 EXT_draw_range_elements
278 EXT_fog_coord
279 EXT_fragment_lighting
280 EXT_framebuffer_blit
281 EXT_framebuffer_multisample
282 EXT_framebuffer_multisample_blit_scaled
283 EXT_framebuffer_object
284 EXT_framebuffer_sRGB
285 EXT_geometry_shader4
286 EXT_gpu_program_parameters
287 EXT_gpu_shader4
288 EXT_histogram
289 EXT_index_array_formats
290 EXT_index_func
291 EXT_index_material
292 EXT_index_texture
293 EXT_light_texture
294 EXT_misc_attribute
295 EXT_multi_draw_arrays
296 EXT_multisample
297 EXT_packed_depth_stencil
298 EXT_packed_float
299 EXT_packed_pixels
300 EXT_paletted_texture
301 EXT_pixel_buffer_object
302 EXT_pixel_transform
303 EXT_pixel_transform_color_table
304 EXT_point_parameters
305 EXT_polygon_offset
306 EXT_polygon_offset_clamp
307 EXT_post_depth_coverage
308 EXT_provoking_vertex
309 EXT_raster_multisample
310 EXT_rescale_normal
311 EXT_scene_marker
312 EXT_secondary_color
313 EXT_separate_shader_objects
314 EXT_separate_specular_color
315 EXT_shader_image_load_formatted
316 EXT_shader_image_load_store
317 EXT_shader_integer_mix
318 EXT_shadow_funcs
319 EXT_shared_texture_palette
320 EXT_sparse_texture2
321 EXT_stencil_clear_tag
322 EXT_stencil_two_side
323 EXT_stencil_wrap
324 EXT_subtexture
325 EXT_texture
326 EXT_texture3D
327 EXT_texture_array
328 EXT_texture_buffer_object
329 EXT_texture_compression_dxt1
330 EXT_texture_compression_latc
331 EXT_texture_compression_rgtc
332 EXT_texture_compression_s3tc
333 EXT_texture_cube_map
334 EXT_texture_edge_clamp
335 EXT_texture_env
336 EXT_texture_env_add
337 EXT_texture_env_combine
338 EXT_texture_env_dot3
339 EXT_texture_filter_anisotropic
340 EXT_texture_filter_minmax
341 EXT_texture_integer
342 EXT_texture_lod_bias
343 EXT_texture_mirror_clamp
344 EXT_texture_object
345 EXT_texture_perturb_normal
346 EXT_texture_rectangle
347 EXT_texture_sRGB
348 EXT_texture_sRGB_decode
349 EXT_texture_shared_exponent
350 EXT_texture_snorm
351 EXT_texture_swizzle
352 EXT_timer_query
353 EXT_transform_feedback
354 EXT_vertex_array
355 EXT_vertex_array_bgra
356 EXT_vertex_attrib_64bit
357 EXT_vertex_shader
358 EXT_vertex_weighting
359 EXT_window_rectangles
360 EXT_x11_sync_object

360 HP_convolution_border_modes
361 HP_image_transform
362 HP_occlusion_test
363 HP_texture_lighting
361 GREMEDY_frame_terminator
362 GREMEDY_string_marker

364 IBM_cull_vertex
365 IBM_multimode_draw_arrays
366 IBM_rasterpos_clip
367 IBM_static_data
368 IBM_texture_mirrored_repeat
369 IBM_vertex_array_lists
363 HP_convolution_border_modes
364 HP_image_transform
365 HP_occlusion_test
366 HP_texture_lighting

370 INGR_color_clamp
371 INGR_interlace_read
367 IBM_cull_vertex
368 IBM_multimode_draw_arrays
369 IBM_rasterpos_clip
370 IBM_static_data
371 IBM_texture_mirrored_repeat
372 IBM_vertex_array_lists

372 INTEL_fragment_shader_ordering
373 INTEL_framebuffer_CMAA
374 INTEL_map_texture
375 INTEL_parallel_arrays
376 INTEL_performance_query
377 INTEL_texture_scissor
373 INGR_color_clamp
374 INGR_interlace_read

378 KHR_blend_equation_advanced
379 KHR_blend_equation_advanced_coherent
380 KHR_context_flush_control
381 KHR_debug
382 KHR_no_error
383 KHR_robust_buffer_access_behavior
384 KHR_robustness
385 KHR_texture_compression_astc_hdr
386 KHR_texture_compression_astc_ldr
375 INTEL_fragment_shader_ordering
376 INTEL_framebuffer_CMAA
377 INTEL_map_texture
378 INTEL_parallel_arrays
379 INTEL_performance_query
380 INTEL_texture_scissor

387 KTX_buffer_region
381 KHR_blend_equation_advanced
382 KHR_blend_equation_advanced_coherent
383 KHR_context_flush_control
384 KHR_debug
385 KHR_no_error
386 KHR_robust_buffer_access_behavior
387 KHR_robustness
388 KHR_texture_compression_astc_hdr
389 KHR_texture_compression_astc_ldr
390 KHR_texture_compression_astc_sliced_3d

388 MESAX_texture_stack
391 KTX_buffer_region

389 MESA_pack_invert
390 MESA_resize_buffers
391 MESA_window_pos
392 MESA_ycbcr_texture
392 MESAX_texture_stack

393 NVX_conditional_render
394 NVX_gpu_memory_info
393 MESA_pack_invert
394 MESA_resize_buffers
395 MESA_window_pos
396 MESA_ycbcr_texture

395 NV_bindless_multi_draw_indirect
396 NV_bindless_multi_draw_indirect_count
397 NV_bindless_texture
398 NV_blend_equation_advanced
399 NV_blend_equation_advanced_coherent
400 NV_blend_square
401 NV_compute_program5
402 NV_conditional_render
403 NV_conservative_raster
404 NV_conservative_raster_dilate
405 NV_copy_depth_to_color
406 NV_copy_image
407 NV_deep_texture3D
408 NV_depth_buffer_float
409 NV_depth_clamp
410 NV_depth_range_unclamped
411 NV_draw_texture
412 NV_evaluators
413 NV_explicit_multisample
414 NV_fence
415 NV_fill_rectangle
416 NV_float_buffer
417 NV_fog_distance
418 NV_fragment_coverage_to_color
419 NV_fragment_program
420 NV_fragment_program2
421 NV_fragment_program4
422 NV_fragment_program_option
423 NV_fragment_shader_interlock
424 NV_framebuffer_mixed_samples
425 NV_framebuffer_multisample_coverage
426 NV_geometry_program4
427 NV_geometry_shader4
428 NV_geometry_shader_passthrough
429 NV_gpu_program4
430 NV_gpu_program5
431 NV_gpu_program5_mem_extended
432 NV_gpu_program_fp64
433 NV_gpu_shader5
434 NV_half_float
435 NV_internalformat_sample_query
436 NV_light_max_exponent
437 NV_multisample_coverage
438 NV_multisample_filter_hint
439 NV_occlusion_query
440 NV_packed_depth_stencil
441 NV_parameter_buffer_object
442 NV_parameter_buffer_object2
443 NV_path_rendering
444 NV_path_rendering_shared_edge
445 NV_pixel_data_range
446 NV_point_sprite
447 NV_present_video
448 NV_primitive_restart
449 NV_register_combiners
450 NV_register_combiners2
451 NV_sample_locations
452 NV_sample_mask_override_coverage
453 NV_shader_atomic_counters
454 NV_shader_atomic_float
455 NV_shader_atomic_fp16_vector
456 NV_shader_atomic_int64
457 NV_shader_buffer_load
458 NV_shader_storage_buffer_object
459 NV_shader_thread_group
460 NV_shader_thread_shuffle
461 NV_tessellation_program5
462 NV_texgen_emboss
463 NV_texgen_reflection
464 NV_texture_barrier
465 NV_texture_compression_vtc
466 NV_texture_env_combine4
467 NV_texture_expand_normal
468 NV_texture_multisample
469 NV_texture_rectangle
470 NV_texture_shader
471 NV_texture_shader2
472 NV_texture_shader3
473 NV_transform_feedback
474 NV_transform_feedback2
475 NV_uniform_buffer_unified_memory
476 NV_vdpau_interop
477 NV_vertex_array_range
478 NV_vertex_array_range2
479 NV_vertex_attrib_integer_64bit
480 NV_vertex_buffer_unified_memory
481 NV_vertex_program
482 NV_vertex_program1_1
483 NV_vertex_program2
484 NV_vertex_program2_option
485 NV_vertex_program3
486 NV_vertex_program4
487 NV_video_capture
488 NV_viewport_array2
397 NVX_conditional_render
398 NVX_gpu_memory_info
399 NVX_linked_gpu_multicast

489 OES_byte_coordinates
490 OES_compressed_paletted_texture
491 OES_read_format
492 OES_single_precision
400 NV_bindless_multi_draw_indirect
401 NV_bindless_multi_draw_indirect_count
402 NV_bindless_texture
403 NV_blend_equation_advanced
404 NV_blend_equation_advanced_coherent
405 NV_blend_square
406 NV_clip_space_w_scaling
407 NV_command_list
408 NV_compute_program5
409 NV_conditional_render
410 NV_conservative_raster
411 NV_conservative_raster_dilate
412 NV_conservative_raster_pre_snap_triangles
413 NV_copy_depth_to_color
414 NV_copy_image
415 NV_deep_texture3D
416 NV_depth_buffer_float
417 NV_depth_clamp
418 NV_depth_range_unclamped
419 NV_draw_texture
420 NV_draw_vulkan_image
421 NV_evaluators
422 NV_explicit_multisample
423 NV_fence
424 NV_fill_rectangle
425 NV_float_buffer
426 NV_fog_distance
427 NV_fragment_coverage_to_color
428 NV_fragment_program
429 NV_fragment_program2
430 NV_fragment_program4
431 NV_fragment_program_option
432 NV_fragment_shader_interlock
433 NV_framebuffer_mixed_samples
434 NV_framebuffer_multisample_coverage
435 NV_geometry_program4
436 NV_geometry_shader4
437 NV_geometry_shader_passthrough
438 NV_gpu_program4
439 NV_gpu_program5
440 NV_gpu_program5_mem_extended
441 NV_gpu_program_fp64
442 NV_gpu_shader5
443 NV_half_float
444 NV_internalformat_sample_query
445 NV_light_max_exponent
446 NV_multisample_coverage
447 NV_multisample_filter_hint
448 NV_occlusion_query
449 NV_packed_depth_stencil
450 NV_parameter_buffer_object
451 NV_parameter_buffer_object2
452 NV_path_rendering
453 NV_path_rendering_shared_edge
454 NV_pixel_data_range
455 NV_point_sprite
456 NV_present_video
457 NV_primitive_restart
458 NV_register_combiners
459 NV_register_combiners2
460 NV_robustness_video_memory_purge
461 NV_sample_locations
462 NV_sample_mask_override_coverage
463 NV_shader_atomic_counters
464 NV_shader_atomic_float
465 NV_shader_atomic_float64
466 NV_shader_atomic_fp16_vector
467 NV_shader_atomic_int64
468 NV_shader_buffer_load
469 NV_shader_storage_buffer_object
470 NV_shader_thread_group
471 NV_shader_thread_shuffle
472 NV_stereo_view_rendering
473 NV_tessellation_program5
474 NV_texgen_emboss
475 NV_texgen_reflection
476 NV_texture_barrier
477 NV_texture_compression_vtc
478 NV_texture_env_combine4
479 NV_texture_expand_normal
480 NV_texture_multisample
481 NV_texture_rectangle
482 NV_texture_shader
483 NV_texture_shader2
484 NV_texture_shader3
485 NV_transform_feedback
486 NV_transform_feedback2
487 NV_uniform_buffer_unified_memory
488 NV_vdpau_interop
489 NV_vertex_array_range
490 NV_vertex_array_range2
491 NV_vertex_attrib_integer_64bit
492 NV_vertex_buffer_unified_memory
493 NV_vertex_program
494 NV_vertex_program1_1
495 NV_vertex_program2
496 NV_vertex_program2_option
497 NV_vertex_program3
498 NV_vertex_program4
499 NV_video_capture
500 NV_viewport_array2
501 NV_viewport_swizzle

493 OML_interlace
494 OML_resample
495 OML_subsample
502 OES_byte_coordinates
503 OES_compressed_paletted_texture
504 OES_read_format
505 OES_single_precision

496 OVR_multiview
497 OVR_multiview2
506 OML_interlace
507 OML_resample
508 OML_subsample

498 PGI_misc_hints
499 PGI_vertex_hints
509 OVR_multiview
510 OVR_multiview2

500 REGAL_ES1_0_compatibility
501 REGAL_ES1_1_compatibility
502 REGAL_enable
503 REGAL_error_string
504 REGAL_extension_query
505 REGAL_log
506 REGAL_proc_address
511 PGI_misc_hints
512 PGI_vertex_hints

507 REND_screen_coordinates
513 REGAL_ES1_0_compatibility
514 REGAL_ES1_1_compatibility
515 REGAL_enable
516 REGAL_error_string
517 REGAL_extension_query
518 REGAL_log
519 REGAL_proc_address

508 S3_s3tc
520 REND_screen_coordinates

509 SGIS_color_range
510 SGIS_detail_texture
511 SGIS_fog_function
512 SGIS_generate_mipmap
513 SGIS_multisample
514 SGIS_pixel_texture
515 SGIS_point_line_texgen
516 SGIS_sharpen_texture
517 SGIS_texture4D
518 SGIS_texture_border_clamp
519 SGIS_texture_edge_clamp
520 SGIS_texture_filter4
521 SGIS_texture_lod
522 SGIS_texture_select
521 S3_s3tc

523 SGIX_async
524 SGIX_async_histogram
525 SGIX_async_pixel
526 SGIX_blend_alpha_minmax
527 SGIX_clipmap
528 SGIX_convolution_accuracy
529 SGIX_depth_texture
530 SGIX_flush_raster
531 SGIX_fog_offset
532 SGIX_fog_texture
533 SGIX_fragment_specular_lighting
534 SGIX_framezoom
535 SGIX_interlace
536 SGIX_ir_instrument1
537 SGIX_list_priority
538 SGIX_pixel_texture
539 SGIX_pixel_texture_bits
540 SGIX_reference_plane
541 SGIX_resample
542 SGIX_shadow
543 SGIX_shadow_ambient
544 SGIX_sprite
545 SGIX_tag_sample_buffer
546 SGIX_texture_add_env
547 SGIX_texture_coordinate_clamp
548 SGIX_texture_lod_bias
549 SGIX_texture_multi_buffer
550 SGIX_texture_range
551 SGIX_texture_scale_bias
552 SGIX_vertex_preclip
553 SGIX_vertex_preclip_hint
554 SGIX_ycrcb
522 SGIS_color_range
523 SGIS_detail_texture
524 SGIS_fog_function
525 SGIS_generate_mipmap
526 SGIS_multisample
527 SGIS_pixel_texture
528 SGIS_point_line_texgen
529 SGIS_sharpen_texture
530 SGIS_texture4D
531 SGIS_texture_border_clamp
532 SGIS_texture_edge_clamp
533 SGIS_texture_filter4
534 SGIS_texture_lod
535 SGIS_texture_select

555 SGI_color_matrix
556 SGI_color_table
557 SGI_texture_color_table
536 SGIX_async
537 SGIX_async_histogram
538 SGIX_async_pixel
539 SGIX_blend_alpha_minmax
540 SGIX_clipmap
541 SGIX_convolution_accuracy
542 SGIX_depth_texture
543 SGIX_flush_raster
544 SGIX_fog_offset
545 SGIX_fog_texture
546 SGIX_fragment_specular_lighting
547 SGIX_framezoom
548 SGIX_interlace
549 SGIX_ir_instrument1
550 SGIX_list_priority
551 SGIX_pixel_texture
552 SGIX_pixel_texture_bits
553 SGIX_reference_plane
554 SGIX_resample
555 SGIX_shadow
556 SGIX_shadow_ambient
557 SGIX_sprite
558 SGIX_tag_sample_buffer
559 SGIX_texture_add_env
560 SGIX_texture_coordinate_clamp
561 SGIX_texture_lod_bias
562 SGIX_texture_multi_buffer
563 SGIX_texture_range
564 SGIX_texture_scale_bias
565 SGIX_vertex_preclip
566 SGIX_vertex_preclip_hint
567 SGIX_ycrcb

558 SUNX_constant_data
568 SGI_color_matrix
569 SGI_color_table
570 SGI_texture_color_table

559 SUN_convolution_border_modes
560 SUN_global_alpha
561 SUN_mesh_array
562 SUN_read_video_pixels
563 SUN_slice_accum
564 SUN_triangle_list
565 SUN_vertex
571 SUNX_constant_data

566 WIN_phong_shading
567 WIN_specular_fog
568 WIN_swap_hint
572 SUN_convolution_border_modes
573 SUN_global_alpha
574 SUN_mesh_array
575 SUN_read_video_pixels
576 SUN_slice_accum
577 SUN_triangle_list
578 SUN_vertex

579 WIN_phong_shading
580 WIN_specular_fog
581 WIN_swap_hint
diff --git a/doc/glew.txt b/doc/glew.txt index 31a31d3..67b4aff 100644 --- a/doc/glew.txt +++ b/doc/glew.txt @@ -1,4 +1,5 @@ The OpenGL Extension Wrangler Library +Copyright (C) 2008-2016, Nigel Stewart Copyright (C) 2002-2008, Milan Ikits Copyright (C) 2002-2008, Marcelo E. Magallon Copyright (C) 2002, Lev Povalahev diff --git a/doc/glxew.html b/doc/glxew.html index 576ddd3..d106a93 100644 --- a/doc/glxew.html +++ b/doc/glxew.html @@ -57,12 +57,15 @@ THE POSSIBILITY OF SUCH DAMAGE. Building Installation Source Generation -Credits & Copyright Change Log - +
GitHub -Project Page -Bug Tracker +Issues +Pull Requests +Authors +Licensing +
+SourceForge Page
@@ -72,10 +75,11 @@ THE POSSIBILITY OF SUCH DAMAGE. - + @@ -120,58 +124,60 @@ THE POSSIBILITY OF SUCH DAMAGE. - - - - - - - + + + + + + + + - + - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + + - - + + - - - - + + + + - - - - - - - + + + + + + + - - - - + + + + - - + +
Last Update: 08-10-15
Last Update: 01-31-16
OpenGL Logo
GitHub Logo
+ Travis Logo
SourceForge Logo
19 EXT_fbconfig_packed_float
20 EXT_framebuffer_sRGB
21 EXT_import_context
22 EXT_scene_marker
23 EXT_stereo_tree
24 EXT_swap_control
25 EXT_swap_control_tear
26 EXT_texture_from_pixmap
27 EXT_visual_info
28 EXT_visual_rating
22 EXT_libglvnd
23 EXT_scene_marker
24 EXT_stereo_tree
25 EXT_swap_control
26 EXT_swap_control_tear
27 EXT_texture_from_pixmap
28 EXT_visual_info
29 EXT_visual_rating

29 INTEL_swap_event
30 INTEL_swap_event

30 MESA_agp_offset
31 MESA_copy_sub_buffer
32 MESA_pixmap_colormap
33 MESA_query_renderer
34 MESA_release_buffers
35 MESA_set_3dfx_mode
36 MESA_swap_control
31 MESA_agp_offset
32 MESA_copy_sub_buffer
33 MESA_pixmap_colormap
34 MESA_query_renderer
35 MESA_release_buffers
36 MESA_set_3dfx_mode
37 MESA_swap_control

37 NV_copy_buffer
38 NV_copy_image
39 NV_delay_before_swap
40 NV_float_buffer
41 NV_multisample_coverage
42 NV_present_video
43 NV_swap_group
44 NV_vertex_array_range
45 NV_video_capture
46 NV_video_out
38 NV_copy_buffer
39 NV_copy_image
40 NV_delay_before_swap
41 NV_float_buffer
42 NV_multisample_coverage
43 NV_present_video
44 NV_robustness_video_memory_purge
45 NV_swap_group
46 NV_vertex_array_range
47 NV_video_capture
48 NV_video_out

47 OML_swap_method
48 OML_sync_control
49 OML_swap_method
50 OML_sync_control

49 SGIS_blended_overlay
50 SGIS_color_range
51 SGIS_multisample
52 SGIS_shared_multisample
51 SGIS_blended_overlay
52 SGIS_color_range
53 SGIS_multisample
54 SGIS_shared_multisample

53 SGIX_fbconfig
54 SGIX_hyperpipe
55 SGIX_pbuffer
56 SGIX_swap_barrier
57 SGIX_swap_group
58 SGIX_video_resize
59 SGIX_visual_select_group
55 SGIX_fbconfig
56 SGIX_hyperpipe
57 SGIX_pbuffer
58 SGIX_swap_barrier
59 SGIX_swap_group
60 SGIX_video_resize
61 SGIX_visual_select_group

60 SGI_cushion
61 SGI_make_current_read
62 SGI_swap_control
63 SGI_video_sync
62 SGI_cushion
63 SGI_make_current_read
64 SGI_swap_control
65 SGI_video_sync

64 SUN_get_transparent_index
65 SUN_video_resize
66 SUN_get_transparent_index
67 SUN_video_resize
diff --git a/doc/index.html b/doc/index.html index b9b3605..f62b963 100644 --- a/doc/index.html +++ b/doc/index.html @@ -57,12 +57,15 @@ THE POSSIBILITY OF SUCH DAMAGE. Building Installation Source Generation -Credits & Copyright Change Log - +
GitHub -Project Page -Bug Tracker +Issues +Pull Requests +Authors +Licensing +
+SourceForge Page
@@ -72,10 +75,11 @@ THE POSSIBILITY OF SUCH DAMAGE. - + @@ -154,8 +158,9 @@ An up-to-date copy is also available using gitUnsupported snapshots are also available:

Supported Extensions

diff --git a/doc/install.html b/doc/install.html index 4d00db8..e9427bc 100644 --- a/doc/install.html +++ b/doc/install.html @@ -57,12 +57,15 @@ THE POSSIBILITY OF SUCH DAMAGE. - - + - - + + + + + +
Last Update: 08-10-15
Last Update: 01-31-16
OpenGL Logo
GitHub Logo
+ Travis Logo
SourceForge Logo
Building
Installation
Source Generation
Credits & Copyright
Change Log

GitHub
Project Page
Bug Tracker
Issues
Pull Requests
Authors
Licensing

SourceForge Page

@@ -72,10 +75,11 @@ THE POSSIBILITY OF SUCH DAMAGE. - + diff --git a/doc/log.html b/doc/log.html index efa0a9f..41c6e27 100644 --- a/doc/log.html +++ b/doc/log.html @@ -57,12 +57,15 @@ THE POSSIBILITY OF SUCH DAMAGE. - - + - - + + + + + +
Last Update: 08-10-15
Last Update: 01-31-16
OpenGL Logo
GitHub Logo
+ Travis Logo
SourceForge Logo
Building
Installation
Source Generation
Credits & Copyright
Change Log

GitHub
Project Page
Bug Tracker
Issues
Pull Requests
Authors
Licensing

SourceForge Page

@@ -72,10 +75,11 @@ THE POSSIBILITY OF SUCH DAMAGE. - + @@ -103,6 +107,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
  • glxewInit, wglewInit
  • glewinfo adds support for -version, -profile core|compatibility and -flag debug|forward parameters
  • Improved cmake build support + +
    • New extensions:
        diff --git a/doc/travis.png b/doc/travis.png new file mode 100644 index 0000000..caf2607 Binary files /dev/null and b/doc/travis.png differ diff --git a/doc/wglew.html b/doc/wglew.html index 903cb36..1dd5863 100644 --- a/doc/wglew.html +++ b/doc/wglew.html @@ -57,12 +57,15 @@ THE POSSIBILITY OF SUCH DAMAGE.
    • - - + - - + + + + + +
    Last Update: 08-10-15
    Last Update: 01-31-16
    OpenGL Logo
    GitHub Logo
    + Travis Logo
    SourceForge Logo
    Building
    Installation
    Source Generation
    Credits & Copyright
    Change Log

    GitHub
    Project Page
    Bug Tracker
    Issues
    Pull Requests
    Authors
    Licensing

    SourceForge Page

    @@ -72,10 +75,11 @@ THE POSSIBILITY OF SUCH DAMAGE. - + diff --git a/src/visualinfo.c b/src/visualinfo.c index c24bbaf..d089207 100644 --- a/src/visualinfo.c +++ b/src/visualinfo.c @@ -37,6 +37,8 @@ #if defined(GLEW_OSMESA) #define GLAPI extern #include +#elif defined(GLEW_EGL) +#include #elif defined(_WIN32) #include #elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX) @@ -62,6 +64,8 @@ typedef struct GLContextStruct { #if defined(GLEW_OSMESA) OSMesaContext ctx; +#elif defined(GLEW_EGL) + EGLContext ctx; #elif defined(_WIN32) HWND wnd; HDC dc; @@ -186,6 +190,7 @@ main (int argc, char** argv) /* ---------------------------------------------------------------------- */ /* extensions string */ #if defined(GLEW_OSMESA) +#elif defined(GLEW_EGL) #elif defined(_WIN32) /* WGL extensions */ if (WGLEW_ARB_extensions_string || WGLEW_EXT_extensions_string) @@ -264,7 +269,7 @@ void PrintExtensions (const char* s) /* ---------------------------------------------------------------------- */ -#if defined(GLEW_OSMESA) +#if defined(GLEW_OSMESA) || defined(GLEW_EGL) void VisualInfo (GLContext* ctx) @@ -1048,6 +1053,27 @@ void DestroyContext (GLContext* ctx) if (NULL == ctx) return; if (NULL != ctx->ctx) OSMesaDestroyContext(ctx->ctx); } +/* ------------------------------------------------------------------------ */ + +#elif defined(GLEW_EGL) +void InitContext (GLContext* ctx) +{ + ctx->ctx = NULL; +} + +GLboolean CreateContext (GLContext* ctx) +{ + return GL_FALSE; +} + +void DestroyContext (GLContext* ctx) +{ + if (NULL == ctx) return; + return; +} + +/* ------------------------------------------------------------------------ */ + #elif defined(_WIN32) void InitContext (GLContext* ctx)
    Last Update: 08-10-15
    Last Update: 01-31-16
    OpenGL Logo
    GitHub Logo
    + Travis Logo
    SourceForge Logo