diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-01-17 15:35:39 +1000 |
|---|---|---|
| committer | Tormod Volden <debian.tormod@gmail.com> | 2012-01-17 22:58:29 +0100 |
| commit | c4022796ec69bb3223d435d8442f9168aebe9c3d (patch) | |
| tree | 4f35eb1ee25a12a3c8a119a00a5aaa6f6a2fba1c /src/savage_exa.c | |
| parent | 05f74bd80018bc503ff5631b357fc0b02df6187f (diff) | |
Untangle XF86DRI from the driver-specific DRI define
XF86DRI is defined by xorg-server.h, so --disable-dri in the driver
itself does exactly nothing other than not fill in the CFLAGS and thus stop
the driver from compiling.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
Diffstat (limited to 'src/savage_exa.c')
| -rw-r--r-- | src/savage_exa.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/savage_exa.c b/src/savage_exa.c index 4fe43e5..613100b 100644 --- a/src/savage_exa.c +++ b/src/savage_exa.c @@ -15,7 +15,7 @@ #include "savage_bci.h" #include "savage_streams.h" -#ifdef XF86DRI +#ifdef SAVAGEDRI #define _XF86DRI_SERVER_ #include "savage_dri.h" #endif @@ -441,7 +441,7 @@ SavageUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h, char *src, int int i, j, dwords, queue, Bpp; unsigned int cmd; CARD32 * srcp; -#ifdef XF86DRI +#ifdef SAVAGEDRI unsigned int dst_pitch; unsigned int dst_yoffset; int agp_possible; @@ -451,7 +451,7 @@ SavageUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h, char *src, int Bpp = pDst->drawable.bitsPerPixel / 8; -#ifdef XF86DRI +#ifdef SAVAGEDRI /* Test for conditions for AGP Mastered Image Transfer (MIT). AGP memory needs to be available, the XVideo AGP needs to be enabled, the framebuffer destination must be a multiple of 32 bytes, and the source @@ -508,7 +508,7 @@ SavageUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h, char *src, int return TRUE; } } -#endif /* XF86DRI */ +#endif /* SAVAGEDRI */ /* If we reach here, AGP transfer is not possible, or failed to drmMap() */ psav->sbd_offset = exaGetPixmapOffset(pDst); |