summaryrefslogtreecommitdiff
path: root/src/i810_accel.c
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2009-11-05 15:40:20 -0800
committerEric Anholt <eric@anholt.net>2009-11-05 16:02:02 -0800
commitdbb68168dc909ab2ec1d935322c3fd8581e666f1 (patch)
tree37b193b0d41a6529c9c546e5f8672ab63917c018 /src/i810_accel.c
parent4c8e783d84d2c14c8a1638b6a12307c0164d3e31 (diff)
Revert "configure: make --disable-dri work even if the server supports DRI"
This reverts commit a851139c2141f6da370186148f2836e18b2acf83. It broke the build, and I don't see why we should be supporting this anyway. Conflicts: configure.ac src/Makefile.am
Diffstat (limited to 'src/i810_accel.c')
-rw-r--r--src/i810_accel.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/i810_accel.c b/src/i810_accel.c
index 94842650..ae4a6544 100644
--- a/src/i810_accel.c
+++ b/src/i810_accel.c
@@ -213,7 +213,7 @@ I810WaitLpRing(ScrnInfoPtr pScrn, int n, int timeout_millis)
start);
I810PrintErrorState(pScrn);
ErrorF("space: %d wanted %d\n", ring->space, n);
-#ifdef HAVE_DRI
+#ifdef XF86DRI
if (pI810->directRenderingEnabled) {
DRIUnlock(screenInfo.screens[pScrn->scrnIndex]);
DRICloseScreen(screenInfo.screens[pScrn->scrnIndex]);
@@ -245,7 +245,7 @@ I810Sync(ScrnInfoPtr pScrn)
if (I810_DEBUG & (DEBUG_VERBOSE_ACCEL | DEBUG_VERBOSE_SYNC))
ErrorF("I810Sync\n");
-#ifdef HAVE_DRI
+#ifdef XF86DRI
/* VT switching tries to do this.
*/
if (!pI810->LockHeld && pI810->directRenderingEnabled) {