diff --git a/Makefile b/Makefile index bb019a5..568ae59 100644 --- a/Makefile +++ b/Makefile @@ -181,8 +181,9 @@ install.lib: glew.lib $(INSTALL) -d -m 0755 $(LIBDIR) # runtime ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) + $(INSTALL) -d -m 0755 $(BINDIR) $(STRIP) -x lib/$(LIB.SHARED) - $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(BINDIR)/ + $(INSTALL) -m 0755 lib/$(LIB.SHARED) $(BINDIR)/ else $(STRIP) -x lib/$(LIB.SHARED) $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/ @@ -192,17 +193,18 @@ endif ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) $(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(LIBDIR)/ else - $(STRIP) -x lib/$(LIB.STATIC) - $(INSTALL) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/ $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK) endif + $(STRIP) -x lib/$(LIB.STATIC) + $(INSTALL) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/ install.lib.mx: glew.lib.mx $(INSTALL) -d -m 0755 $(LIBDIR) # runtime ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) + $(INSTALL) -d -m 0755 $(BINDIR) $(STRIP) -x lib/$(LIB.SHARED.MX) - $(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) $(BINDIR)/ + $(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) $(BINDIR)/ else $(STRIP) -x lib/$(LIB.SHARED.MX) $(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) $(LIBDIR)/ @@ -212,10 +214,10 @@ endif ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) $(INSTALL) -m 0644 lib/$(LIB.DEVLNK.MX) $(LIBDIR)/ else - $(STRIP) -x lib/$(LIB.STATIC.MX) - $(INSTALL) -m 0644 lib/$(LIB.STATIC.MX) $(LIBDIR)/ $(LN) $(LIB.SHARED.MX) $(LIBDIR)/$(LIB.DEVLNK.MX) endif + $(STRIP) -x lib/$(LIB.STATIC.MX) + $(INSTALL) -m 0644 lib/$(LIB.STATIC.MX) $(LIBDIR)/ install.bin: glew.bin $(INSTALL) -d -m 0755 $(BINDIR) @@ -247,8 +249,8 @@ ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) else $(RM) $(LIBDIR)/$(LIB.SONAME) $(LIBDIR)/$(LIB.SONAME.MX) $(RM) $(LIBDIR)/$(LIB.SHARED) $(LIBDIR)/$(LIB.SHARED.MX) - $(RM) $(LIBDIR)/$(LIB.STATIC) $(LIBDIR)/$(LIB.STATIC.MX) endif + $(RM) $(LIBDIR)/$(LIB.STATIC) $(LIBDIR)/$(LIB.STATIC.MX) $(RM) $(BINDIR)/$(GLEWINFO.BIN) $(BINDIR)/$(VISUALINFO.BIN) clean: @@ -278,7 +280,10 @@ dist-win32: cp -a *.txt $(TARDIR) cp -a lib/glew32.lib $(TARDIR)/lib cp -a lib/glew32s.lib $(TARDIR)/lib + cp -a lib/glew32mx.lib $(TARDIR)/lib + cp -a lib/glew32mxs.lib $(TARDIR)/lib cp -a bin/glew32.dll $(TARDIR)/bin + cp -a bin/glew32mx.dll $(TARDIR)/bin cp -a bin/glewinfo.exe $(TARDIR)/bin cp -a bin/visualinfo.exe $(TARDIR)/bin find $(TARDIR) -name CVS -o -name .cvsignore | xargs $(RM) -r diff --git a/auto/Makefile b/auto/Makefile index 7ec6bcd..f4a24d1 100644 --- a/auto/Makefile +++ b/auto/Makefile @@ -22,11 +22,11 @@ BLACKLIST = blacklist GL_CORE_SPEC := $(CORE)/GL_VERSION* GLX_CORE_SPEC := $(CORE)/GLX_VERSION* ifeq (custom,$(MAKECMDGOALS)) -#GL_CORE_SPEC := $(shell grep GL_VERSION custom.txt | sed -e 's/\(.*\)/$(CORE)\/\1/g;') -GL_EXT_SPEC := $(shell grep "^[ \t]*GL_" custom.txt | grep -v GL_VERSION | sed -e 's/\(.*\)/$(EXT)\/\1/g;') -WGL_EXT_SPEC := $(shell grep "^[ \t]*WGL_" custom.txt | sed -e 's/\(.*\)/$(EXT)\/\1/g;') -#GLX_CORE_SPEC := $(shell grep GLX_VERSION custom.txt | sed -e 's/\(.*\)/$(CORE)\/\1/g;') -GLX_EXT_SPEC := $(shell grep "^[ \t]*GLX_" custom.txt | grep -v GLX_VERSION | sed -e 's/\(.*\)/$(EXT)\/\1/g;') +#GL_CORE_SPEC := $(shell grep GL_VERSION custom.txt | perl -e 's/\(.*\)/$(CORE)\/\1/g;') +GL_EXT_SPEC := $(shell grep "^[ \t]*GL_" custom.txt | grep -v GL_VERSION | perl -e 's/\(.*\)/$(EXT)\/\1/g;') +WGL_EXT_SPEC := $(shell grep "^[ \t]*WGL_" custom.txt | perl -e 's/\(.*\)/$(EXT)\/\1/g;') +#GLX_CORE_SPEC := $(shell grep GLX_VERSION custom.txt | perl -e 's/\(.*\)/$(CORE)\/\1/g;') +GLX_EXT_SPEC := $(shell grep "^[ \t]*GLX_" custom.txt | grep -v GLX_VERSION | perl -e 's/\(.*\)/$(EXT)\/\1/g;') else GL_EXT_SPEC := $(EXT)/GL_* WGL_EXT_SPEC := $(EXT)/WGL_* @@ -321,7 +321,7 @@ $(D.DEST)/%.html: doc/%.html @echo "Creating $(@F)" @echo "--------------------------------------------------------------------" cat $(SRC)/header.html $< $(SRC)/footer.html | \ - sed 's#\(.*\)#\1#' > $@ + perl -pe 's#(.*)#\1#' > $@ $(D.DEST)/glew.html: $(EXT)/.dummy @echo "--------------------------------------------------------------------" @@ -331,7 +331,7 @@ $(D.DEST)/glew.html: $(EXT)/.dummy echo -e "

