summaryrefslogtreecommitdiff
path: root/src/ast_accel.c
diff options
context:
space:
mode:
authorY.C. Chen <yc_chen@aspeedtech.com>2009-04-13 21:01:51 +0800
committerY.C. Chen <yc_chen@aspeedtech.com>2009-04-13 21:01:51 +0800
commitca0863e91cf7bdbd2f9c30aa1af5c9471dfc858e (patch)
treed4833c83e7df16e4b06b0e5a9455216496f82f33 /src/ast_accel.c
parentda1387d472ce893f0c3466e59c9808db8e1025f0 (diff)
xf86-video-ast-0.89.0xf86-video-ast-0.89.0
Diffstat (limited to 'src/ast_accel.c')
-rw-r--r--src/ast_accel.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/ast_accel.c b/src/ast_accel.c
index ad954e8..ef21462 100644
--- a/src/ast_accel.c
+++ b/src/ast_accel.c
@@ -351,22 +351,29 @@ ASTSubsequentScreenToScreenCopy(ScrnInfoPtr pScrn, int x1, int y1, int x2,
else
cmdreg &= ~CMD_ENABLE_CLIP;
srcbase = dstbase = 0;
+
+ if (x1 < x2)
+ cmdreg |= CMD_X_DEC;
+
+ if (y1 < y2)
+ cmdreg |= CMD_Y_DEC;
- if (y1 >= MAX_SRC_Y)
+ if ((y1 + height) >= MAX_SRC_Y)
{
srcbase=pAST->VideoModeInfo.ScreenPitch*y1;
+ y1 = 0;
}
- if (y2 >= pScrn->virtualY)
+ if ((y2 + height) >= pScrn->virtualY)
{
dstbase=pAST->VideoModeInfo.ScreenPitch*y2;
+ y2 = 0;
}
- if (x1 < x2)
+ if (cmdreg & CMD_X_DEC)
{
- src_x = x1 + width - 1;
- dst_x = x2 + width - 1;
- cmdreg |= CMD_X_DEC;
+ src_x = x1 + width - 1;
+ dst_x = x2 + width - 1;
}
else
{
@@ -374,20 +381,13 @@ ASTSubsequentScreenToScreenCopy(ScrnInfoPtr pScrn, int x1, int y1, int x2,
dst_x = x2;
}
- if (y1 < y2)
- {
- if (srcbase) y1 = 0;
- if (dstbase) y2 = 0;
-
+ if (cmdreg & CMD_Y_DEC)
+ {
src_y = y1 + height - 1;
dst_y = y2 + height - 1;
- cmdreg |= CMD_Y_DEC;
}
else
{
- if (srcbase) y1 = 0;
- if (dstbase) y2 = 0;
-
src_y = y1;
dst_y = y2;
}