xf86-video-intel: Branch 'intel-batchbuffer' - src/i830_dri.c

[Dave Airlie]

 src/i830_dri.c |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 1be94c42602cae265746490e7c8cbabf238e690c
Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Feb 28 09:35:25 2008 +1000

    dri2: make build work without dri2 enabled

diff --git a/src/i830_dri.c b/src/i830_dri.c
index a2a810e..1c02fbd 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -1795,8 +1795,10 @@ I830DRILock(ScrnInfoPtr pScrn)
       return FALSE;
    else if (pI830->directRendering == DRI_TYPE_XF86DRI)
       DRILock(screenInfo.screens[pScrn->scrnIndex], 0);
+#ifdef DRI2
    else if (pI830->directRendering == DRI_TYPE_DRI2)
       I830DRI2Lock(screenInfo.screens[pScrn->scrnIndex]);
+#endif
 
    pI830->LockHeld = 1;
    i830_refresh_ring(pScrn);
@@ -1813,12 +1815,15 @@ I830DRIUnlock(ScrnInfoPtr pScrn)
       return;
    else if (pI830->directRendering == DRI_TYPE_XF86DRI)
       DRIUnlock(screenInfo.screens[pScrn->scrnIndex]);
+#ifdef DRI2
    else if (pI830->directRendering == DRI_TYPE_DRI2)
       I830DRI2Unlock(screenInfo.screens[pScrn->scrnIndex]);
+#endif
 
    pI830->LockHeld = 0;
 }
 
+#ifdef DRI2
 void
 I830DRI2Lock(ScreenPtr pScreen)
 {
@@ -2028,3 +2033,4 @@ I830DRI2CloseScreen(ScreenPtr pScreen)
     DRI2CloseScreen(pScreen);
     drmClose(pI830->drmSubFD);
 }
+#endif