diff options
Diffstat (limited to 'fb/fbcompose.c')
-rw-r--r-- | fb/fbcompose.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/fb/fbcompose.c b/fb/fbcompose.c index dd030d927..4938f89d0 100644 --- a/fb/fbcompose.c +++ b/fb/fbcompose.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.17 2003/11/03 05:11:00 tsi Exp $ + * $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.18 2003/12/04 17:15:12 tsi Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * @@ -2424,6 +2424,8 @@ fbStore_external (FbCompositeOperand *op, CARD32 value) (*op[2].store) (&op[2], value & 0xff000000); } +#define dummyScreen screenInfo.screens[0] + CARD32 fbFetch_transform (FbCompositeOperand *op) { @@ -2445,7 +2447,7 @@ fbFetch_transform (FbCompositeOperand *op) case PictFilterNearest: y = xFixedToInt (v.vector[1]) + op->u.transform.top_y; x = xFixedToInt (v.vector[0]) + op->u.transform.left_x; - if (POINT_IN_REGION (0, op->clip, x, y, &box)) + if (POINT_IN_REGION (dummyScreen, op->clip, x, y, &box)) { (*op[1].set) (&op[1], x, y); bits = (*op[1].fetch) (&op[1]); @@ -2469,7 +2471,7 @@ fbFetch_transform (FbCompositeOperand *op) xerr = xFixed1 - xFixedFrac (v.vector[0]); for (x = minx; x <= maxx; x++) { - if (POINT_IN_REGION (0, op->clip, x, y, &box)) + if (POINT_IN_REGION (dummyScreen, op->clip, x, y, &box)) { (*op[1].set) (&op[1], x, y); bits = (*op[1].fetch) (&op[1]); @@ -2527,7 +2529,7 @@ fbFetcha_transform (FbCompositeOperand *op) case PictFilterNearest: y = xFixedToInt (v.vector[1]) + op->u.transform.left_x; x = xFixedToInt (v.vector[0]) + op->u.transform.top_y; - if (POINT_IN_REGION (0, op->clip, x, y, &box)) + if (POINT_IN_REGION (dummyScreen, op->clip, x, y, &box)) { (*op[1].set) (&op[1], x, y); bits = (*op[1].fetcha) (&op[1]); @@ -2551,7 +2553,7 @@ fbFetcha_transform (FbCompositeOperand *op) xerr = xFixed1 - xFixedFrac (v.vector[0]); for (x = minx; x <= maxx; x++) { - if (POINT_IN_REGION (0, op->clip, x, y, &box)) + if (POINT_IN_REGION (dummyScreen, op->clip, x, y, &box)) { (*op[1].set) (&op[1], x, y); bits = (*op[1].fetcha) (&op[1]); |