diff options
| author | Alex Deucher <alex@t41p.hsd1.va.comcast.net> | 2008-05-09 05:28:44 -0400 |
|---|---|---|
| committer | Alex Deucher <alex@t41p.hsd1.va.comcast.net> | 2008-05-09 05:28:44 -0400 |
| commit | 94405eb1c9e4e0ababc6aef03b753d6ed9eb7838 (patch) | |
| tree | 36a1a9abd2fd94f60b78660dc36c7f2e50a43462 | |
| parent | 18e20bc22a55ecfee9798c01079d7b24d19f0051 (diff) | |
RADEON: fixup ifdef from last commit
| -rw-r--r-- | src/radeon_exa_funcs.c | 6 | ||||
| -rw-r--r-- | src/radeon_video.c | 18 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c index ab890adc..1a55e28e 100644 --- a/src/radeon_exa_funcs.c +++ b/src/radeon_exa_funcs.c @@ -537,9 +537,11 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen) xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Render acceleration " "unsupported on R600 and newer cards.\n"); else if (IS_R300_3D || IS_R500_3D) { + if ((info->ChipFamily < CHIP_FAMILY_RS400) #ifdef XF86DRI - if ((info->ChipFamily < CHIP_FAMILY_RS400) || (info->directRenderingEnabled)) { + || (info->directRenderingEnabled) #endif + ) { xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Render acceleration " "enabled for R300/R400/R500 type cards.\n"); info->exa->CheckComposite = R300CheckComposite; @@ -547,10 +549,8 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen) FUNC_NAME(R300PrepareComposite); info->exa->Composite = FUNC_NAME(RadeonComposite); info->exa->DoneComposite = FUNC_NAME(RadeonDoneComposite); -#ifdef XF86DRI } else xf86DrvMsg(pScrn->scrnIndex, X_INFO, "EXA Composite requires CP on R5xx/IGP\n"); -#endif } else if ((info->ChipFamily == CHIP_FAMILY_RV250) || (info->ChipFamily == CHIP_FAMILY_RV280) || (info->ChipFamily == CHIP_FAMILY_RS300) || diff --git a/src/radeon_video.c b/src/radeon_video.c index 1c13dcd4..4cd35134 100644 --- a/src/radeon_video.c +++ b/src/radeon_video.c @@ -286,19 +286,19 @@ void RADEONInitVideo(ScreenPtr pScreen) } if (info->ChipFamily != CHIP_FAMILY_RV250) { + if ((info->ChipFamily < CHIP_FAMILY_RS400) #ifdef XF86DRI - if ((info->ChipFamily < CHIP_FAMILY_RS400) || (info->directRenderingEnabled)) { + || (info->directRenderingEnabled) #endif - texturedAdaptor = RADEONSetupImageTexturedVideo(pScreen); - if (texturedAdaptor != NULL) { - adaptors[num_adaptors++] = texturedAdaptor; - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Set up textured video\n"); + ) { + texturedAdaptor = RADEONSetupImageTexturedVideo(pScreen); + if (texturedAdaptor != NULL) { + adaptors[num_adaptors++] = texturedAdaptor; + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Set up textured video\n"); + } else + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to set up textured video\n"); } else - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to set up textured video\n"); -#ifdef XF86DRI - } else xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Textured video requires CP on R5xx/IGP\n"); -#endif } else xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Textured video disabled on RV250 due to HW bug\n"); |