diff options
author | marha <marha@users.sourceforge.net> | 2014-02-10 21:12:48 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-02-10 21:12:48 +0100 |
commit | 5ec0616d4e3c4c6095f4975abbe9c21e5b6af967 (patch) | |
tree | 35196127cdc64bfb503564625872648f0b49a0ee /gl | |
parent | 6daf40f6b1138efad98dbb579cd35520cbc349bb (diff) | |
download | vcxsrv-5ec0616d4e3c4c6095f4975abbe9c21e5b6af967.tar.gz vcxsrv-5ec0616d4e3c4c6095f4975abbe9c21e5b6af967.tar.bz2 vcxsrv-5ec0616d4e3c4c6095f4975abbe9c21e5b6af967.zip |
Synchronised files and added missing files in mesa project
Diffstat (limited to 'gl')
-rw-r--r-- | gl/glxext.h | 13 | ||||
-rw-r--r-- | gl/internal/dri_interface.h | 1 |
2 files changed, 12 insertions, 2 deletions
diff --git a/gl/glxext.h b/gl/glxext.h index 713238519..8c642f354 100644 --- a/gl/glxext.h +++ b/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 diff --git a/gl/internal/dri_interface.h b/gl/internal/dri_interface.h index dc94cf255..6b9e5ecbc 100644 --- a/gl/internal/dri_interface.h +++ b/gl/internal/dri_interface.h @@ -1045,6 +1045,7 @@ struct __DRIdri2ExtensionRec { #define __DRI_IMAGE_FOURCC_XRGB8888 0x34325258 #define __DRI_IMAGE_FOURCC_ABGR8888 0x34324241 #define __DRI_IMAGE_FOURCC_XBGR8888 0x34324258 +#define __DRI_IMAGE_FOURCC_SARGB8888 0x83324258 #define __DRI_IMAGE_FOURCC_YUV410 0x39565559 #define __DRI_IMAGE_FOURCC_YUV411 0x31315559 #define __DRI_IMAGE_FOURCC_YUV420 0x32315559 |