diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/radeon_driver.c | 9 |
2 files changed, 14 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2006-03-10 Alan Coopersmith <alan.coopersmith@sun.com> + + * src/radeon_driver.c: + Add #ifdef XF86DRI guards around references to info->allowPageFlip + and info->depthMoves, since they are only defined if building with + DRI. + 2006-03-10 Roland Scheidegger <rscheidegger_lists@hispeed.ch> * man/radeon.man: * src/radeon_driver.c: (RADEONSetupMemXAA_DRI), (RADEONScreenInit): diff --git a/src/radeon_driver.c b/src/radeon_driver.c index fd281558..22b76975 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -1,5 +1,5 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c,v 1.117 2004/02/19 22:38:12 tsi Exp $ */ -/* $XdotOrg: driver/xf86-video-ati/src/radeon_driver.c,v 1.95 2006/03/09 23:26:27 benh Exp $ */ +/* $XdotOrg: driver/xf86-video-ati/src/radeon_driver.c,v 1.96 2006/03/10 13:00:49 sroland Exp $ */ /* * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and * VA Linux Systems Inc., Fremont, California. @@ -4609,6 +4609,7 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr pScrn) OPTION_NO_BACKBUFFER, FALSE); +#ifdef XF86DRI if (info->noBackBuffer) { info->allowPageFlip = 0; } else if (!xf86LoadSubModule(pScrn, "shadowfb")) { @@ -4630,6 +4631,7 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr pScrn) xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Page flipping %sabled\n", info->allowPageFlip ? "en" : "dis"); +#endif info->DMAForXv = TRUE; from = xf86GetOptValBool(info->Options, OPTION_XV_DMA, &info->DMAForXv) @@ -5790,6 +5792,7 @@ _X_EXPORT Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, pScrn->AdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0); +#ifdef XF86DRI /* Depth moves are disabled by default since they are extremely slow */ info->depthMoves = xf86ReturnOptValBool(info->Options, OPTION_DEPTH_MOVE, FALSE); @@ -5803,6 +5806,7 @@ _X_EXPORT Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Depth moves disabled by default\n"); } +#endif /* Initial setup of surfaces */ if (!info->IsSecondary) { @@ -5993,12 +5997,13 @@ _X_EXPORT Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, info->accelOn = FALSE; } - +#ifdef XF86DRI /* Init page flipping if enabled now */ if (info->allowPageFlip) { RADEONTRACE(("Initializing Page Flipping\n")); RADEONDRIInitPageFlip(pScreen); } +#endif /* Init DPMS */ RADEONTRACE(("Initializing DPMS\n")); |