Module Name: xsrc
Committed By: jmcneill
Date: Sat Feb 12 00:07:27 UTC 2011
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src: i830_exa.c
xsrc/external/mit/xf86-video-intel/dist/uxa: uxa-priv.h uxa.c
Log Message:
In case somebody wants to try to get UXA working, make it compile against
newer X servers
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/i830_exa.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-priv.h \
xsrc/external/mit/xf86-video-intel/dist/uxa/uxa.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-intel/dist/src/i830_exa.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/i830_exa.c:1.1.1.2 xsrc/external/mit/xf86-video-intel/dist/src/i830_exa.c:1.2
--- xsrc/external/mit/xf86-video-intel/dist/src/i830_exa.c:1.1.1.2 Tue Jun 9 02:54:33 2009
+++ xsrc/external/mit/xf86-video-intel/dist/src/i830_exa.c Sat Feb 12 00:07:26 2011
@@ -83,7 +83,7 @@
};
#ifdef I830_USE_UXA
-static int uxa_pixmap_index;
+static DevPrivateKeyRec uxa_pixmap_index;
#endif
#ifndef SERVER_1_5
@@ -1035,7 +1035,7 @@
I830Ptr i830 = I830PTR(scrn);
#ifdef SERVER_1_5
- if (!dixRequestPrivate(&uxa_pixmap_index, 0))
+ if (!dixRegisterPrivateKey(&uxa_pixmap_index, PRIVATE_PIXMAP, 0))
return FALSE;
#else
if (!AllocatePixmapPrivate(pScreen, uxa_pixmap_index, 0))
Index: xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-priv.h
diff -u xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-priv.h:1.1.1.1 xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-priv.h:1.2
--- xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-priv.h:1.1.1.1 Tue Jun 9 02:54:32 2009
+++ xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-priv.h Sat Feb 12 00:07:26 2011
@@ -43,7 +43,36 @@
#include <X11/Xproto.h>
#ifdef MITSHM
#define _XSHM_SERVER_
-#include <X11/extensions/shmstr.h>
+/* X11/extensions/shmstr.h */
+/* #warning this file is deprecated and provided only for source compatibility */
+#include <X11/extensions/shmproto.h>
+
+#define XSHM_PUT_IMAGE_ARGS \
+ DrawablePtr /* dst */, \
+ GCPtr /* pGC */, \
+ int /* depth */, \
+ unsigned int /* format */, \
+ int /* w */, \
+ int /* h */, \
+ int /* sx */, \
+ int /* sy */, \
+ int /* sw */, \
+ int /* sh */, \
+ int /* dx */, \
+ int /* dy */, \
+ char * /* data */
+
+#define XSHM_CREATE_PIXMAP_ARGS \
+ ScreenPtr /* pScreen */, \
+ int /* width */, \
+ int /* height */, \
+ int /* depth */, \
+ char * /* addr */
+
+typedef struct _ShmFuncs {
+ PixmapPtr (* CreatePixmap)(XSHM_CREATE_PIXMAP_ARGS);
+ void (* PutImage)(XSHM_PUT_IMAGE_ARGS);
+} ShmFuncs, *ShmFuncsPtr;
#endif
#include "scrnintstr.h"
#include "pixmapstr.h"
@@ -167,7 +196,7 @@
(PixmapWidthPaddingInfo[d].padRoundUp+1)))
#endif
-extern int uxa_screen_index;
+extern DevPrivateKeyRec uxa_screen_index;
static inline uxa_screen_t *
uxa_get_screen(ScreenPtr screen)
{
Index: xsrc/external/mit/xf86-video-intel/dist/uxa/uxa.c
diff -u xsrc/external/mit/xf86-video-intel/dist/uxa/uxa.c:1.1.1.1 xsrc/external/mit/xf86-video-intel/dist/uxa/uxa.c:1.2
--- xsrc/external/mit/xf86-video-intel/dist/uxa/uxa.c:1.1.1.1 Tue Jun 9 02:54:32 2009
+++ xsrc/external/mit/xf86-video-intel/dist/uxa/uxa.c Sat Feb 12 00:07:26 2011
@@ -39,7 +39,7 @@
#include "dixfontstr.h"
#include "uxa.h"
-int uxa_screen_index;
+DevPrivateKeyRec uxa_screen_index;
#ifndef SERVER_1_5
static int uxa_generation;
#endif
@@ -479,6 +479,7 @@
uxa_screen->info = uxa_driver;
#ifdef SERVER_1_5
+ dixRegisterPrivateKey(&uxa_screen_index, PRIVATE_SCREEN, 0);
dixSetPrivate(&screen->devPrivates, &uxa_screen_index, uxa_screen);
#else
if (uxa_generation != serverGeneration) {
