From 385ad31ec4b06b4212f440ee4476cb90a171c9ab Mon Sep 17 00:00:00 2001 From: ikits Date: Thu, 2 Mar 2006 06:51:14 +0000 Subject: [PATCH] final fix for glBlendColor problem git-svn-id: https://glew.svn.sourceforge.net/svnroot/glew/trunk/glew@428 783a27ee-832a-0410-bc00-9f386506c6dd --- auto/Makefile | 3 ++- auto/core/GL_ARB_imaging | 1 - auto/core/GL_VERSION_1_4 | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/auto/Makefile b/auto/Makefile index 1893d31..a04735c 100644 --- a/auto/Makefile +++ b/auto/Makefile @@ -207,7 +207,7 @@ $(S.DEST)/glew.c: $(EXT)/.dummy cat $(SRC)/glew_str_tail.c >> $@ perl -e "s/GLEW_VERSION_STRING/$(GLEW_VERSION)/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/\(\(glBlendColor = /((glBlendEquation = (PFNGLBLENDEQUATIONPROC)glewGetProcAddress((const GLubyte*)\"glBlendEquation\")) == NULL) || r;\n r = ((glBlendColor = /g" -pi $@ + perl -e "s/\(\(glColorSubTable = /((glBlendEquation = (PFNGLBLENDEQUATIONPROC)glewGetProcAddress((const GLubyte*)\"glBlendEquation\")) == NULL) || r;\n r = ((glColorSubTable = /g" -pi $@ $(BIN)/fix_OML_sync_control.sh $@ rm -f $@.bak @@ -304,6 +304,7 @@ $(S.DEST)/glewinfo.c: $(EXT)/.dummy $(BIN)/make_info_list.pl $(GLX_EXT_SPEC) >> $@ cat $(SRC)/glewinfo_tail.c >> $@ $(BIN)/fix_OML_sync_control.sh $@ + perl -e 's/"glColorSubTable"/"glBlendEquation", glBlendEquation == NULL);\n glewInfoFunc("glColorSubTable"/g' -pi $@ $(D.DEST)/glew.html: $(EXT)/.dummy @echo "--------------------------------------------------------------------" diff --git a/auto/core/GL_ARB_imaging b/auto/core/GL_ARB_imaging index c36822f..66dd527 100644 --- a/auto/core/GL_ARB_imaging +++ b/auto/core/GL_ARB_imaging @@ -76,7 +76,6 @@ GL_ARB_imaging GL_WRAP_BORDER 0x8152 GL_REPLICATE_BORDER 0x8153 GL_CONVOLUTION_BORDER_COLOR 0x8154 - void glBlendEquation (GLenum mode) void glColorTable (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table) void glColorSubTable (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data) void glColorTableParameteriv (GLenum target, GLenum pname, const GLint *params) diff --git a/auto/core/GL_VERSION_1_4 b/auto/core/GL_VERSION_1_4 index a795e0a..a9fbeb5 100644 --- a/auto/core/GL_VERSION_1_4 +++ b/auto/core/GL_VERSION_1_4 @@ -38,6 +38,7 @@ GL_VERSION_1_4 GL_TEXTURE_LOD_BIAS 0x8501 GL_MAX_TEXTURE_LOD_BIAS 0x84FD GL_MIRRORED_REPEAT 0x8370 + void glBlendEquation (GLenum mode) void glBlendColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha) void glFogCoordf (GLfloat coord) void glFogCoordfv (const GLfloat *coord)