summaryrefslogtreecommitdiff
path: root/src/mga_exa.c
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2012-01-04 15:15:07 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2012-01-04 15:15:07 +1000
commit4c4beaf628c9c5dd531605e40696ed31db0e97b8 (patch)
tree2eccd0388c87ba06674fb5001b72777ff0b83211 /src/mga_exa.c
parent9223c44a731f48c66c226eb88dcb6f9d574cb599 (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_exa.c')
-rw-r--r--src/mga_exa.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mga_exa.c b/src/mga_exa.c
index e5eaa92..ced6452 100644
--- a/src/mga_exa.c
+++ b/src/mga_exa.c
@@ -41,7 +41,7 @@
#include "mga_macros.h"
#include "exa.h"
-#ifdef XF86DRI
+#ifdef MGADRI
#include "mga_dri.h"
#endif
@@ -763,7 +763,7 @@ mgaWaitMarker(ScreenPtr pScreen, int marker)
while (INREG (MGAREG_Status) & 0x10000);
}
-#ifdef XF86DRI
+#ifdef MGADRI
static void
init_dri(ScrnInfoPtr pScrn)
{
@@ -837,7 +837,7 @@ init_dri(ScrnInfoPtr pScrn)
MGA_BUFFER_ALIGN) & ~MGA_BUFFER_ALIGN;
dri->backPitch = widthBytes;
}
-#endif /* XF86DRI */
+#endif /* MGADRI */
Bool
mgaExaInit(ScreenPtr pScreen)
@@ -898,7 +898,7 @@ mgaExaInit(ScreenPtr pScreen)
pExa->UploadToScreen = mgaUploadToScreen;
pExa->DownloadFromScreen = mgaDownloadFromScreen;
-#ifdef XF86DRI
+#ifdef MGADRI
if (pMga->directRenderingEnabled)
init_dri(pScrn);
#endif