diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-27 08:25:28 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-04 14:23:01 +0200 |
| commit | f92e8f13b09f317d156bba539a4f904465cfd9d8 (patch) | |
| tree | add85681fcdd41aa08cf5e17c5abab76469c2f90 | |
| parent | 02b914d3b9b658a16e17cf2d95deede75dbbacc9 (diff) | |
| download | vcxsrv-f92e8f13b09f317d156bba539a4f904465cfd9d8.tar.gz vcxsrv-f92e8f13b09f317d156bba539a4f904465cfd9d8.tar.bz2 vcxsrv-f92e8f13b09f317d156bba539a4f904465cfd9d8.zip | |
Syncrhonised files
| -rw-r--r-- | gl/internal/dri_interface.h | 12 | ||||
| -rw-r--r-- | include/xcb/xcb.h | 2 |
2 files changed, 3 insertions, 11 deletions
diff --git a/gl/internal/dri_interface.h b/gl/internal/dri_interface.h index 865164306..a23d93ceb 100644 --- a/gl/internal/dri_interface.h +++ b/gl/internal/dri_interface.h @@ -939,8 +939,7 @@ struct __DRIdri2ExtensionRec { #define __DRI_IMAGE_USE_SHARE 0x0001 #define __DRI_IMAGE_USE_SCANOUT 0x0002 -#define __DRI_IMAGE_USE_CURSOR 0x0004 -#define __DRI_IMAGE_USE_WRITE 0x0008 +#define __DRI_IMAGE_USE_CURSOR 0x0004 /* Depricated */ /** * queryImage attributes @@ -950,7 +949,7 @@ struct __DRIdri2ExtensionRec { #define __DRI_IMAGE_ATTRIB_HANDLE 0x2001 #define __DRI_IMAGE_ATTRIB_NAME 0x2002 #define __DRI_IMAGE_ATTRIB_FORMAT 0x2003 /* available in versions 3+ */ -#define __DRI_IMAGE_ATTRIB_WIDTH 0x2004 /* available in versions 5+ */ +#define __DRI_IMAGE_ATTRIB_WIDTH 0x2004 /* available in versions 4+ */ #define __DRI_IMAGE_ATTRIB_HEIGHT 0x2005 typedef struct __DRIimageRec __DRIimage; @@ -989,13 +988,6 @@ struct __DRIimageExtensionRec { GLboolean (*validateUsage)(__DRIimage *image, unsigned int use); /** - * Write data into image. - * - * \since 4 - */ - int (*write)(__DRIimage *image, const void *buf, size_t count); - - /** * Create an image out of a sub-region of a parent image. This * entry point lets us create individual __DRIimages for different * planes in a planar buffer (typically yuv), for example. While a diff --git a/include/xcb/xcb.h b/include/xcb/xcb.h index 242e50903..1372f4653 100644 --- a/include/xcb/xcb.h +++ b/include/xcb/xcb.h @@ -73,7 +73,7 @@ extern "C" { /** xcb connection errors because of socket, pipe and other stream errors. */ #define XCB_CONN_ERROR 1 -/** xcb connection shutdown because of extension not sppported */ +/** xcb connection shutdown because of extension not supported */ #define XCB_CONN_CLOSED_EXT_NOTSUPPORTED 2 /** malloc(), calloc() and realloc() error upon failure, for eg ENOMEM */ |