aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-05-30 14:40:29 +0200
committermarha <marha@users.sourceforge.net>2012-05-30 14:40:29 +0200
commitcdb76f76457c170cc61f040aea1a48517488cb46 (patch)
tree619806e79b757c71a7e3efba63807fa5e5afac38
parentc229f618dd10327675815351ad67f5533f283a9c (diff)
downloadvcxsrv-cdb76f76457c170cc61f040aea1a48517488cb46.tar.gz
vcxsrv-cdb76f76457c170cc61f040aea1a48517488cb46.tar.bz2
vcxsrv-cdb76f76457c170cc61f040aea1a48517488cb46.zip
Update filesthatshouldbethesame.py and synchronised files
-rw-r--r--filesthatshouldbethesame.py15
-rw-r--r--gl/internal/dri_interface.h11
-rw-r--r--mesalib/src/mapi/glapi/gen/gl_gentable.py2
-rw-r--r--xorg-server/glx/dispatch.h2
4 files changed, 26 insertions, 4 deletions
diff --git a/filesthatshouldbethesame.py b/filesthatshouldbethesame.py
index 613036513..e4e9b86aa 100644
--- a/filesthatshouldbethesame.py
+++ b/filesthatshouldbethesame.py
@@ -85,9 +85,20 @@ gl\glx_mangle.h mesalib\include\gl\glx_mangle.
gl\gl_mangle.h mesalib\include\gl\gl_mangle.h
gl\internal\dri_interface.h mesalib\include\gl\internal\dri_interface.h
-xorg-server\glx\glprocs.h mesalib\src\mapi\glapi\glprocs.h
xorg-server\glx\glapi.h mesalib\src\mapi\glapi\glapi.h
-xorg-server\glx\glapitable.h mesalib\src\mapi\glapi\glapitable.h
+xorg-server\glx\glapitable.h mesalib\src\mesa\main\glapitable.h
+xorg-server\glx\glprocs.h mesalib\src\mapi\glapi\gen\glprocs.h
+xorg-server\glx\dispatch.h mesalib\src\mapi\glapi\gen\dispatch.h
+xorg-server\glx\glapi_gentable.c mesalib\src\mapi\glapi\gen\glapi_gentable.c
+xorg-server\glx\indirect_dispatch.c mesalib\src\mapi\glapi\gen\indirect_dispatch.c
+xorg-server\glx\indirect_dispatch.h mesalib\src\mapi\glapi\gen\indirect_dispatch.h
+xorg-server\glx\indirect_dispatch_swap.c mesalib\src\mapi\glapi\gen\indirect_dispatch_swap.c
+xorg-server\glx\indirect_reqsize.c mesalib\src\mapi\glapi\gen\indirect_reqsize.c
+xorg-server\glx\indirect_reqsize.h mesalib\src\mapi\glapi\gen\indirect_reqsize.h
+xorg-server\glx\indirect_size.h mesalib\src\mapi\glapi\gen\indirect_size.h
+xorg-server\glx\indirect_size_get.c mesalib\src\mapi\glapi\gen\indirect_size_get.c
+xorg-server\glx\indirect_size_get.h mesalib\src\mapi\glapi\gen\indirect_size_get.h
+xorg-server\glx\indirect_table.c mesalib\src\mapi\glapi\gen\indirect_table.c
libXaw\include\X11\Xaw\AllWidgets.h X11\Xaw\AllWidgets.h
libXaw\include\X11\Xaw\AsciiSink.h X11\Xaw\AsciiSink.h
diff --git a/gl/internal/dri_interface.h b/gl/internal/dri_interface.h
index af3a42ad7..fd29e8256 100644
--- a/gl/internal/dri_interface.h
+++ b/gl/internal/dri_interface.h
@@ -898,7 +898,7 @@ struct __DRIdri2ExtensionRec {
* extensions.
*/
#define __DRI_IMAGE "DRI_IMAGE"
-#define __DRI_IMAGE_VERSION 3
+#define __DRI_IMAGE_VERSION 4
/**
* These formats correspond to the similarly named MESA_FORMAT_*
@@ -910,10 +910,12 @@ struct __DRIdri2ExtensionRec {
#define __DRI_IMAGE_FORMAT_XRGB8888 0x1002
#define __DRI_IMAGE_FORMAT_ARGB8888 0x1003
#define __DRI_IMAGE_FORMAT_ABGR8888 0x1004
+#define __DRI_IMAGE_FORMAT_XBGR8888 0x1005
#define __DRI_IMAGE_USE_SHARE 0x0001
#define __DRI_IMAGE_USE_SCANOUT 0x0002
#define __DRI_IMAGE_USE_CURSOR 0x0004
+#define __DRI_IMAGE_USE_WRITE 0x0008
/**
* queryImage attributes
@@ -958,6 +960,13 @@ struct __DRIimageExtensionRec {
* \since 2
*/
GLboolean (*validateUsage)(__DRIimage *image, unsigned int use);
+
+ /**
+ * Write data into image.
+ *
+ * \since 4
+ */
+ int (*write)(__DRIimage *image, const void *buf, size_t count);
};
diff --git a/mesalib/src/mapi/glapi/gen/gl_gentable.py b/mesalib/src/mapi/glapi/gen/gl_gentable.py
index 5657e3277..5078485c0 100644
--- a/mesalib/src/mapi/glapi/gen/gl_gentable.py
+++ b/mesalib/src/mapi/glapi/gen/gl_gentable.py
@@ -111,7 +111,7 @@ __glapi_gentable_set_remaining_noop(struct _glapi_table *disp) {
struct _glapi_table *
_glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
- struct _glapi_table *disp = calloc(1, sizeof(struct _glapi_table));
+ struct _glapi_table *disp = calloc(_glapi_get_dispatch_table_size(), sizeof(void*));
char symboln[512];
if(!disp)
diff --git a/xorg-server/glx/dispatch.h b/xorg-server/glx/dispatch.h
index 7ba5334ce..d78ce73c6 100644
--- a/xorg-server/glx/dispatch.h
+++ b/xorg-server/glx/dispatch.h
@@ -48,8 +48,10 @@
#endif
#ifdef _MSC_VER
+#ifndef INLINE
#define INLINE __inline
#endif
+#endif
#define CALL_by_offset(disp, cast, offset, parameters) \
(*(cast (GET_by_offset(disp, offset)))) parameters
#define GET_by_offset(disp, offset) \