diff options
| author | marha <marha@users.sourceforge.net> | 2014-07-01 14:23:00 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-07-01 14:23:00 +0200 |
| commit | 3095a03ec3cb1f05b49362327d10a767299d7635 (patch) | |
| tree | 3c1c00424399de31f3be7d7a6e5f226b288d337e /mesalib/include/GL/glxext.h | |
| parent | b6fac85cb1bb78f48ed81aaf42ba6b840b2d6cad (diff) | |
| download | vcxsrv-3095a03ec3cb1f05b49362327d10a767299d7635.tar.gz vcxsrv-3095a03ec3cb1f05b49362327d10a767299d7635.tar.bz2 vcxsrv-3095a03ec3cb1f05b49362327d10a767299d7635.zip | |
Synchronised files and solved compilaton errors
Diffstat (limited to 'mesalib/include/GL/glxext.h')
| -rw-r--r-- | mesalib/include/GL/glxext.h | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/mesalib/include/GL/glxext.h b/mesalib/include/GL/glxext.h index 826fda5b5..2d8aa2290 100644 --- a/mesalib/include/GL/glxext.h +++ b/mesalib/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: 25407 $ on $Date: 2014-02-18 16:51:56 -0800 (Tue, 18 Feb 2014) $ +** Khronos $Revision: 27191 $ on $Date: 2014-06-30 15:11:33 -0700 (Mon, 30 Jun 2014) $ */ -#define GLX_GLXEXT_VERSION 20140218 +#define GLX_GLXEXT_VERSION 20140630 /* Generated C header for: * API: glx @@ -290,6 +290,23 @@ void glXFreeContextEXT (Display *dpy, GLXContext context); #endif #endif /* GLX_EXT_import_context */ +#ifndef GLX_EXT_stereo_tree +#define GLX_EXT_stereo_tree 1 +typedef struct { + int type; + unsigned long serial; + Bool send_event; + Display *display; + int extension; + int evtype; + GLXDrawable window; + Bool stereo_tree; +} GLXStereoNotifyEventEXT; +#define GLX_STEREO_TREE_EXT 0x20F5 +#define GLX_STEREO_NOTIFY_MASK_EXT 0x00000001 +#define GLX_STEREO_NOTIFY_EXT 0x00000000 +#endif /* GLX_EXT_stereo_tree */ + #ifndef GLX_EXT_swap_control #define GLX_EXT_swap_control 1 #define GLX_SWAP_INTERVAL_EXT 0x20F1 @@ -527,8 +544,8 @@ void glXReleaseVideoCaptureDeviceNV (Display *dpy, GLXVideoCaptureDeviceNV devic #endif #endif /* GLX_NV_video_capture */ -#ifndef GLX_NV_video_output -#define GLX_NV_video_output 1 +#ifndef GLX_NV_video_out +#define GLX_NV_video_out 1 typedef unsigned int GLXVideoDeviceNV; #define GLX_VIDEO_OUT_COLOR_NV 0x20C3 #define GLX_VIDEO_OUT_ALPHA_NV 0x20C4 @@ -554,7 +571,7 @@ int glXReleaseVideoImageNV (Display *dpy, GLXPbuffer pbuf); int glXSendPbufferToVideoNV (Display *dpy, GLXPbuffer pbuf, int iBufferType, unsigned long *pulCounterPbuffer, GLboolean bBlock); int glXGetVideoInfoNV (Display *dpy, int screen, GLXVideoDeviceNV VideoDevice, unsigned long *pulCounterOutputPbuffer, unsigned long *pulCounterOutputVideo); #endif -#endif /* GLX_NV_video_output */ +#endif /* GLX_NV_video_out */ #ifndef GLX_OML_swap_method #define GLX_OML_swap_method 1 |