diff options
| author | Michel Dänzer <michel@tungstengraphics.com> | 2006-07-02 23:38:20 +0200 |
|---|---|---|
| committer | Michel Dänzer <michel@tungstengraphics.com> | 2006-07-02 23:38:20 +0200 |
| commit | 66586f905857ea5bf37cb5d34949cd450a9ed067 (patch) | |
| tree | f4cd853cf1fc4de9ecaf20c004e6f9dd4b023329 /src/radeon_mergedfb.c | |
| parent | 1159c85861dc507ebf323aca82e32fcc67726420 (diff) | |
Clean up some redundant code.
Diffstat (limited to 'src/radeon_mergedfb.c')
| -rw-r--r-- | src/radeon_mergedfb.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/radeon_mergedfb.c b/src/radeon_mergedfb.c index bbedac9c..313dda24 100644 --- a/src/radeon_mergedfb.c +++ b/src/radeon_mergedfb.c @@ -2024,14 +2024,7 @@ RADEONSetCursorPositionMerged(ScrnInfoPtr pScrn, int x, int y) OUTREG(RADEON_CUR_HORZ_VERT_POSN, (RADEON_CUR_LOCK | ((xorigin ? 0 : x1) << 16) | (yorigin ? 0 : y1))); -#ifdef USE_EXA - if (info->useEXA) - OUTREG(RADEON_CUR_OFFSET, info->cursor_offset + yorigin * stride); -#endif /* USE_EXA */ -#ifdef USE_XAA - if (!info->useEXA) - OUTREG(RADEON_CUR_OFFSET, info->cursor_offset + yorigin * stride); -#endif /* USE_XAA */ + OUTREG(RADEON_CUR_OFFSET, info->cursor_offset + yorigin * stride); /* cursor2 */ OUTREG(RADEON_CUR2_HORZ_VERT_OFF, (RADEON_CUR2_LOCK | (xorigin << 16) @@ -2039,14 +2032,7 @@ RADEONSetCursorPositionMerged(ScrnInfoPtr pScrn, int x, int y) OUTREG(RADEON_CUR2_HORZ_VERT_POSN, (RADEON_CUR2_LOCK | ((xorigin ? 0 : x2) << 16) | (yorigin ? 0 : y2))); -#ifdef USE_EXA - if (info->useEXA) - OUTREG(RADEON_CUR2_OFFSET, info->cursor_offset + yorigin * stride); -#endif /* USE_EXA */ -#ifdef USE_XAA - if (!info->useEXA) - OUTREG(RADEON_CUR2_OFFSET, info->cursor_offset + yorigin * stride); -#endif /* USE_XAA */ + OUTREG(RADEON_CUR2_OFFSET, info->cursor_offset + yorigin * stride); } /* radeon Xv helpers */ |