diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-07-16 04:38:54 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-07-16 04:38:54 +0000 |
| commit | 57de5e285d6271fc4b2bc8a951a98be6308d649d (patch) | |
| tree | 3653c2871cc03c63e6c9c588e1159c3cf9205bba /src/radeon_accelfuncs.c | |
| parent | 9b0ec803bd588d9af778bfd307ee6d958e4a1e73 (diff) | |
Bugzilla #803,804: Fix build in the !XF86DRI case after DRI and Radeon
Render acceleration merges.
Diffstat (limited to 'src/radeon_accelfuncs.c')
| -rw-r--r-- | src/radeon_accelfuncs.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/radeon_accelfuncs.c b/src/radeon_accelfuncs.c index 16dcec15..ec9d04fc 100644 --- a/src/radeon_accelfuncs.c +++ b/src/radeon_accelfuncs.c @@ -1348,7 +1348,7 @@ FUNC_NAME(RADEONAccelInit)(ScreenPtr pScreen, XAAInfoRecPtr a) | BIT_ORDER_IN_BYTE_LSBFIRST); #endif -#ifdef RENDER +#if defined(RENDER) && defined(XF86DRI) if (info->RenderAccel && info->directRenderingEnabled && ((pScrn->bitsPerPixel == 32) || (pScrn->bitsPerPixel == 16))) { /* XXX: The non-CP vertex dispatch doesn't seem to work. */ @@ -1396,8 +1396,12 @@ FUNC_NAME(RADEONAccelInit)(ScreenPtr pScreen, XAAInfoRecPtr a) FUNC_NAME(R100SubsequentCPUToScreenTexture); } xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Render acceleration enabled\n"); + } else { + info->RenderAccel = FALSE; } -#endif +#else /* RENDER && XF86DRI */ + info->RenderAccel = FALSE; +#endif /* RENDER && XF86DRI */ } #undef FUNC_NAME |