diff options
author | marha <marha@users.sourceforge.net> | 2012-10-26 08:13:08 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-10-26 08:13:08 +0200 |
commit | af2d8fb974d476eadcd3cde3baebd038f5750600 (patch) | |
tree | 9e24173d3f3dacb518a614984d26eaf7e87c7598 /mesalib/include | |
parent | f6c8097ba5b5bb714185762dbd0ff9958d23e804 (diff) | |
parent | 8d86f8c566c4181c846a872a5a2f88718e635a72 (diff) | |
download | vcxsrv-af2d8fb974d476eadcd3cde3baebd038f5750600.tar.gz vcxsrv-af2d8fb974d476eadcd3cde3baebd038f5750600.tar.bz2 vcxsrv-af2d8fb974d476eadcd3cde3baebd038f5750600.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig pixman mesa git update 26 oct 2012
Diffstat (limited to 'mesalib/include')
-rw-r--r-- | mesalib/include/EGL/eglext.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mesalib/include/EGL/eglext.h b/mesalib/include/EGL/eglext.h index e96c3a49a..974b2c06d 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: 18699 $ on $Date: 2012-07-31 03:04:59 -0700 (Tue, 31 Jul 2012) $ */ +/* $Revision: 19332 $ on $Date: 2012-09-28 17:56:20 -0700 (Fri, 28 Sep 2012) $ */ #define EGL_EGLEXT_VERSION 14 #ifndef EGL_KHR_config_attribs @@ -435,6 +435,7 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSTREAMTIMEKHRPROC)(EGLDisplay dpy, E #define EGL_CONTEXT_OPENGL_ROBUST_ACCESS_BIT_KHR 0x00000004 #define EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT_KHR 0x00000001 #define EGL_CONTEXT_OPENGL_COMPATIBILITY_PROFILE_BIT_KHR 0x00000002 +#define EGL_OPENGL_ES3_BIT_KHR 0x00000040 #endif #ifndef EGL_KHR_surfaceless_context @@ -456,6 +457,11 @@ typedef EGLStreamKHR (EGLAPIENTRYP PFNEGLCREATESTREAMFROMFILEDESCRIPTORKHRPROC)( #endif #endif +#ifndef EGL_EXT_multiview_window +#define EGL_EXT_multiview_window 1 +#define EGL_MULTIVIEW_VIEW_COUNT_EXT 0x3134 +#endif + #include <EGL/eglmesaext.h> #ifdef __cplusplus |