From: Brian Paul Date: Sat, 22 Nov 2003 18:44:10 +0000 (+0000) Subject: added OpenGL 1.5 tokens and functions not yet put into glext.h X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=67f8a1d4ad5c6f94067ef9a621b513fe8f708c72;p=mesa.git added OpenGL 1.5 tokens and functions not yet put into glext.h --- diff --git a/include/GL/gl.h b/include/GL/gl.h index e2dbeb3e93a..39c5113c4d2 100644 --- a/include/GL/gl.h +++ b/include/GL/gl.h @@ -2297,6 +2297,117 @@ glGetProgramRegisterfvMESA(GLenum target, GLsizei len, const GLubyte *name, +/* + * XXX temporary - these new 1.5 tokens should be defined in glext.h + */ +#ifndef GL_VERSION_1_5 +#define GL_VERSION_1_5 1 + +/* New and improved token names */ +#define GL_FOG_COORD_SRC GL_FOG_COORDINATE_SOURCE +#define GL_FOG_COORD GL_FOG_COORDINATE +#define GL_CURRENT_FOG_COORD GL_CURRENT_FOG_COORDINATE +#define GL_FOG_COORD_ARRAY_TYPE GL_FOG_COORDINATE_ARRAY_TYPE +#define GL_FOG_COORD_ARRAY_STRIDE GL_FOG_COORDINATE_ARRAY_STRIDE +#define GL_FOG_COORD_ARRAY_POINTER GL_FOG_COORDINATE_ARRAY_POINTER +#define GL_FOG_COORD_ARRAY GL_FOG_COORDINATE_ARRAY +#define GL_SRC0_RGB GL_SOURCE0_RGB +#define GL_SRC1_RGB GL_SOURCE1_RGB +#define GL_SRC2_RGB GL_SOURCE2_RGB +#define GL_SRC0_ALPHA GL_SOURCE0_ALPHA +#define GL_SRC1_ALPHA GL_SOURCE1_ALPHA +#define GL_SRC2_ALPHA GL_SOURCE2_ALPHA + +/* Buffer object tokens */ +#define GL_BUFFER_SIZE 0x8764 +#define GL_BUFFER_USAGE 0x8765 +#define GL_ARRAY_BUFFER 0x8892 +#define GL_ELEMENT_ARRAY_BUFFER 0x8893 +#define GL_ARRAY_BUFFER_BINDING 0x8894 +#define GL_ELEMENT_ARRAY_BUFFER_BINDING 0x8895 +#define GL_VERTEX_ARRAY_BUFFER_BINDING 0x8896 +#define GL_NORMAL_ARRAY_BUFFER_BINDING 0x8897 +#define GL_COLOR_ARRAY_BUFFER_BINDING 0x8898 +#define GL_INDEX_ARRAY_BUFFER_BINDING 0x8899 +#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A +#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B +#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C +#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D +#define GL_WEIGHT_ARRAY_BUFFER_BINDING 0x889E +#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F +#define GL_READ_ONLY 0x88B8 +#define GL_WRITE_ONLY 0x88B9 +#define GL_READ_WRITE 0x88BA +#define GL_BUFFER_ACCESS 0x88BB +#define GL_BUFFER_MAPPED 0x88BC +#define GL_BUFFER_MAP_POINTER 0x88BD +#define GL_STREAM_DRAW 0x88E0 +#define GL_STREAM_READ 0x88E1 +#define GL_STREAM_COPY 0x88E2 +#define GL_STATIC_DRAW 0x88E4 +#define GL_STATIC_READ 0x88E5 +#define GL_STATIC_COPY 0x88E6 +#define GL_DYNAMIC_DRAW 0x88E8 +#define GL_DYNAMIC_READ 0x88E9 +#define GL_DYNAMIC_COPY 0x88EA + +/* Occlusion query tokens */ +#define GL_SAMPLES_PASSED 0x8914 +#define GL_QUERY_COUNTER_BITS 0x8864 +#define GL_CURRENT_QUERY 0x8865 +#define GL_QUERY_RESULT 0x8866 +#define GL_QUERY_RESULT_AVAILABLE 0x8867 + +typedef ptrdiff_t GLintptr; +typedef ptrdiff_t GLsizeiptr; + +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void GLAPIENTRY glGenQueries(GLsizei n, GLuint *ids); +GLAPI void GLAPIENTRY glDeleteQueries(GLsizei n, const GLuint *ids); +GLAPI GLboolean GLAPIENTRY glIsQuery(GLuint id); +GLAPI void GLAPIENTRY glBeginQuery(GLenum target, GLuint id); +GLAPI void GLAPIENTRY glEndQuery(GLenum target); +GLAPI void GLAPIENTRY glGetQueryiv(GLenum target, GLenum pname, GLint *params); +GLAPI void GLAPIENTRY glGetQueryObjectiv(GLuint id, GLenum pname, GLint *params); +GLAPI void GLAPIENTRY glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params); +GLAPI void APIENTRY glBindBuffer(GLenum, GLuint); +GLAPI void APIENTRY glDeleteBuffers(GLsizei, const GLuint *); +GLAPI void APIENTRY glGenBuffers(GLsizei, GLuint *); +GLAPI GLboolean APIENTRY glIsBuffer(GLuint); +GLAPI void APIENTRY glBufferData(GLenum, GLsizeiptr, const GLvoid *, GLenum); +GLAPI void APIENTRY glBufferSubData(GLenum, GLintptr, GLsizeiptr, const GLvoid *); +GLAPI void APIENTRY glGetBufferSubData(GLenum, GLintptr, GLsizeiptr, GLvoid *); +GLAPI GLvoid* APIENTRY glMapBuffer(GLenum, GLenum); +GLAPI GLboolean APIENTRY glUnmapBuffer(GLenum); +GLAPI void APIENTRY glGetBufferParameteriv(GLenum, GLenum, GLint *); +GLAPI void APIENTRY glGetBufferPointerv(GLenum, GLenum, GLvoid* *); +#endif + +typedef void (APIENTRYP PFNGLGENQUERIESPROC)(GLsizei n, GLuint *ids); +typedef void (APIENTRYP PFNGLDELETEQUERIESPROC)(GLsizei n, const GLuint *ids); +typedef GLboolean (APIENTRYP PFNGLISQUERYPROC)(GLuint id); +typedef void (APIENTRYP PFNGLBEGINQUERYPROC)(GLenum target, GLuint id); +typedef void (APIENTRYP PFNGLENDQUERYPROC)(GLenum target); +typedef void (APIENTRYP PFNGLGETQUERYIVPROC)(GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC)(GLuint id, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC)(GLuint id, GLenum pname, GLuint *params); + +typedef void (APIENTRYP PFNGLBINDBUFFERPROC)(GLenum target, GLuint buffer); +typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC)(GLsizei n, const GLuint *buffers); +typedef void (APIENTRYP PFNGLGENBUFFERSPROC)(GLsizei n, GLuint *buffers); +typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC)(GLuint buffer); +typedef void (APIENTRYP PFNGLBUFFERDATAPROC)(GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage); +typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC)(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data); +typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC)(GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data); +typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERPROC)(GLenum target, GLenum access); +typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC)(GLenum target); +typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC)(GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC)(GLenum target, GLenum pname, GLvoid* *params); + +#endif /* GL_VERSION_1_5 */ + + + /********************************************************************** * Begin system-specific stuff */