mirror of
https://github.com/Perlmint/glew-cmake.git
synced 2024-11-29 10:01:56 +00:00
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
This commit is contained in:
parent
b05f87e3d4
commit
da6e5bb4a1
@ -16,7 +16,7 @@
|
|||||||
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
|
||||||
GLEW_TARGET ?= /usr
|
GLEW_TARGET ?= /usr
|
||||||
GLEW_VERSION = 1.0.2
|
GLEW_VERSION = 1.0.3
|
||||||
|
|
||||||
CC = \cc
|
CC = \cc
|
||||||
LD = \ld
|
LD = \ld
|
||||||
|
@ -400,7 +400,7 @@ tutorial.
|
|||||||
<table border="0" cellspacing="0" cellpadding="0" width="100%">
|
<table border="0" cellspacing="0" cellpadding="0" width="100%">
|
||||||
<tr>
|
<tr>
|
||||||
<td align="left">
|
<td align="left">
|
||||||
<i>Last update: 12-21-02</i></td>
|
<i>Last update: 12-26-02</i></td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</td>
|
</td>
|
||||||
|
@ -109,26 +109,26 @@ name="ATI"><font size="+1"><b>ATI</b></font></a>
|
|||||||
<tr>
|
<tr>
|
||||||
<td align="left">
|
<td align="left">
|
||||||
<b>
|
<b>
|
||||||
ATI_draw_buffers<br>
|
<a href="http://www.ati.com/developer/atiopengl.pdf">ATI_draw_buffers</a><br>
|
||||||
<a href="http://oss.sgi.com/projects/ogl-sample/registry/ATI/element_array.txt">ATI_element_array</a><br>
|
<a href="http://oss.sgi.com/projects/ogl-sample/registry/ATI/element_array.txt">ATI_element_array</a><br>
|
||||||
<a href="http://oss.sgi.com/projects/ogl-sample/registry/ATI/envmap_bumpmap.txt">ATI_envmap_bumpmap</a><br>
|
<a href="http://oss.sgi.com/projects/ogl-sample/registry/ATI/envmap_bumpmap.txt">ATI_envmap_bumpmap</a><br>
|
||||||
<a href="http://oss.sgi.com/projects/ogl-sample/registry/ATI/fragment_shader.txt">ATI_fragment_shader</a><br>
|
<a href="http://oss.sgi.com/projects/ogl-sample/registry/ATI/fragment_shader.txt">ATI_fragment_shader</a><br>
|
||||||
ATI_map_object_buffer<br>
|
<a href="http://www.ati.com/developer/atiopengl.pdf">ATI_map_object_buffer</a><br>
|
||||||
ATI_mapped_texture<br>
|
ATI_mapped_texture<br>
|
||||||
<a href="http://oss.sgi.com/projects/ogl-sample/registry/ATI/pn_triangles.txt">ATI_pn_triangles</a><br>
|
<a href="http://oss.sgi.com/projects/ogl-sample/registry/ATI/pn_triangles.txt">ATI_pn_triangles</a><br>
|
||||||
ATI_point_cull_mode<br>
|
ATI_point_cull_mode<br>
|
||||||
ATI_separate_stencil<br>
|
<a href="http://www.ati.com/developer/atiopengl.pdf">ATI_separate_stencil</a><br>
|
||||||
<a href="http://oss.sgi.com/projects/ogl-sample/registry/ATI/text_fragment_shader.txt">ATI_text_fragment_shader</a><br>
|
<a href="http://oss.sgi.com/projects/ogl-sample/registry/ATI/text_fragment_shader.txt">ATI_text_fragment_shader</a><br>
|
||||||
ATI_texture_float<br>
|
<a href="http://www.ati.com/developer/atiopengl.pdf">ATI_texture_float</a><br>
|
||||||
<a href="http://oss.sgi.com/projects/ogl-sample/registry/ATI/texture_mirror_once.txt">ATI_texture_mirror_once</a><br>
|
<a href="http://oss.sgi.com/projects/ogl-sample/registry/ATI/texture_mirror_once.txt">ATI_texture_mirror_once</a><br>
|
||||||
ATI_timestamp<br>
|
ATI_timestamp<br>
|
||||||
<a href="http://oss.sgi.com/projects/ogl-sample/registry/ATI/vertex_array_object.txt">ATI_vertex_array_object</a><br>
|
<a href="http://oss.sgi.com/projects/ogl-sample/registry/ATI/vertex_array_object.txt">ATI_vertex_array_object</a><br>
|
||||||
ATI_vertex_attrib_array_object<br>
|
<a href="http://www.ati.com/developer/atiopengl.pdf">ATI_vertex_attrib_array_object</a><br>
|
||||||
<a href="http://oss.sgi.com/projects/ogl-sample/registry/ATI/vertex_streams.txt">ATI_vertex_streams</a><br>
|
<a href="http://oss.sgi.com/projects/ogl-sample/registry/ATI/vertex_streams.txt">ATI_vertex_streams</a><br>
|
||||||
ATIX_point_sprites<br>
|
<a href="http://www.ati.com/developer/atiopengl.pdf">ATIX_point_sprites</a><br>
|
||||||
<a href="http://www.ati.com/developer/sdk/RadeonSDK/Html/Info/ATIX_texture_env_combine3.txt">ATIX_texture_env_combine3</a><br>
|
<a href="http://www.ati.com/developer/sdk/RadeonSDK/Html/Info/ATIX_texture_env_combine3.txt">ATIX_texture_env_combine3</a><br>
|
||||||
<a href="http://www.ati.com/developer/sdk/RadeonSDK/Html/Info/ATIX_texture_env_route.txt">ATIX_texture_env_route</a><br>
|
<a href="http://www.ati.com/developer/sdk/RadeonSDK/Html/Info/ATIX_texture_env_route.txt">ATIX_texture_env_route</a><br>
|
||||||
ATIX_vertex_shader_output_point_size<br>
|
<a href="http://www.ati.com/developer/atiopengl.pdf">ATIX_vertex_shader_output_point_size</a><br>
|
||||||
</b>
|
</b>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
@ -210,7 +210,7 @@ WIN_swap_hint<br>
|
|||||||
<table border="0" cellspacing="0" cellpadding="0" width="100%">
|
<table border="0" cellspacing="0" cellpadding="0" width="100%">
|
||||||
<tr>
|
<tr>
|
||||||
<td align="left">
|
<td align="left">
|
||||||
<i>Last update: 12-21-02</i></td>
|
<i>Last update: 01-10-03</i></td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</td>
|
</td>
|
||||||
|
@ -78,7 +78,7 @@ name="ATI"><font size="+1"><b>ATI</b></font></a>
|
|||||||
<tr>
|
<tr>
|
||||||
<td align="left">
|
<td align="left">
|
||||||
<b>
|
<b>
|
||||||
ATI_pixel_format_float<br>
|
<a href="http://www.ati.com/developer/atiopengl.pdf">ATI_pixel_format_float</a><br>
|
||||||
</b>
|
</b>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
@ -132,7 +132,7 @@ name="OML"><font size="+1"><b>OML</b></font></a>
|
|||||||
<table border="0" cellspacing="0" cellpadding="0" width="100%">
|
<table border="0" cellspacing="0" cellpadding="0" width="100%">
|
||||||
<tr>
|
<tr>
|
||||||
<td align="left">
|
<td align="left">
|
||||||
<i>Last update: 12-21-02</i></td>
|
<i>Last update: 01-10-03</i></td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</td>
|
</td>
|
||||||
|
@ -206,6 +206,7 @@ extern "C" {
|
|||||||
#define GL_EXT_stencil_two_side 1
|
#define GL_EXT_stencil_two_side 1
|
||||||
#define GL_EXT_stencil_wrap 1 /* (1.4) */
|
#define GL_EXT_stencil_wrap 1 /* (1.4) */
|
||||||
#define GL_EXT_texture_compression_s3tc 1
|
#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_filter_anisotropic 1
|
||||||
#define GL_EXT_texture_lod_bias 1 /* (1.4) */
|
#define GL_EXT_texture_lod_bias 1 /* (1.4) */
|
||||||
#define GL_EXT_texture_rectangle 1
|
#define GL_EXT_texture_rectangle 1
|
||||||
@ -3099,9 +3100,9 @@ extern GLEW_EXPORT glAddSwapHintRectWinPROC glAddSwapHintRectWin;
|
|||||||
#define GL_DRAW_BUFFER14_ATI 0x8833
|
#define GL_DRAW_BUFFER14_ATI 0x8833
|
||||||
#define GL_DRAW_BUFFER15_ATI 0x8834
|
#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 */
|
#endif /* GL_ATI_draw_buffers */
|
||||||
|
|
||||||
@ -3463,13 +3464,13 @@ extern GLEW_EXPORT glGetVariantArrayObjectivATIPROC glGetVariantArrayObjectivATI
|
|||||||
|
|
||||||
#ifdef GL_ATI_vertex_attrib_array_object
|
#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 * glVertexAttribArrayObjectATIPROC)(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 * glGetVertexAttribArrayObjectfvATIPROC)(GLuint index, GLenum pname, GLfloat *params);
|
||||||
typedef void (APIENTRY * glGetVertexAttrubAttatObjectivATIPROC)(GLuint index, GLenum pname, GLint *params);
|
typedef void (APIENTRY * glGetVertexAttribArrayObjectivATIPROC)(GLuint index, GLenum pname, GLint *params);
|
||||||
|
|
||||||
extern GLEW_EXPORT glVertexAttribArratObjectATIPROC glVertexAttribArratObjectATI;
|
extern GLEW_EXPORT glVertexAttribArrayObjectATIPROC glVertexAttribArrayObjectATI;
|
||||||
extern GLEW_EXPORT glGetVertexAttribArratObjectfvATIPROC glGetVertexAttribArratObjectfvATI;
|
extern GLEW_EXPORT glGetVertexAttribArrayObjectfvATIPROC glGetVertexAttribArrayObjectfvATI;
|
||||||
extern GLEW_EXPORT glGetVertexAttrubAttatObjectivATIPROC glGetVertexAttrubAttatObjectivATI;
|
extern GLEW_EXPORT glGetVertexAttribArrayObjectivATIPROC glGetVertexAttribArrayObjectivATI;
|
||||||
|
|
||||||
#endif /* GL_ATI_vertex_attrib_array_object */
|
#endif /* GL_ATI_vertex_attrib_array_object */
|
||||||
|
|
||||||
|
18
src/glew.c
18
src/glew.c
@ -1130,12 +1130,12 @@ static GLboolean _glewInit_WIN_swap_hint ()
|
|||||||
/* ---------------------------- ATI_draw_buffers -------------------------- */
|
/* ---------------------------- ATI_draw_buffers -------------------------- */
|
||||||
|
|
||||||
#ifdef GL_ATI_draw_buffers
|
#ifdef GL_ATI_draw_buffers
|
||||||
glDrawBuffersPROC glDrawBuffers = NULL;
|
glDrawBuffersATIPROC glDrawBuffersATI = NULL;
|
||||||
|
|
||||||
static GLboolean _glewInit_ATI_draw_buffers ()
|
static GLboolean _glewInit_ATI_draw_buffers ()
|
||||||
{
|
{
|
||||||
GLboolean r = GL_FALSE;
|
GLboolean r = GL_FALSE;
|
||||||
r = r || (glDrawBuffers = (glDrawBuffersPROC)glewGetProcAddress("glDrawBuffers")) == NULL;
|
r = r || (glDrawBuffersATI = (glDrawBuffersATIPROC)glewGetProcAddress("glDrawBuffersATI")) == NULL;
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
#endif /* GL_ATI_draw_buffers */
|
#endif /* GL_ATI_draw_buffers */
|
||||||
@ -1332,16 +1332,16 @@ static GLboolean _glewInit_ATI_vertex_array_object ()
|
|||||||
/* -------------------- ATI_vertex_attrib_array_object -------------------- */
|
/* -------------------- ATI_vertex_attrib_array_object -------------------- */
|
||||||
|
|
||||||
#ifdef GL_ATI_vertex_attrib_array_object
|
#ifdef GL_ATI_vertex_attrib_array_object
|
||||||
glVertexAttribArratObjectATIPROC glVertexAttribArratObjectATI = NULL;
|
glVertexAttribArrayObjectATIPROC glVertexAttribArrayObjectATI = NULL;
|
||||||
glGetVertexAttribArratObjectfvATIPROC glGetVertexAttribArratObjectfvATI = NULL;
|
glGetVertexAttribArrayObjectfvATIPROC glGetVertexAttribArrayObjectfvATI = NULL;
|
||||||
glGetVertexAttrubAttatObjectivATIPROC glGetVertexAttrubAttatObjectivATI = NULL;
|
glGetVertexAttribArrayObjectivATIPROC glGetVertexAttribArrayObjectivATI = NULL;
|
||||||
|
|
||||||
static GLboolean _glewInit_ATI_vertex_attrib_array_object ()
|
static GLboolean _glewInit_ATI_vertex_attrib_array_object ()
|
||||||
{
|
{
|
||||||
GLboolean r = GL_FALSE;
|
GLboolean r = GL_FALSE;
|
||||||
r = r || (glVertexAttribArratObjectATI = (glVertexAttribArratObjectATIPROC) glewGetProcAddress("glVertexAttribArratObjectATI")) == NULL;
|
r = r || (glVertexAttribArrayObjectATI = (glVertexAttribArrayObjectATIPROC) glewGetProcAddress("glVertexAttribArrayObjectATI")) == NULL;
|
||||||
r = r || (glGetVertexAttribArratObjectfvATI = (glGetVertexAttribArratObjectfvATIPROC) glewGetProcAddress("glGetVertexAttribArratObjectfvATI")) == NULL;
|
r = r || (glGetVertexAttribArrayObjectfvATI = (glGetVertexAttribArrayObjectfvATIPROC) glewGetProcAddress("glGetVertexAttribArrayObjectfvATI")) == NULL;
|
||||||
r = r || (glGetVertexAttrubAttatObjectivATI = (glGetVertexAttrubAttatObjectivATIPROC) glewGetProcAddress("glGetVertexAttrubAttatObjectivATI")) == NULL;
|
r = r || (glGetVertexAttribArrayObjectivATI = (glGetVertexAttribArrayObjectivATIPROC) glewGetProcAddress("glGetVertexAttribArrayObjectivATI")) == NULL;
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
#endif /* GL_ATI_vertex_attrib_array_object */
|
#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");
|
glew.EXT_texture_compression_s3tc = glewGetExtension("GL_EXT_texture_compression_s3tc");
|
||||||
#endif
|
#endif
|
||||||
#ifdef GL_EXT_texture_env_combine
|
#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
|
#endif
|
||||||
#ifdef GL_EXT_texture_filter_anisotropic
|
#ifdef GL_EXT_texture_filter_anisotropic
|
||||||
glew.EXT_texture_filter_anisotropic = glewGetExtension("GL_EXT_texture_filter_anisotropic");
|
glew.EXT_texture_filter_anisotropic = glewGetExtension("GL_EXT_texture_filter_anisotropic");
|
||||||
|
@ -723,7 +723,7 @@ static void glewInfo_WIN_swap_hint ()
|
|||||||
static void glewInfo_ATI_draw_buffers ()
|
static void glewInfo_ATI_draw_buffers ()
|
||||||
{
|
{
|
||||||
char me[] = "GL_ATI_draw_buffers"; glewPrintExt(me, glew.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 */
|
#endif /* GL_ATI_draw_buffers */
|
||||||
|
|
||||||
@ -859,9 +859,9 @@ static void glewInfo_ATI_vertex_array_object ()
|
|||||||
static void glewInfo_ATI_vertex_attrib_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);
|
char me[] = "GL_ATI_vertex_attrib_array_object"; glewPrintExt(me, glew.ATI_vertex_attrib_array_object);
|
||||||
glewInfoFunc(glVertexAttribArratObjectATI == NULL, "glVertexAttribArratObjectATI");
|
glewInfoFunc(glVertexAttribArrayObjectATI == NULL, "glVertexAttribArrayObjectATI");
|
||||||
glewInfoFunc(glGetVertexAttribArratObjectfvATI == NULL, "glGetVertexAttribArratObjectfvATI");
|
glewInfoFunc(glGetVertexAttribArrayObjectfvATI == NULL, "glGetVertexAttribArrayObjectfvATI");
|
||||||
glewInfoFunc(glGetVertexAttrubAttatObjectivATI == NULL, "glGetVertexAttrubAttatObjectivATI");
|
glewInfoFunc(glGetVertexAttribArrayObjectivATI == NULL, "glGetVertexAttribArrayObjectivATI");
|
||||||
}
|
}
|
||||||
#endif /* GL_ATI_vertex_attrib_array_object */
|
#endif /* GL_ATI_vertex_attrib_array_object */
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user