diff options
| author | Eric Anholt <eric@anholt.net> | 2009-01-22 17:54:49 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-04-27 17:05:55 -0700 |
| commit | 30c226eeb35f034c3ddb881e77454051dc210298 (patch) | |
| tree | 5a0f98a4dfbb280c781ae6ba9761d58198ae4ba6 /src/i830_accel.c | |
| parent | 47591334a183881704a121ae06ebc2fadebe6f73 (diff) | |
Remove DRI1 support.
This was blocked on wide distribution of X Server 1.6 (now in the current or
next version of major distributions) and solutions for a couple of significant
architectural problems (vblank sync and frontbuffer rendering, which we now
have code or good plans for).
This includes disabling XVMC which is DRI1-only currently.
Diffstat (limited to 'src/i830_accel.c')
| -rw-r--r-- | src/i830_accel.c | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/src/i830_accel.c b/src/i830_accel.c index cae36dc8..12bb5a20 100644 --- a/src/i830_accel.c +++ b/src/i830_accel.c @@ -137,12 +137,6 @@ I830WaitLpRing(ScrnInfoPtr pScrn, int n, int timeout_millis) else i830_dump_error_state(pScrn); ErrorF("space: %d wanted %d\n", ring->space, n); -#ifdef XF86DRI - if (pI830->directRenderingType == DRI_XF86DRI) { - DRIUnlock(screenInfo.screens[pScrn->scrnIndex]); - DRICloseScreen(screenInfo.screens[pScrn->scrnIndex]); - } -#endif #ifdef I830_USE_XAA pI830->AccelInfoRec = NULL; /* Stops recursive behavior */ #endif @@ -180,14 +174,6 @@ I830Sync(ScrnInfoPtr pScrn) if (pI830->accel == ACCEL_NONE || !pScrn->vtSema || !pI830->batch_bo) return; -#ifdef XF86DRI - /* VT switching tries to do this. - */ - if (!pI830->LockHeld && pI830->directRenderingType == DRI_XF86DRI) { - return; - } -#endif - I830EmitFlush(pScrn); intel_batch_flush(pScrn, TRUE); @@ -241,35 +227,6 @@ I830EmitFlush(ScrnInfoPtr pScrn) } } -Bool -I830SelectBuffer(ScrnInfoPtr pScrn, int buffer) -{ - I830Ptr pI830 = I830PTR(pScrn); - - switch (buffer) { -#ifdef XF86DRI - case I830_SELECT_BACK: - pI830->bufferOffset = pI830->back_buffer->offset; - if (pI830->back_buffer->tiling == TILE_YMAJOR) - return FALSE; - break; - case I830_SELECT_DEPTH: - pI830->bufferOffset = pI830->depth_buffer->offset; - if (pI830->depth_buffer->tiling == TILE_YMAJOR) - return FALSE; - break; -#endif - default: - case I830_SELECT_FRONT: - pI830->bufferOffset = pScrn->fbOffset; - break; - } - - if (I810_DEBUG & DEBUG_VERBOSE_ACCEL) - ErrorF("I830SelectBuffer %d --> offset %x\n", - buffer, pI830->bufferOffset); - return TRUE; -} #if (ALWAYS_SYNC || ALWAYS_FLUSH) void |