diff options
| author | Alex Deucher <alex@botchco.com> | 2008-06-03 20:32:20 -0400 |
|---|---|---|
| committer | Alex Deucher <alex@botchco.com> | 2008-06-03 20:33:15 -0400 |
| commit | 6e4e6d2a8f29f92efc219dca24ea31d1f37d5a0f (patch) | |
| tree | 01d93b68736ba3a2c373c021c84d91527242c464 | |
| parent | 9d3afbf5fa4110928a9f965df2733c79db92ea99 (diff) | |
RADEON: minor cleanups
| -rw-r--r-- | src/radeon_accel.c | 2 | ||||
| -rw-r--r-- | src/radeon_commonfuncs.c | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/radeon_accel.c b/src/radeon_accel.c index 778d43ef..4ce0da62 100644 --- a/src/radeon_accel.c +++ b/src/radeon_accel.c @@ -371,7 +371,7 @@ void RADEONEngineInit(ScrnInfoPtr pScrn) info->CurrentLayout.bitsPerPixel); #ifdef XF86DRI - if (IS_R300_3D | IS_R500_3D) { + if (info->directRenderingEnabled && (IS_R300_3D | IS_R500_3D)) { drmRadeonGetParam np; int num_pipes; diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c index b1dd6e87..58fe3065 100644 --- a/src/radeon_commonfuncs.c +++ b/src/radeon_commonfuncs.c @@ -590,10 +590,7 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn) OUT_ACCEL_REG(R300_SC_SCISSOR1, ((8191 << R300_SCISSOR_X_SHIFT) | (8191 << R300_SCISSOR_Y_SHIFT))); - if (IS_R300_VARIANT || - (info->ChipFamily == CHIP_FAMILY_RS600) || - (info->ChipFamily == CHIP_FAMILY_RS690) || - (info->ChipFamily == CHIP_FAMILY_RS740)) { + if (IS_R300_3D) { /* clip has offset 1440 */ OUT_ACCEL_REG(R300_SC_CLIP_0_A, ((1088 << R300_CLIP_X_SHIFT) | (1088 << R300_CLIP_Y_SHIFT))); |