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_video.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_video.c')
| -rw-r--r-- | src/savage_video.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/savage_video.c b/src/savage_video.c index 5f08a18..b5a6330 100644 --- a/src/savage_video.c +++ b/src/savage_video.c @@ -247,7 +247,7 @@ typedef struct { void *video_planarmem; /* opaque memory management information structure */ CARD32 video_planarbuf; /* offset in video memory of planar YV12 buffer */ -#ifdef XF86DRI +#ifdef SAVAGEDRI Bool tried_agp; /* TRUE if AGP allocation has been tried */ CARD32 agpBase; /* Physical address of aperture base */ CARD32 agpBufferOffset; /* Offset of buffer in AGP memory, or 0 if unavailable */ @@ -1047,7 +1047,7 @@ SavageStopVideo(ScrnInfoPtr pScrn, pointer data, Bool shutdown) /*SavageClipVWindow(pScrn);*/ SavageStreamsOff( pScrn ); -#ifdef XF86DRI +#ifdef SAVAGEDRI if (pPriv->agpBufferMap != NULL) { SAVAGEDRIServerPrivatePtr pSAVAGEDRIServer = psav->DRIServerInfo; @@ -1978,7 +1978,7 @@ SavagePutImage( /* Check whether AGP buffers can be allocated. If not, fall back to ordinary upload to framebuffer (slower) */ -#ifdef XF86DRI +#ifdef SAVAGEDRI if (!pPriv->tried_agp && !psav->IsPCI && psav->drmFD > 0 && psav->DRIServerInfo != NULL) { SAVAGEDRIServerPrivatePtr pSAVAGEDRIServer = psav->DRIServerInfo; @@ -2014,7 +2014,7 @@ SavagePutImage( pPriv->agpBufferOffset = 0; } } -#endif /* XF86DRI */ +#endif /* SAVAGEDRI */ /* Buffer for final packed frame */ @@ -2060,7 +2060,7 @@ SavagePutImage( offsetV += tmp; nlines = ((((y2 + 0xffff) >> 16) + 1) & ~1) - top; if (S3_SAVAGE4_SERIES(psav->Chipset) && psav->BCIforXv && (npixels & 0xF) == 0 && pPriv->video_planarbuf != 0) { -#ifdef XF86DRI +#ifdef SAVAGEDRI if (pPriv->agpBufferMap != NULL) { /* Using copy to AGP memory */ SavageCopyPlanarDataBCI( @@ -2073,7 +2073,7 @@ SavagePutImage( pPriv->agpBase + pPriv->agpBufferOffset, srcPitch, srcPitch2, dstPitch, nlines, npixels, TRUE); } else -#endif /* XF86DRI */ +#endif /* SAVAGEDRI */ { /* Using ordinary copy to framebuffer */ SavageCopyPlanarDataBCI( |