aboutsummaryrefslogtreecommitdiff
path: root/mesalib/include
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-07-18 10:12:07 +0200
committermarha <marha@users.sourceforge.net>2012-07-18 10:12:07 +0200
commit980040093547dc8dd563d8cb9d003aa39737eda4 (patch)
treec85afeb4affd10ee0d6001d18569510ef6488272 /mesalib/include
parent01102cdf33d68a7be192a139752831ff93dee117 (diff)
parent2ff5448bcca8cba4b62026d5493cb08aaf2838d8 (diff)
downloadvcxsrv-980040093547dc8dd563d8cb9d003aa39737eda4.tar.gz
vcxsrv-980040093547dc8dd563d8cb9d003aa39737eda4.tar.bz2
vcxsrv-980040093547dc8dd563d8cb9d003aa39737eda4.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/src/glsl/.gitignore xorg-server/Xext/panoramiX.c xorg-server/hw/xwin/win.h xorg-server/hw/xwin/winclipboardinit.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardunicode.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winclipboardxevents.c xorg-server/hw/xwin/wincreatewnd.c xorg-server/hw/xwin/windialogs.c xorg-server/hw/xwin/winerror.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winwndproc.c
Diffstat (limited to 'mesalib/include')
-rw-r--r--mesalib/include/GL/internal/dri_interface.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/mesalib/include/GL/internal/dri_interface.h b/mesalib/include/GL/internal/dri_interface.h
index bcdd7f605..9aef95860 100644
--- a/mesalib/include/GL/internal/dri_interface.h
+++ b/mesalib/include/GL/internal/dri_interface.h
@@ -916,7 +916,7 @@ struct __DRIdri2ExtensionRec {
* extensions.
*/
#define __DRI_IMAGE "DRI_IMAGE"
-#define __DRI_IMAGE_VERSION 4
+#define __DRI_IMAGE_VERSION 5
/**
* These formats correspond to the similarly named MESA_FORMAT_*
@@ -950,6 +950,8 @@ 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_HEIGHT 0x2005
typedef struct __DRIimageRec __DRIimage;
typedef struct __DRIimageExtensionRec __DRIimageExtension;