Supported OpenGL Extensions

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

Supported WGL Extensions

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

Supported GLX Extensions

\n" >> $@ $(BIN)/make_html.pl $(GLX_EXT_SPEC) >> $@ cat $(SRC)/footer.html >> $@ - sed -i 's#\(.*\)#\1#' $@ + perl -i -pe 's#(.*)#\1#' $@ $(B.DEST)/%.rc: src/%.rc $(EXT)/.dummy perl -e "s/GLEW_MAJOR/$(GLEW_MAJOR)/g;s/GLEW_MINOR/$(GLEW_MINOR)/g;s/GLEW_MICRO/$(GLEW_MICRO)/g;" -p $< > $@ diff --git a/auto/core/GL_ARB_draw_instanced b/auto/core/GL_ARB_draw_instanced new file mode 100644 index 0000000..4140bea --- /dev/null +++ b/auto/core/GL_ARB_draw_instanced @@ -0,0 +1,3 @@ +GL_ARB_draw_instanced +http://www.opengl.org/registry/specs/ARB/draw_instanced.txt +GL_ARB_draw_instanced diff --git a/auto/core/GL_ARB_instanced_arrays b/auto/core/GL_ARB_instanced_arrays new file mode 100644 index 0000000..b1c8873 --- /dev/null +++ b/auto/core/GL_ARB_instanced_arrays @@ -0,0 +1,7 @@ +GL_ARB_instanced_arrays +http://www.opengl.org/registry/specs/ARB/instanced_arrays.txt +GL_ARB_instanced_arrays + GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB 0x88FE + void glVertexAttribDivisorARB (GLuint index, GLuint divisor) + void glDrawArraysInstancedARB (GLenum mode, GLint first, GLsizei count, GLsizei primcount) + void glDrawElementsInstancedARB (GLenum mode, GLsizei count, GLenum type, const void* indices, GLsizei primcount) diff --git a/auto/core/GL_ARB_robustness b/auto/core/GL_ARB_robustness index 12d98b1..cdeeb4f 100644 --- a/auto/core/GL_ARB_robustness +++ b/auto/core/GL_ARB_robustness @@ -8,6 +8,7 @@ GL_ARB_robustness GL_UNKNOWN_CONTEXT_RESET_ARB 0x8255 GL_RESET_NOTIFICATION_STRATEGY_ARB 0x8256 GL_NO_RESET_NOTIFICATION_ARB 0x8261 + GLenum glGetGraphicsResetStatusARB (void) void glGetnColorTableARB (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void* table) void glGetnCompressedTexImageARB (GLenum target, GLint lod, GLsizei bufSize, void* img) void glGetnConvolutionFilterARB (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void* image) diff --git a/auto/core/GL_EXT_geometry_shader4 b/auto/core/GL_EXT_geometry_shader4 index 888e500..f6f6785 100644 --- a/auto/core/GL_EXT_geometry_shader4 +++ b/auto/core/GL_EXT_geometry_shader4 @@ -23,5 +23,4 @@ GL_EXT_geometry_shader4 GL_PROGRAM_POINT_SIZE_EXT 0x8642 void glProgramParameteriEXT (GLuint program, GLenum pname, GLint value) void glFramebufferTextureEXT (GLenum target, GLenum attachment, GLuint texture, GLint level) - void glFramebufferTextureLayerEXT (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer) void glFramebufferTextureFaceEXT (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face) diff --git a/auto/core/GL_EXT_texture_array b/auto/core/GL_EXT_texture_array index f61e72e..11877f0 100644 --- a/auto/core/GL_EXT_texture_array +++ b/auto/core/GL_EXT_texture_array @@ -9,3 +9,4 @@ GL_EXT_texture_array GL_TEXTURE_BINDING_2D_ARRAY_EXT 0x8C1D GL_MAX_ARRAY_TEXTURE_LAYERS_EXT 0x88FF GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT 0x884E + void glFramebufferTextureLayerEXT (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer) diff --git a/auto/core/GL_VERSION_1_4 b/auto/core/GL_VERSION_1_4 index fd61810..bb47806 100644 --- a/auto/core/GL_VERSION_1_4 +++ b/auto/core/GL_VERSION_1_4 @@ -47,8 +47,8 @@ http://www.opengl.org/documentation/specs/version1.4/glspec14.pdf void glFogCoordd (GLdouble coord) void glFogCoorddv (const GLdouble *coord) void glFogCoordPointer (GLenum type, GLsizei stride, const GLvoid *pointer) - void glMultiDrawArrays (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount) - void glMultiDrawElements (GLenum mode, GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount) + void glMultiDrawArrays (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount) + void glMultiDrawElements (GLenum mode, const GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount) void glPointParameteri (GLenum pname, GLint param) void glPointParameteriv (GLenum pname, const GLint *params) void glPointParameterf (GLenum pname, GLfloat param) diff --git a/auto/doc/index.html b/auto/doc/index.html index 2b4c576..8248e17 100644 --- a/auto/doc/index.html +++ b/auto/doc/index.html @@ -12,8 +12,8 @@ Mac OS X, FreeBSD, Irix, and Solaris.

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

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

News