aboutsummaryrefslogtreecommitdiff
path: root/gl
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-03-25 10:26:50 +0100
committermarha <marha@users.sourceforge.net>2013-03-25 10:26:50 +0100
commit44fb3db38c5148666f62c78e10fc37bb20ed5c5c (patch)
tree753960ac5d8e5a314b00813af1afab01169cf87b /gl
parent30ac3efa02bbd1aecff4a0aa2da17bc886bdd5ea (diff)
downloadvcxsrv-44fb3db38c5148666f62c78e10fc37bb20ed5c5c.tar.gz
vcxsrv-44fb3db38c5148666f62c78e10fc37bb20ed5c5c.tar.bz2
vcxsrv-44fb3db38c5148666f62c78e10fc37bb20ed5c5c.zip
Synchronised files
Diffstat (limited to 'gl')
-rw-r--r--gl/internal/dri_interface.h15
1 files changed, 14 insertions, 1 deletions
diff --git a/gl/internal/dri_interface.h b/gl/internal/dri_interface.h
index 657ec9f5b..add2fe60c 100644
--- a/gl/internal/dri_interface.h
+++ b/gl/internal/dri_interface.h
@@ -942,7 +942,7 @@ struct __DRIdri2ExtensionRec {
* extensions.
*/
#define __DRI_IMAGE "DRI_IMAGE"
-#define __DRI_IMAGE_VERSION 6
+#define __DRI_IMAGE_VERSION 7
/**
* These formats correspond to the similarly named MESA_FORMAT_*
@@ -1025,6 +1025,9 @@ struct __DRIdri2ExtensionRec {
#define __DRI_IMAGE_ATTRIB_WIDTH 0x2004 /* available in versions 4+ */
#define __DRI_IMAGE_ATTRIB_HEIGHT 0x2005
#define __DRI_IMAGE_ATTRIB_COMPONENTS 0x2006 /* available in versions 5+ */
+#define __DRI_IMAGE_ATTRIB_FD 0x2007 /* available in versions
+ * 7+. Each query will return a
+ * new fd. */
/**
* \name Reasons that __DRIimageExtensionRec::createImageFromTexture might fail
@@ -1121,6 +1124,16 @@ struct __DRIimageExtensionRec {
int level,
unsigned *error,
void *loaderPrivate);
+ /**
+ * Like createImageFromNames, but takes a prime fd instead.
+ *
+ * \since 7
+ */
+ __DRIimage *(*createImageFromFds)(__DRIscreen *screen,
+ int width, int height, int fourcc,
+ int *fds, int num_fds,
+ int *strides, int *offsets,
+ void *loaderPrivate);
};