diff options
author | marha <marha@users.sourceforge.net> | 2011-05-09 10:10:32 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-05-09 10:10:32 +0000 |
commit | 5bb5135182a1a50b1b6659d8aa5168ebfbe71979 (patch) | |
tree | 7c8f16bf0832a90195bdbc4e8a9477158e0acf9b /mesalib/include | |
parent | c721bc9b176ec37d8b80a92c89840658f8f6c458 (diff) | |
parent | 43b2398ee28e9144fd51eb9994d67c4c9a198c9c (diff) | |
download | vcxsrv-5bb5135182a1a50b1b6659d8aa5168ebfbe71979.tar.gz vcxsrv-5bb5135182a1a50b1b6659d8aa5168ebfbe71979.tar.bz2 vcxsrv-5bb5135182a1a50b1b6659d8aa5168ebfbe71979.zip |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/include')
-rw-r--r-- | mesalib/include/EGL/eglext.h | 1 | ||||
-rw-r--r-- | mesalib/include/GL/internal/dri_interface.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/mesalib/include/EGL/eglext.h b/mesalib/include/EGL/eglext.h index 43eff8e99..7d49ff68a 100644 --- a/mesalib/include/EGL/eglext.h +++ b/mesalib/include/EGL/eglext.h @@ -131,6 +131,7 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYIMAGEKHRPROC) (EGLDisplay dpy, EGL /* EGL_DRM_BUFFER_USE_MESA bits */
#define EGL_DRM_BUFFER_USE_SCANOUT_MESA 0x0001
#define EGL_DRM_BUFFER_USE_SHARE_MESA 0x0002
+#define EGL_DRM_BUFFER_USE_CURSOR_MESA 0x0004
#define EGL_DRM_BUFFER_MESA 0x31D3 /* eglCreateImageKHR target */
#define EGL_DRM_BUFFER_STRIDE_MESA 0x31D4 /* eglCreateImageKHR attribute */
diff --git a/mesalib/include/GL/internal/dri_interface.h b/mesalib/include/GL/internal/dri_interface.h index 8098a2eb9..1564e4cea 100644 --- a/mesalib/include/GL/internal/dri_interface.h +++ b/mesalib/include/GL/internal/dri_interface.h @@ -818,6 +818,7 @@ struct __DRIdri2ExtensionRec { #define __DRI_IMAGE_USE_SHARE 0x0001
#define __DRI_IMAGE_USE_SCANOUT 0x0002
+#define __DRI_IMAGE_USE_CURSOR 0x0004
/**
* queryImage attributes
|