diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-06-09 14:26:21 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-06-09 14:26:21 -0400 |
| commit | 74b0a38c75c1d6a6344015d32d84b43d9e80df1d (patch) | |
| tree | 43011bc4330f78387613488a08a65d82e7d4c103 /src | |
| parent | f6dff8836729cc9d29264080c9cfa0e1df6182cf (diff) | |
Consolidate indentical RADEONDoneSolid/RADEONDoneCopy functions
Diffstat (limited to 'src')
| -rw-r--r-- | src/radeon_exa_funcs.c | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c index 3804498f..ac82952b 100644 --- a/src/radeon_exa_funcs.c +++ b/src/radeon_exa_funcs.c @@ -139,7 +139,7 @@ FUNC_NAME(RADEONSolid)(PixmapPtr pPix, int x1, int y1, int x2, int y2) } static void -FUNC_NAME(RADEONDoneSolid)(PixmapPtr pPix) +FUNC_NAME(RADEONDone2D)(PixmapPtr pPix) { RINFO_FROM_SCREEN(pPix->drawable.pScreen); ACCEL_PREAMBLE(); @@ -231,7 +231,7 @@ FUNC_NAME(RADEONCopy)(PixmapPtr pDst, dstY += h - 1; } - if (info->accel_state->vsync) + if (info->accel_state->vsync) FUNC_NAME(RADEONWaitForVLine)(pScrn, pDst, RADEONBiggerCrtcArea(pDst), dstY, dstY + h); BEGIN_ACCEL(3); @@ -243,22 +243,6 @@ FUNC_NAME(RADEONCopy)(PixmapPtr pDst, FINISH_ACCEL(); } -static void -FUNC_NAME(RADEONDoneCopy)(PixmapPtr pDst) -{ - RINFO_FROM_SCREEN(pDst->drawable.pScreen); - ACCEL_PREAMBLE(); - - TRACE; - - BEGIN_ACCEL(2); - OUT_ACCEL_REG(RADEON_DSTCACHE_CTLSTAT, RADEON_RB2D_DC_FLUSH_ALL); - OUT_ACCEL_REG(RADEON_WAIT_UNTIL, - RADEON_WAIT_2D_IDLECLEAN | RADEON_WAIT_DMA_GUI_IDLE); - FINISH_ACCEL(); -} - - #ifdef ACCEL_CP static Bool @@ -459,11 +443,11 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen) info->accel_state->exa->PrepareSolid = FUNC_NAME(RADEONPrepareSolid); info->accel_state->exa->Solid = FUNC_NAME(RADEONSolid); - info->accel_state->exa->DoneSolid = FUNC_NAME(RADEONDoneSolid); + info->accel_state->exa->DoneSolid = FUNC_NAME(RADEONDone2D); info->accel_state->exa->PrepareCopy = FUNC_NAME(RADEONPrepareCopy); info->accel_state->exa->Copy = FUNC_NAME(RADEONCopy); - info->accel_state->exa->DoneCopy = FUNC_NAME(RADEONDoneCopy); + info->accel_state->exa->DoneCopy = FUNC_NAME(RADEONDone2D); info->accel_state->exa->MarkSync = FUNC_NAME(RADEONMarkSync); info->accel_state->exa->WaitMarker = FUNC_NAME(RADEONSync); |