Merge master and fix conflicts

[mesa.git] / src / glx / x11 / dri2.h

diff --git a/src/glx/x11/dri2.h b/src/glx/x11/dri2.h
index 356c6bcb55d43d9ebff886e0ae5bd2e114a23878..b0e61f80d70525f23b4bad9af39c7ffa306b9005 100644 (file)
--- a/src/glx/x11/dri2.h
+++ b/src/glx/x11/dri2.h
@@ -63,6 +63,16 @@ DRI2GetBuffers(Display *dpy, XID drawable,
               unsigned int *attachments, int count,
               int *outCount);
 
+/**
+ * \note
+ * This function is only supported with DRI2 version 1.1 or later.
+ */
+extern DRI2Buffer *
+DRI2GetBuffersWithFormat(Display *dpy, XID drawable,
+                        int *width, int *height,
+                        unsigned int *attachments, int count,
+                        int *outCount);
+
 extern void
 DRI2CopyRegion(Display *dpy, XID drawable, XserverRegion region,
               CARD32 dest, CARD32 src);