diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-02-05 19:26:12 -0500 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-02-05 19:26:12 -0500 |
| commit | 9b291beaca8b06b086772f6e842d8be168386575 (patch) | |
| tree | db2367cd7c0296354f5a3fdabe6a61d45ca5c789 | |
| parent | 6e713032b53c262c9e34f7249ce0f85fbc9ae267 (diff) | |
Revert "R6xx/R7xx EXA: improve overlapping copy performance"
This reverts commit bd28b5817ed96e86a2cb275f72a7233d8fc5eccc.
THis seems to cause corruption in some cases.
| -rw-r--r-- | src/r600_exa.c | 35 |
1 files changed, 29 insertions, 6 deletions
diff --git a/src/r600_exa.c b/src/r600_exa.c index 8085cb8..7d7c80d 100644 --- a/src/r600_exa.c +++ b/src/r600_exa.c @@ -721,42 +721,65 @@ R600OverlapCopy(PixmapPtr pDst, uint32_t dst_offset = exaGetPixmapOffset(pDst) + rhdPtr->FbIntAddress + rhdPtr->FbScanoutStart; int i; - R600DoPrepareCopy(pScrn, - dst_pitch, pDst->drawable.width, pDst->drawable.height, dst_offset, pDst->drawable.bitsPerPixel, - dst_pitch, pDst->drawable.height, dst_offset, pDst->drawable.bitsPerPixel, - accel_state->rop, accel_state->planemask); - if (is_overlap(srcX, srcX + w, srcY, srcY + h, dstX, dstX + w, dstY, dstY + h)) { if (srcY == dstY) { // left/right if (srcX < dstX) { // right // copy right to left for (i = w; i > 0; i--) { + R600DoPrepareCopy(pScrn, + dst_pitch, pDst->drawable.width, pDst->drawable.height, dst_offset, pDst->drawable.bitsPerPixel, + dst_pitch, pDst->drawable.height, dst_offset, pDst->drawable.bitsPerPixel, + accel_state->rop, accel_state->planemask); R600AppendCopyVertex(pScrn, srcX + i - 1, srcY, dstX + i - 1, dstY, 1, h); + R600DoCopy(pScrn); } } else { //left // copy left to right for (i = 0; i < w; i++) { + R600DoPrepareCopy(pScrn, + dst_pitch, pDst->drawable.width, pDst->drawable.height, dst_offset, pDst->drawable.bitsPerPixel, + dst_pitch, pDst->drawable.height, dst_offset, pDst->drawable.bitsPerPixel, + accel_state->rop, accel_state->planemask); + R600AppendCopyVertex(pScrn, srcX + i, srcY, dstX + i, dstY, 1, h); + R600DoCopy(pScrn); } } } else { //up/down if (srcY > dstY) { // up // copy top to bottom for (i = 0; i < h; i++) { + R600DoPrepareCopy(pScrn, + dst_pitch, pDst->drawable.width, pDst->drawable.height, dst_offset, pDst->drawable.bitsPerPixel, + dst_pitch, pDst->drawable.height, dst_offset, pDst->drawable.bitsPerPixel, + accel_state->rop, accel_state->planemask); + R600AppendCopyVertex(pScrn, srcX, srcY + i, dstX, dstY + i, w, 1); + R600DoCopy(pScrn); } } else { // down // copy bottom to top for (i = h; i > 0; i--) { + R600DoPrepareCopy(pScrn, + dst_pitch, pDst->drawable.width, pDst->drawable.height, dst_offset, pDst->drawable.bitsPerPixel, + dst_pitch, pDst->drawable.height, dst_offset, pDst->drawable.bitsPerPixel, + accel_state->rop, accel_state->planemask); + R600AppendCopyVertex(pScrn, srcX, srcY + i - 1, dstX, dstY + i - 1, w, 1); + R600DoCopy(pScrn); } } } } else { + R600DoPrepareCopy(pScrn, + dst_pitch, pDst->drawable.width, pDst->drawable.height, dst_offset, pDst->drawable.bitsPerPixel, + dst_pitch, pDst->drawable.height, dst_offset, pDst->drawable.bitsPerPixel, + accel_state->rop, accel_state->planemask); + R600AppendCopyVertex(pScrn, srcX, srcY, dstX, dstY, w, h); + R600DoCopy(pScrn); } - R600DoCopy(pScrn); } static void |