aboutsummaryrefslogtreecommitdiff
path: root/mesalib/include
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-06-27 08:55:46 +0200
committermarha <marha@users.sourceforge.net>2011-06-27 08:55:46 +0200
commit0feab87a4300a3e204e259d14a0a63e58e4a3c8f (patch)
tree0ff984b670b1409d8f665be20dfd8f410bdf2473 /mesalib/include
parent97c96ddb6f56be198c2e8bf04ff25bc7b48dd1f2 (diff)
downloadvcxsrv-0feab87a4300a3e204e259d14a0a63e58e4a3c8f.tar.gz
vcxsrv-0feab87a4300a3e204e259d14a0a63e58e4a3c8f.tar.bz2
vcxsrv-0feab87a4300a3e204e259d14a0a63e58e4a3c8f.zip
xwininfo fontconfig mesa pixman git update 27 June 2011
Diffstat (limited to 'mesalib/include')
-rw-r--r--mesalib/include/EGL/eglplatform.h6
-rw-r--r--mesalib/include/GL/internal/dri_interface.h5
2 files changed, 11 insertions, 0 deletions
diff --git a/mesalib/include/EGL/eglplatform.h b/mesalib/include/EGL/eglplatform.h
index e4aa0994b..fbfdce32e 100644
--- a/mesalib/include/EGL/eglplatform.h
+++ b/mesalib/include/EGL/eglplatform.h
@@ -84,6 +84,12 @@ typedef struct wl_display *EGLNativeDisplayType;
typedef struct wl_egl_pixmap *EGLNativePixmapType;
typedef struct wl_egl_window *EGLNativeWindowType;
+#elif defined(__GBM__)
+
+typedef struct gbm_device *EGLNativeDisplayType;
+typedef struct gbm_bo *EGLNativePixmapType;
+typedef void *EGLNativeWindowType;
+
#elif defined(__unix__) || defined(__unix)
#ifdef MESA_EGL_NO_X11_HEADERS
diff --git a/mesalib/include/GL/internal/dri_interface.h b/mesalib/include/GL/internal/dri_interface.h
index f022b44b2..4fe9e943b 100644
--- a/mesalib/include/GL/internal/dri_interface.h
+++ b/mesalib/include/GL/internal/dri_interface.h
@@ -849,6 +849,11 @@ struct __DRIimageExtensionRec {
void *loaderPrivate);
GLboolean (*queryImage)(__DRIimage *image, int attrib, int *value);
+
+ /**
+ * The new __DRIimage will share the content with the old one, see dup(2).
+ */
+ __DRIimage *(*dupImage)(__DRIimage *image, void *loaderPrivate);
};