diff options
| author | Matt Turner <mattst88@gmail.com> | 2014-01-25 19:12:13 -0800 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2014-01-27 09:57:12 -0800 |
| commit | 3f3aafbfeeb3939cb5cf710954ccefb8bbe9cff9 (patch) | |
| tree | dc1ac90885aa5f6c2b79016709e80193e8b05a17 /include | |
| parent | a6031a82f9b0851ef17d1136e34c1eb2a2b07a70 (diff) | |
glx: Update glxext.h to revision 24777.
It readds the GLXContextID typedef, but under #ifndef GLX_VERSION_1_3
and glx.h already defines GLX_VERSION_1_3.
Bugzilla: https://cvs.khronos.org/bugzilla/show_bug.cgi?id=11454
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/GL/glxext.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/include/GL/glxext.h b/include/GL/glxext.h index 713238519f..8c642f3549 100644 --- a/include/GL/glxext.h +++ b/include/GL/glxext.h @@ -33,10 +33,10 @@ extern "C" { ** used to make the header, and the header can be found at ** http://www.opengl.org/registry/ ** -** Khronos $Revision: 23422 $ on $Date: 2013-10-08 15:40:45 -0700 (Tue, 08 Oct 2013) $ +** Khronos $Revision: 24777 $ on $Date: 2014-01-14 14:02:32 -0800 (Tue, 14 Jan 2014) $ */ -#define GLX_GLXEXT_VERSION 20131008 +#define GLX_GLXEXT_VERSION 20140114 /* Generated C header for: * API: glx @@ -49,6 +49,7 @@ extern "C" { #ifndef GLX_VERSION_1_3 #define GLX_VERSION_1_3 1 +typedef XID GLXContextID; typedef struct __GLXFBConfigRec *GLXFBConfig; typedef XID GLXWindow; typedef XID GLXPbuffer; @@ -432,6 +433,14 @@ void glXCopyImageSubDataNV (Display *dpy, GLXContext srcCtx, GLuint srcName, GLe #endif #endif /* GLX_NV_copy_image */ +#ifndef GLX_NV_delay_before_swap +#define GLX_NV_delay_before_swap 1 +typedef Bool ( *PFNGLXDELAYBEFORESWAPNVPROC) (Display *dpy, GLXDrawable drawable, GLfloat seconds); +#ifdef GLX_GLXEXT_PROTOTYPES +Bool glXDelayBeforeSwapNV (Display *dpy, GLXDrawable drawable, GLfloat seconds); +#endif +#endif /* GLX_NV_delay_before_swap */ + #ifndef GLX_NV_float_buffer #define GLX_NV_float_buffer 1 #define GLX_FLOAT_COMPONENTS_NV 0x20B0 |