diff options
author | marha <marha@users.sourceforge.net> | 2013-02-05 08:22:00 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-02-05 08:23:51 +0100 |
commit | 76c527be60066b647468ad66f8e4d7dd18fa1769 (patch) | |
tree | 2e4653dc3adf874409cf9baba399fd64537115d4 /mesalib/include/GL/internal | |
parent | a6d5f8de1394c338d01b65be7dba3520bf8bdf4b (diff) | |
download | vcxsrv-76c527be60066b647468ad66f8e4d7dd18fa1769.tar.gz vcxsrv-76c527be60066b647468ad66f8e4d7dd18fa1769.tar.bz2 vcxsrv-76c527be60066b647468ad66f8e4d7dd18fa1769.zip |
fontconfig mesa xkeyboard-config git update 5 feb 2013
xkeyboard-config commit b4be67b48fb11989f1824dd0b1c8c399430162b0
fontconfig commit 95af7447dba7c54ed162b667c0bb2ea6500e8f32
mesa commit 86536a321d9d26137587affe687a07da71f0b526
Diffstat (limited to 'mesalib/include/GL/internal')
-rw-r--r-- | mesalib/include/GL/internal/dri_interface.h | 32 |
1 files changed, 31 insertions, 1 deletions
diff --git a/mesalib/include/GL/internal/dri_interface.h b/mesalib/include/GL/internal/dri_interface.h index c236cb732..42147e90e 100644 --- a/mesalib/include/GL/internal/dri_interface.h +++ b/mesalib/include/GL/internal/dri_interface.h @@ -938,7 +938,7 @@ struct __DRIdri2ExtensionRec { * extensions. */ #define __DRI_IMAGE "DRI_IMAGE" -#define __DRI_IMAGE_VERSION 5 +#define __DRI_IMAGE_VERSION 6 /** * These formats correspond to the similarly named MESA_FORMAT_* @@ -1022,6 +1022,23 @@ struct __DRIdri2ExtensionRec { #define __DRI_IMAGE_ATTRIB_HEIGHT 0x2005 #define __DRI_IMAGE_ATTRIB_COMPONENTS 0x2006 /* available in versions 5+ */ +/** + * \name Reasons that __DRIimageExtensionRec::createImageFromTexture might fail + */ +/*@{*/ +/** Success! */ +#define __DRI_IMAGE_ERROR_SUCCESS 0 + +/** Memory allocation failure */ +#define __DRI_IMAGE_ERROR_BAD_ALLOC 1 + +/** Client requested an invalid attribute for a texture object */ +#define __DRI_IMAGE_ERROR_BAD_MATCH 2 + +/** Client requested an invalid texture object */ +#define __DRI_IMAGE_ERROR_BAD_PARAMETER 3 +/*@}*/ + typedef struct __DRIimageRec __DRIimage; typedef struct __DRIimageExtensionRec __DRIimageExtension; struct __DRIimageExtensionRec { @@ -1087,6 +1104,19 @@ struct __DRIimageExtensionRec { */ __DRIimage *(*fromPlanar)(__DRIimage *image, int plane, void *loaderPrivate); + + /** + * Create image from texture. + * + * \since 6 + */ + __DRIimage *(*createImageFromTexture)(__DRIcontext *context, + int target, + unsigned texture, + int depth, + int level, + unsigned *error, + void *loaderPrivate); }; |