diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-01-04 15:15:07 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-01-04 15:15:07 +1000 |
| commit | 4c4beaf628c9c5dd531605e40696ed31db0e97b8 (patch) | |
| tree | 2eccd0388c87ba06674fb5001b72777ff0b83211 /src/mga.h | |
| parent | 9223c44a731f48c66c226eb88dcb6f9d574cb599 (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>
Diffstat (limited to 'src/mga.h')
| -rw-r--r-- | src/mga.h | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -28,7 +28,11 @@ #include "xf86DDC.h" #include "xf86xv.h" -#ifdef XF86DRI +#ifndef XF86DRI +#undef MGADRI +#endif + +#ifdef MGADRI #include "xf86drm.h" #define _XF86DRI_SERVER_ @@ -589,7 +593,7 @@ typedef struct { int expandRemaining; int expandHeight; int expandY; -#ifdef XF86DRI +#ifdef MGADRI Bool directRenderingEnabled; DRIInfoPtr pDRIInfo; int drmFD; @@ -743,7 +747,7 @@ void MGAPointerMoved(int index, int x, int y); void MGAInitVideo(ScreenPtr pScreen); void MGAResetVideo(ScrnInfoPtr pScrn); -#ifdef XF86DRI +#ifdef MGADRI #define MGA_FRONT 0x1 #define MGA_BACK 0x2 |