From da6e5bb4a10bcec07f56dc49b7c1584d96088bb5 Mon Sep 17 00:00:00 2001 From: ikits Date: Fri, 10 Jan 2003 11:48:00 +0000 Subject: [PATCH] Bug fixes: VertexAttribArray typos, EXT_texture_env_combine missing, DrawBuffersATI typo; Added ATI reference doc git-svn-id: https://glew.svn.sourceforge.net/svnroot/glew/trunk/glew@20 783a27ee-832a-0410-bc00-9f386506c6dd --- GNUmakefile | 2 +- doc/README.html | 2 +- doc/glew.html | 16 ++++++++-------- doc/wglew.html | 4 ++-- include/GL/glew.h | 17 +++++++++-------- src/glew.c | 18 +++++++++--------- src/glewinfo.c | 8 ++++---- 7 files changed, 34 insertions(+), 33 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 854e6fd..433eb32 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -16,7 +16,7 @@ ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA GLEW_TARGET ?= /usr -GLEW_VERSION = 1.0.2 +GLEW_VERSION = 1.0.3 CC = \cc LD = \ld diff --git a/doc/README.html b/doc/README.html index 8130552..8d93e5e 100644 --- a/doc/README.html +++ b/doc/README.html @@ -400,7 +400,7 @@ tutorial. +Last update: 12-26-02
-Last update: 12-21-02
diff --git a/doc/glew.html b/doc/glew.html index f3464fe..9615153 100644 --- a/doc/glew.html +++ b/doc/glew.html @@ -109,26 +109,26 @@ name="ATI">ATI -ATI_draw_buffers
+ATI_draw_buffers
ATI_element_array
ATI_envmap_bumpmap
ATI_fragment_shader
-ATI_map_object_buffer
+ATI_map_object_buffer
ATI_mapped_texture
ATI_pn_triangles
ATI_point_cull_mode
-ATI_separate_stencil
+ATI_separate_stencil
ATI_text_fragment_shader
-ATI_texture_float
+ATI_texture_float
ATI_texture_mirror_once
ATI_timestamp
ATI_vertex_array_object
-ATI_vertex_attrib_array_object
+ATI_vertex_attrib_array_object
ATI_vertex_streams
-ATIX_point_sprites
+ATIX_point_sprites
ATIX_texture_env_combine3
ATIX_texture_env_route
-ATIX_vertex_shader_output_point_size
+ATIX_vertex_shader_output_point_size
 @@ -210,7 +210,7 @@ WIN_swap_hint
+Last update: 01-10-03
-Last update: 12-21-02
diff --git a/doc/wglew.html b/doc/wglew.html index 191e371..cc1d1c7 100644 --- a/doc/wglew.html +++ b/doc/wglew.html @@ -78,7 +78,7 @@ name="ATI">ATI -ATI_pixel_format_float
+ATI_pixel_format_float
 @@ -132,7 +132,7 @@ name="OML">OML +Last update: 01-10-03
