diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-04-17 17:21:59 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-04-17 17:21:59 +0000 |
| commit | 4229a0e7ab3e05b3b47e0f81c011e63312dd9313 (patch) | |
| tree | 449f4712185d632ab862d77568a63c57c6197818 | |
| parent | 8379248ddb0979571c761a0087d99f900941a5bf (diff) | |
mach64: fix for the pixmap private API change in future X server versions.
| -rw-r--r-- | driver/xf86-video-mach64/src/aticonsole.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/driver/xf86-video-mach64/src/aticonsole.c b/driver/xf86-video-mach64/src/aticonsole.c index 8efe897fb..79e7a8e97 100644 --- a/driver/xf86-video-mach64/src/aticonsole.c +++ b/driver/xf86-video-mach64/src/aticonsole.c @@ -28,6 +28,7 @@ #include "config.h" #endif +#include "xorgVersion.h" #include "ati.h" #include "aticonsole.h" #include "atii2c.h" @@ -689,7 +690,9 @@ ATIEnterVT ScreenPtr pScreen = pScreenInfo->pScreen; ATIPtr pATI = ATIPTR(pScreenInfo); PixmapPtr pScreenPixmap; +#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0)) DevUnion PixmapPrivate; +#endif Bool Entered; if (!ATIEnterGraphics(NULL, pScreenInfo, pATI)) @@ -714,19 +717,24 @@ ATIEnterVT } pScreenPixmap = (*pScreen->GetScreenPixmap)(pScreen); + +#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0)) PixmapPrivate = pScreenPixmap->devPrivate; if (!PixmapPrivate.ptr) pScreenPixmap->devPrivate = pScreenInfo->pixmapPrivate; +#endif /* Tell framebuffer about remapped aperture */ Entered = (*pScreen->ModifyPixmapHeader)(pScreenPixmap, -1, -1, -1, -1, -1, pATI->pMemory); +#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0)) if (!PixmapPrivate.ptr) { pScreenInfo->pixmapPrivate = pScreenPixmap->devPrivate; pScreenPixmap->devPrivate.ptr = NULL; } +#endif #ifdef XF86DRI_DEVEL |