[Mesa-dev] [PATCH] GL: Update glext.h to fix ARB_dsa function prototypes.

Fri Jan 23 14:23:14 PST 2015

I checked, and all of the currently implemented DSA functions build with
this file.

Laura

On Fri, Jan 23, 2015 at 2:20 PM, Laura Ekstrand <laura at jlekstrand.net>
wrote:

> ---
>  include/GL/glext.h | 48 ++++++++++++++++++++++++++----------------------
>  1 file changed, 26 insertions(+), 22 deletions(-)
>
> diff --git a/include/GL/glext.h b/include/GL/glext.h
> index d3cfbb5..0ca89ca 100644
> --- a/include/GL/glext.h
> +++ b/include/GL/glext.h
> @@ -33,7 +33,7 @@ extern "C" {
>  ** used to make the header, and the header can be found at
>  **   http://www.opengl.org/registry/
>  **
> -** Khronos $Revision: 28986 $ on $Date: 2014-11-18 18:43:15 -0800 (Tue,
> 18 Nov 2014) $
> +** Khronos $Revision: 29537 $ on $Date: 2015-01-22 02:32:35 -0800 (Thu,
> 22 Jan 2015) $
>  */
>
>  #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) &&
> !defined(__SCITECH_SNAP__)
> @@ -53,7 +53,7 @@ extern "C" {
>  #define GLAPI extern
>  #endif
>
> -#define GL_GLEXT_VERSION 20141118
> +#define GL_GLEXT_VERSION 20150122
>
>  /* Generated C header for:
>   * API: gl
> @@ -2607,25 +2607,25 @@ GLAPI void APIENTRY glBindVertexBuffers (GLuint
> first, GLsizei count, const GLui
>  typedef void (APIENTRYP PFNGLCLIPCONTROLPROC) (GLenum origin, GLenum
> depth);
>  typedef void (APIENTRYP PFNGLCREATETRANSFORMFEEDBACKSPROC) (GLsizei n,
> GLuint *ids);
>  typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKBUFFERBASEPROC) (GLuint
> xfb, GLuint index, GLuint buffer);
> -typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKBUFFERRANGEPROC) (GLuint
> xfb, GLuint index, GLuint buffer, GLintptr offset, GLsizei size);
> +typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKBUFFERRANGEPROC) (GLuint
> xfb, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
>  typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKIVPROC) (GLuint xfb,
> GLenum pname, GLint *param);
>  typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKI_VPROC) (GLuint xfb,
> GLenum pname, GLuint index, GLint *param);
>  typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKI64_VPROC) (GLuint xfb,
> GLenum pname, GLuint index, GLint64 *param);
>  typedef void (APIENTRYP PFNGLCREATEBUFFERSPROC) (GLsizei n, GLuint
> *buffers);
> -typedef void (APIENTRYP PFNGLNAMEDBUFFERSTORAGEPROC) (GLuint buffer,
> GLsizei size, const void *data, GLbitfield flags);
> -typedef void (APIENTRYP PFNGLNAMEDBUFFERDATAPROC) (GLuint buffer, GLsizei
> size, const void *data, GLenum usage);
> -typedef void (APIENTRYP PFNGLNAMEDBUFFERSUBDATAPROC) (GLuint buffer,
> GLintptr offset, GLsizei size, const void *data);
> -typedef void (APIENTRYP PFNGLCOPYNAMEDBUFFERSUBDATAPROC) (GLuint
> readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset,
> GLsizei size);
> +typedef void (APIENTRYP PFNGLNAMEDBUFFERSTORAGEPROC) (GLuint buffer,
> GLsizeiptr size, const void *data, GLbitfield flags);
> +typedef void (APIENTRYP PFNGLNAMEDBUFFERDATAPROC) (GLuint buffer,
> GLsizeiptr size, const void *data, GLenum usage);
> +typedef void (APIENTRYP PFNGLNAMEDBUFFERSUBDATAPROC) (GLuint buffer,
> GLintptr offset, GLsizeiptr size, const void *data);
> +typedef void (APIENTRYP PFNGLCOPYNAMEDBUFFERSUBDATAPROC) (GLuint
> readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset,
> GLsizeiptr size);
>  typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERDATAPROC) (GLuint buffer,
> GLenum internalformat, GLenum format, GLenum type, const void *data);
> -typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERSUBDATAPROC) (GLuint buffer,
> GLenum internalformat, GLintptr offset, GLsizei size, GLenum format, GLenum
> type, const void *data);
> +typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERSUBDATAPROC) (GLuint buffer,
> GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format,
> GLenum type, const void *data);
>  typedef void *(APIENTRYP PFNGLMAPNAMEDBUFFERPROC) (GLuint buffer, GLenum
> access);
> -typedef void *(APIENTRYP PFNGLMAPNAMEDBUFFERRANGEPROC) (GLuint buffer,
> GLintptr offset, GLsizei length, GLbitfield access);
> +typedef void *(APIENTRYP PFNGLMAPNAMEDBUFFERRANGEPROC) (GLuint buffer,
> GLintptr offset, GLsizeiptr length, GLbitfield access);
>  typedef GLboolean (APIENTRYP PFNGLUNMAPNAMEDBUFFERPROC) (GLuint buffer);
> -typedef void (APIENTRYP PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEPROC) (GLuint
> buffer, GLintptr offset, GLsizei length);
> +typedef void (APIENTRYP PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEPROC) (GLuint
> buffer, GLintptr offset, GLsizeiptr length);
>  typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERIVPROC) (GLuint
> buffer, GLenum pname, GLint *params);
>  typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERI64VPROC) (GLuint
> buffer, GLenum pname, GLint64 *params);
>  typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPOINTERVPROC) (GLuint buffer,
> GLenum pname, void **params);
> -typedef void (APIENTRYP PFNGLGETNAMEDBUFFERSUBDATAPROC) (GLuint buffer,
> GLintptr offset, GLsizei size, void *data);
> +typedef void (APIENTRYP PFNGLGETNAMEDBUFFERSUBDATAPROC) (GLuint buffer,
> GLintptr offset, GLsizeiptr size, void *data);
>  typedef void (APIENTRYP PFNGLCREATEFRAMEBUFFERSPROC) (GLsizei n, GLuint
> *framebuffers);
>  typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERRENDERBUFFERPROC) (GLuint
> framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint
> renderbuffer);
>  typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERPARAMETERIPROC) (GLuint
> framebuffer, GLenum pname, GLint param);
> @@ -2650,7 +2650,7 @@ typedef void (APIENTRYP
> PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLuint re
>  typedef void (APIENTRYP PFNGLGETNAMEDRENDERBUFFERPARAMETERIVPROC) (GLuint
> renderbuffer, GLenum pname, GLint *params);
>  typedef void (APIENTRYP PFNGLCREATETEXTURESPROC) (GLenum target, GLsizei
> n, GLuint *textures);
>  typedef void (APIENTRYP PFNGLTEXTUREBUFFERPROC) (GLuint texture, GLenum
> internalformat, GLuint buffer);
> -typedef void (APIENTRYP PFNGLTEXTUREBUFFERRANGEPROC) (GLuint texture,
> GLenum internalformat, GLuint buffer, GLintptr offset, GLsizei size);
> +typedef void (APIENTRYP PFNGLTEXTUREBUFFERRANGEPROC) (GLuint texture,
> GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
>  typedef void (APIENTRYP PFNGLTEXTURESTORAGE1DPROC) (GLuint texture,
> GLsizei levels, GLenum internalformat, GLsizei width);
>  typedef void (APIENTRYP PFNGLTEXTURESTORAGE2DPROC) (GLuint texture,
> GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
>  typedef void (APIENTRYP PFNGLTEXTURESTORAGE3DPROC) (GLuint texture,
> GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height,
> GLsizei depth);
> @@ -2730,25 +2730,25 @@ typedef void (APIENTRYP PFNGLTEXTUREBARRIERPROC)
> (void);
>  GLAPI void APIENTRY glClipControl (GLenum origin, GLenum depth);
>  GLAPI void APIENTRY glCreateTransformFeedbacks (GLsizei n, GLuint *ids);
>  GLAPI void APIENTRY glTransformFeedbackBufferBase (GLuint xfb, GLuint
> index, GLuint buffer);
> -GLAPI void APIENTRY glTransformFeedbackBufferRange (GLuint xfb, GLuint
> index, GLuint buffer, GLintptr offset, GLsizei size);
> +GLAPI void APIENTRY glTransformFeedbackBufferRange (GLuint xfb, GLuint
> index, GLuint buffer, GLintptr offset, GLsizeiptr size);
>  GLAPI void APIENTRY glGetTransformFeedbackiv (GLuint xfb, GLenum pname,
> GLint *param);
>  GLAPI void APIENTRY glGetTransformFeedbacki_v (GLuint xfb, GLenum pname,
> GLuint index, GLint *param);
>  GLAPI void APIENTRY glGetTransformFeedbacki64_v (GLuint xfb, GLenum
> pname, GLuint index, GLint64 *param);
>  GLAPI void APIENTRY glCreateBuffers (GLsizei n, GLuint *buffers);
> -GLAPI void APIENTRY glNamedBufferStorage (GLuint buffer, GLsizei size,
> const void *data, GLbitfield flags);
> -GLAPI void APIENTRY glNamedBufferData (GLuint buffer, GLsizei size, const
> void *data, GLenum usage);
> -GLAPI void APIENTRY glNamedBufferSubData (GLuint buffer, GLintptr offset,
> GLsizei size, const void *data);
> -GLAPI void APIENTRY glCopyNamedBufferSubData (GLuint readBuffer, GLuint
> writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizei size);
> +GLAPI void APIENTRY glNamedBufferStorage (GLuint buffer, GLsizeiptr size,
> const void *data, GLbitfield flags);
> +GLAPI void APIENTRY glNamedBufferData (GLuint buffer, GLsizeiptr size,
> const void *data, GLenum usage);
> +GLAPI void APIENTRY glNamedBufferSubData (GLuint buffer, GLintptr offset,
> GLsizeiptr size, const void *data);
> +GLAPI void APIENTRY glCopyNamedBufferSubData (GLuint readBuffer, GLuint
> writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
>  GLAPI void APIENTRY glClearNamedBufferData (GLuint buffer, GLenum
> internalformat, GLenum format, GLenum type, const void *data);
> -GLAPI void APIENTRY glClearNamedBufferSubData (GLuint buffer, GLenum
> internalformat, GLintptr offset, GLsizei size, GLenum format, GLenum type,
> const void *data);
> +GLAPI void APIENTRY glClearNamedBufferSubData (GLuint buffer, GLenum
> internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum
> type, const void *data);
>  GLAPI void *APIENTRY glMapNamedBuffer (GLuint buffer, GLenum access);
> -GLAPI void *APIENTRY glMapNamedBufferRange (GLuint buffer, GLintptr
> offset, GLsizei length, GLbitfield access);
> +GLAPI void *APIENTRY glMapNamedBufferRange (GLuint buffer, GLintptr
> offset, GLsizeiptr length, GLbitfield access);
>  GLAPI GLboolean APIENTRY glUnmapNamedBuffer (GLuint buffer);
> -GLAPI void APIENTRY glFlushMappedNamedBufferRange (GLuint buffer,
> GLintptr offset, GLsizei length);
> +GLAPI void APIENTRY glFlushMappedNamedBufferRange (GLuint buffer,
> GLintptr offset, GLsizeiptr length);
>  GLAPI void APIENTRY glGetNamedBufferParameteriv (GLuint buffer, GLenum
> pname, GLint *params);
>  GLAPI void APIENTRY glGetNamedBufferParameteri64v (GLuint buffer, GLenum
> pname, GLint64 *params);
>  GLAPI void APIENTRY glGetNamedBufferPointerv (GLuint buffer, GLenum
> pname, void **params);
> -GLAPI void APIENTRY glGetNamedBufferSubData (GLuint buffer, GLintptr
> offset, GLsizei size, void *data);
> +GLAPI void APIENTRY glGetNamedBufferSubData (GLuint buffer, GLintptr
> offset, GLsizeiptr size, void *data);
>  GLAPI void APIENTRY glCreateFramebuffers (GLsizei n, GLuint
> *framebuffers);
>  GLAPI void APIENTRY glNamedFramebufferRenderbuffer (GLuint framebuffer,
> GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
>  GLAPI void APIENTRY glNamedFramebufferParameteri (GLuint framebuffer,
> GLenum pname, GLint param);
> @@ -2773,7 +2773,7 @@ GLAPI void APIENTRY
> glNamedRenderbufferStorageMultisample (GLuint renderbuffer,
>  GLAPI void APIENTRY glGetNamedRenderbufferParameteriv (GLuint
> renderbuffer, GLenum pname, GLint *params);
>  GLAPI void APIENTRY glCreateTextures (GLenum target, GLsizei n, GLuint
> *textures);
>  GLAPI void APIENTRY glTextureBuffer (GLuint texture, GLenum
> internalformat, GLuint buffer);
> -GLAPI void APIENTRY glTextureBufferRange (GLuint texture, GLenum
> internalformat, GLuint buffer, GLintptr offset, GLsizei size);
> +GLAPI void APIENTRY glTextureBufferRange (GLuint texture, GLenum
> internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
>  GLAPI void APIENTRY glTextureStorage1D (GLuint texture, GLsizei levels,
> GLenum internalformat, GLsizei width);
>  GLAPI void APIENTRY glTextureStorage2D (GLuint texture, GLsizei levels,
> GLenum internalformat, GLsizei width, GLsizei height);
>  GLAPI void APIENTRY glTextureStorage3D (GLuint texture, GLsizei levels,
> GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
> @@ -10820,6 +10820,10 @@ GLAPI void APIENTRY
> glVideoCaptureStreamParameterdvNV (GLuint video_capture_slot
>  #endif
>  #endif /* GL_NV_video_capture */
>
> +#ifndef GL_NV_viewport_array2
> +#define GL_NV_viewport_array2 1
> +#endif /* GL_NV_viewport_array2 */
> +
>  #ifndef GL_OML_interlace
>  #define GL_OML_interlace 1
>  #define GL_INTERLACE_OML                  0x8980
> --
> 2.1.0
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20150123/96fdf287/attachment-0001.html>