diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | exa/exa_accel.c | 11 |
2 files changed, 19 insertions, 1 deletions
@@ -1,3 +1,12 @@ +2006-03-11 Eric Anholt <anholt@FreeBSD.org> + + reviewed by: jbarnes + + * exa/exa_accel.c: (exaCopyNtoNTwoDir): + Make exaCopyNtoNTwoDir() call DoneCopy() at the end of each string of + consecutive Copy() calls (rather than exactly once at the end of the + function). + 2006-03-10 Kristian Høgsberg <krh@redhat.com> * Merge accel_indirect branch to HEAD. diff --git a/exa/exa_accel.c b/exa/exa_accel.c index 34d30bc0d..9d02ab990 100644 --- a/exa/exa_accel.c +++ b/exa/exa_accel.c @@ -148,6 +148,8 @@ exaCopyNtoNTwoDir (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, if (dx >= 0 && (src_off_y + pbox->y1 + dy) != pbox->y1) { /* Do a xdir = ydir = -1 blit instead. */ if (dirsetup != -1) { + if (dirsetup != 0) + pExaScr->info->DoneCopy(pDstPixmap); dirsetup = -1; if (!(*pExaScr->info->PrepareCopy)(pSrcPixmap, pDstPixmap, @@ -167,6 +169,8 @@ exaCopyNtoNTwoDir (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, } else if (dx < 0 && (src_off_y + pbox->y1 + dy) != pbox->y1) { /* Do a xdir = ydir = 1 blit instead. */ if (dirsetup != 1) { + if (dirsetup != 0) + pExaScr->info->DoneCopy(pDstPixmap); dirsetup = 1; if (!(*pExaScr->info->PrepareCopy)(pSrcPixmap, pDstPixmap, @@ -190,6 +194,8 @@ exaCopyNtoNTwoDir (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, */ int i; if (dirsetup != 1) { + if (dirsetup != 0) + pExaScr->info->DoneCopy(pDstPixmap); dirsetup = 1; if (!(*pExaScr->info->PrepareCopy)(pSrcPixmap, pDstPixmap, @@ -213,6 +219,8 @@ exaCopyNtoNTwoDir (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, */ int i; if (dirsetup != -1) { + if (dirsetup != 0) + pExaScr->info->DoneCopy(pDstPixmap); dirsetup = -1; if (!(*pExaScr->info->PrepareCopy)(pSrcPixmap, pDstPixmap, @@ -231,7 +239,8 @@ exaCopyNtoNTwoDir (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, pbox->x2 - pbox->x1, 1); } } - (*pExaScr->info->DoneCopy)(pDstPixmap); + if (dirsetup != 0) + pExaScr->info->DoneCopy(pDstPixmap); exaMarkSync(pDstDrawable->pScreen); exaDrawableDirty(pDstDrawable); return TRUE; |