aboutsummaryrefslogtreecommitdiff
path: root/mesalib/include
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-03-02 10:53:27 +0000
committermarha <marha@users.sourceforge.net>2011-03-02 10:53:27 +0000
commit43fb99508848b8e9f4ced9a7e7a6c3692047fbf1 (patch)
tree8cba41c6dda06adfd2a2f88eff6e54ab6d4204cf /mesalib/include
parent717b1a4e21b372e1343e33ae9348fbe5c6f8d7ed (diff)
parent56950d7bed70ee82186f44f9333537cdbb33c448 (diff)
downloadvcxsrv-43fb99508848b8e9f4ced9a7e7a6c3692047fbf1.tar.gz
vcxsrv-43fb99508848b8e9f4ced9a7e7a6c3692047fbf1.tar.bz2
vcxsrv-43fb99508848b8e9f4ced9a7e7a6c3692047fbf1.zip
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/include')
-rw-r--r--mesalib/include/EGL/eglext.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/mesalib/include/EGL/eglext.h b/mesalib/include/EGL/eglext.h
index 48c75edca..4a789c607 100644
--- a/mesalib/include/EGL/eglext.h
+++ b/mesalib/include/EGL/eglext.h
@@ -143,6 +143,20 @@ typedef EGLImageKHR (EGLAPIENTRYP PFNEGLCREATEDRMIMAGEMESA) (EGLDisplay dpy, con
typedef EGLBoolean (EGLAPIENTRYP PFNEGLEXPORTDRMIMAGEMESA) (EGLDisplay dpy, EGLImageKHR image, EGLint *name, EGLint *handle, EGLint *stride);
#endif
+#ifndef EGL_WL_bind_wayland_display
+#define EGL_WL_bind_wayland_display 1
+
+#define EGL_WAYLAND_BUFFER_WL 0x31D5 /* eglCreateImageKHR target */
+struct wl_display;
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglBindWaylandDisplayWL(EGLDisplay dpy, struct wl_display *display);
+EGLAPI EGLBoolean EGLAPIENTRY eglUnbindWaylandDisplayWL(EGLDisplay dpy, struct wl_display *display);
+#else
+typedef EGLBoolean (EGLAPIENTRY PFNEGLBINDWAYLANDDISPLAYWL) (EGLDisplay dpy, struct wl_display *display);
+typedef EGLBoolean (EGLAPIENTRY PFNEGLUNBINDWAYLANDDISPLAYWL) (EGLDisplay dpy, struct wl_display *display);
+#endif
+#endif
+
#if KHRONOS_SUPPORT_INT64 /* EGLTimeKHR requires 64-bit uint support */
#ifndef EGL_KHR_reusable_sync
#define EGL_KHR_reusable_sync 1