summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2007-10-30 18:43:30 -0700
committerAlan Coopersmith <alan.coopersmith@sun.com>2007-10-30 18:43:30 -0700
commit81717e5780350665166dd7a0f4d96135609a8764 (patch)
tree6fdb8c85e943170fffb93303178876504be1cf04
parentdb22b6ef0fa3ae20f46719bd826e16b6580e5213 (diff)
Don't build or call init_dri if XF86DRI is undefined
-rw-r--r--src/mga_exa.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mga_exa.c b/src/mga_exa.c
index bfb78e7..9321452 100644
--- a/src/mga_exa.c
+++ b/src/mga_exa.c
@@ -758,6 +758,7 @@ mgaWaitMarker(ScreenPtr pScreen, int marker)
while (INREG (MGAREG_Status) & 0x10000);
}
+#ifdef XF86DRI
static void
init_dri(ScrnInfoPtr pScrn)
{
@@ -831,6 +832,7 @@ init_dri(ScrnInfoPtr pScrn)
MGA_BUFFER_ALIGN) & ~MGA_BUFFER_ALIGN;
dri->backPitch = widthBytes;
}
+#endif /* XF86DRI */
Bool
mgaExaInit(ScreenPtr pScreen)
@@ -891,8 +893,10 @@ mgaExaInit(ScreenPtr pScreen)
pExa->UploadToScreen = mgaUploadToScreen;
pExa->DownloadFromScreen = mgaDownloadFromScreen;
+#ifdef XF86DRI
if (pMga->directRenderingEnabled)
init_dri(pScrn);
+#endif
return exaDriverInit(pScreen, pExa);
}