diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-19 11:21:45 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-19 11:21:45 +0100 |
| commit | 57b3e446b9b4017ccfdd3227be481df590740426 (patch) | |
| tree | 0e4899f530f75d343c090202fc7123c78f9b4866 /mesalib/include/EGL | |
| parent | 24635abae6008bef13e30d798b3f33abab412770 (diff) | |
| parent | b3e1e62c45f525cdd332073aaa34d8452cb23374 (diff) | |
| download | vcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.tar.gz vcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.tar.bz2 vcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
git update 19 nov 2012
Added bash script to update released branch
Conflicts:
mesalib/src/mapi/glapi/gen/gl_API.xml
mesalib/src/mesa/program/.gitignore
pixman/pixman/pixman-mmx.c
xorg-server/Xi/xiquerypointer.c
xorg-server/xkb/xkb.c
Diffstat (limited to 'mesalib/include/EGL')
| -rw-r--r-- | mesalib/include/EGL/eglext.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mesalib/include/EGL/eglext.h b/mesalib/include/EGL/eglext.h index 974b2c06d..a5c9009e1 100644 --- a/mesalib/include/EGL/eglext.h +++ b/mesalib/include/EGL/eglext.h @@ -34,7 +34,7 @@ extern "C" { /* Header file version number */ /* Current version at http://www.khronos.org/registry/egl/ */ -/* $Revision: 19332 $ on $Date: 2012-09-28 17:56:20 -0700 (Fri, 28 Sep 2012) $ */ +/* $Revision: 19571 $ on $Date: 2012-10-31 10:10:33 -0700 (Wed, 31 Oct 2012) $ */ #define EGL_EGLEXT_VERSION 14 #ifndef EGL_KHR_config_attribs @@ -462,6 +462,14 @@ typedef EGLStreamKHR (EGLAPIENTRYP PFNEGLCREATESTREAMFROMFILEDESCRIPTORKHRPROC)( #define EGL_MULTIVIEW_VIEW_COUNT_EXT 0x3134 #endif +#ifndef EGL_KHR_wait_sync +#define EGL_KHR_wait_sync 1 +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLint EGLAPIENTRY eglWaitSyncKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLint flags); +#endif /* EGL_EGLEXT_PROTOTYPES */ +typedef EGLint (EGLAPIENTRYP PFNEGLWAITSYNCKHRPROC)(EGLDisplay dpy, EGLSyncKHR sync, EGLint flags); +#endif + #include <EGL/eglmesaext.h> #ifdef __cplusplus |