-Last update: 12-21-02
diff --git a/include/GL/glew.h b/include/GL/glew.h index b02750d..c096acc 100644 --- a/include/GL/glew.h +++ b/include/GL/glew.h @@ -206,6 +206,7 @@ extern "C" { #define GL_EXT_stencil_two_side 1 #define GL_EXT_stencil_wrap 1 /* (1.4) */ #define GL_EXT_texture_compression_s3tc 1 +#define GL_EXT_texture_env_combine 1 #define GL_EXT_texture_filter_anisotropic 1 #define GL_EXT_texture_lod_bias 1 /* (1.4) */ #define GL_EXT_texture_rectangle 1 @@ -3099,9 +3100,9 @@ extern GLEW_EXPORT glAddSwapHintRectWinPROC glAddSwapHintRectWin; #define GL_DRAW_BUFFER14_ATI 0x8833 #define GL_DRAW_BUFFER15_ATI 0x8834 -typedef void (APIENTRY * glDrawBuffersPROC) (GLsizei n, const GLenum *bufs); +typedef void (APIENTRY * glDrawBuffersATIPROC) (GLsizei n, const GLenum *bufs); -extern GLEW_EXPORT glDrawBuffersPROC glDrawBuffers; +extern GLEW_EXPORT glDrawBuffersATIPROC glDrawBuffersATI; #endif /* GL_ATI_draw_buffers */ @@ -3463,13 +3464,13 @@ extern GLEW_EXPORT glGetVariantArrayObjectivATIPROC glGetVariantArrayObjectivATI #ifdef GL_ATI_vertex_attrib_array_object -typedef void (APIENTRY * glVertexAttribArratObjectATIPROC)(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset); -typedef void (APIENTRY * glGetVertexAttribArratObjectfvATIPROC)(GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRY * glGetVertexAttrubAttatObjectivATIPROC)(GLuint index, GLenum pname, GLint *params); +typedef void (APIENTRY * glVertexAttribArrayObjectATIPROC)(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset); +typedef void (APIENTRY * glGetVertexAttribArrayObjectfvATIPROC)(GLuint index, GLenum pname, GLfloat *params); +typedef void (APIENTRY * glGetVertexAttribArrayObjectivATIPROC)(GLuint index, GLenum pname, GLint *params); -extern GLEW_EXPORT glVertexAttribArratObjectATIPROC glVertexAttribArratObjectATI; -extern GLEW_EXPORT glGetVertexAttribArratObjectfvATIPROC glGetVertexAttribArratObjectfvATI; -extern GLEW_EXPORT glGetVertexAttrubAttatObjectivATIPROC glGetVertexAttrubAttatObjectivATI; +extern GLEW_EXPORT glVertexAttribArrayObjectATIPROC glVertexAttribArrayObjectATI; +extern GLEW_EXPORT glGetVertexAttribArrayObjectfvATIPROC glGetVertexAttribArrayObjectfvATI; +extern GLEW_EXPORT glGetVertexAttribArrayObjectivATIPROC glGetVertexAttribArrayObjectivATI; #endif /* GL_ATI_vertex_attrib_array_object */ diff --git a/src/glew.c b/src/glew.c index 0dc1fec..b4448d9 100644 --- a/src/glew.c +++ b/src/glew.c @@ -1130,12 +1130,12 @@ static GLboolean _glewInit_WIN_swap_hint () /* ---------------------------- ATI_draw_buffers -------------------------- */ #ifdef GL_ATI_draw_buffers -glDrawBuffersPROC glDrawBuffers = NULL; +glDrawBuffersATIPROC glDrawBuffersATI = NULL; static GLboolean _glewInit_ATI_draw_buffers () { GLboolean r = GL_FALSE; - r = r || (glDrawBuffers = (glDrawBuffersPROC)glewGetProcAddress("glDrawBuffers")) == NULL; + r = r || (glDrawBuffersATI = (glDrawBuffersATIPROC)glewGetProcAddress("glDrawBuffersATI")) == NULL; return r; } #endif /* GL_ATI_draw_buffers */ @@ -1332,16 +1332,16 @@ static GLboolean _glewInit_ATI_vertex_array_object () /* -------------------- ATI_vertex_attrib_array_object -------------------- */ #ifdef GL_ATI_vertex_attrib_array_object -glVertexAttribArratObjectATIPROC glVertexAttribArratObjectATI = NULL; -glGetVertexAttribArratObjectfvATIPROC glGetVertexAttribArratObjectfvATI = NULL; -glGetVertexAttrubAttatObjectivATIPROC glGetVertexAttrubAttatObjectivATI = NULL; +glVertexAttribArrayObjectATIPROC glVertexAttribArrayObjectATI = NULL; +glGetVertexAttribArrayObjectfvATIPROC glGetVertexAttribArrayObjectfvATI = NULL; +glGetVertexAttribArrayObjectivATIPROC glGetVertexAttribArrayObjectivATI = NULL; static GLboolean _glewInit_ATI_vertex_attrib_array_object () { GLboolean r = GL_FALSE; - r = r || (glVertexAttribArratObjectATI = (glVertexAttribArratObjectATIPROC) glewGetProcAddress("glVertexAttribArratObjectATI")) == NULL; - r = r || (glGetVertexAttribArratObjectfvATI = (glGetVertexAttribArratObjectfvATIPROC) glewGetProcAddress("glGetVertexAttribArratObjectfvATI")) == NULL; - r = r || (glGetVertexAttrubAttatObjectivATI = (glGetVertexAttrubAttatObjectivATIPROC) glewGetProcAddress("glGetVertexAttrubAttatObjectivATI")) == NULL; + r = r || (glVertexAttribArrayObjectATI = (glVertexAttribArrayObjectATIPROC) glewGetProcAddress("glVertexAttribArrayObjectATI")) == NULL; + r = r || (glGetVertexAttribArrayObjectfvATI = (glGetVertexAttribArrayObjectfvATIPROC) glewGetProcAddress("glGetVertexAttribArrayObjectfvATI")) == NULL; + r = r || (glGetVertexAttribArrayObjectivATI = (glGetVertexAttribArrayObjectivATIPROC) glewGetProcAddress("glGetVertexAttribArrayObjectivATI")) == NULL; return r; } #endif /* GL_ATI_vertex_attrib_array_object */ @@ -2832,7 +2832,7 @@ static GLint _glewInit () glew.EXT_texture_compression_s3tc = glewGetExtension("GL_EXT_texture_compression_s3tc"); #endif #ifdef GL_EXT_texture_env_combine - glew.EXT_texture_filter_anisotropic = glewGetExtension("GL_EXT_texture_filter_anisotropic"); + glew.EXT_texture_env_combine = glewGetExtension("GL_EXT_texture_env_combine"); #endif #ifdef GL_EXT_texture_filter_anisotropic glew.EXT_texture_filter_anisotropic = glewGetExtension("GL_EXT_texture_filter_anisotropic"); diff --git a/src/glewinfo.c b/src/glewinfo.c index 375c93c..5bb647b 100644 --- a/src/glewinfo.c +++ b/src/glewinfo.c @@ -723,7 +723,7 @@ static void glewInfo_WIN_swap_hint () static void glewInfo_ATI_draw_buffers () { char me[] = "GL_ATI_draw_buffers"; glewPrintExt(me, glew.ATI_draw_buffers); - glewInfoFunc(glDrawBuffers == NULL, "glDrawBuffers"); + glewInfoFunc(glDrawBuffersATI == NULL, "glDrawBuffersATI"); } #endif /* GL_ATI_draw_buffers */ @@ -859,9 +859,9 @@ static void glewInfo_ATI_vertex_array_object () static void glewInfo_ATI_vertex_attrib_array_object () { char me[] = "GL_ATI_vertex_attrib_array_object"; glewPrintExt(me, glew.ATI_vertex_attrib_array_object); - glewInfoFunc(glVertexAttribArratObjectATI == NULL, "glVertexAttribArratObjectATI"); - glewInfoFunc(glGetVertexAttribArratObjectfvATI == NULL, "glGetVertexAttribArratObjectfvATI"); - glewInfoFunc(glGetVertexAttrubAttatObjectivATI == NULL, "glGetVertexAttrubAttatObjectivATI"); + glewInfoFunc(glVertexAttribArrayObjectATI == NULL, "glVertexAttribArrayObjectATI"); + glewInfoFunc(glGetVertexAttribArrayObjectfvATI == NULL, "glGetVertexAttribArrayObjectfvATI"); + glewInfoFunc(glGetVertexAttribArrayObjectivATI == NULL, "glGetVertexAttribArrayObjectivATI"); } #endif /* GL_ATI_vertex_attrib_array_object */