diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-07-05 09:07:08 +1000 |
|---|---|---|
| committer | Owain G. Ainsworth <oga@openbsd.org> | 2010-09-03 23:11:25 +0100 |
| commit | aec26aa8d531fbb06a89dd25cb72dafd6dbf8cca (patch) | |
| tree | f9c2c09147ee84d85d32a5107de64479f9f746c4 /uxa/uxa-accel.c | |
| parent | c920870fc17bef1269ce7199b31c166d47d5cc05 (diff) | |
uxa: don't compare planemask with FB_ALLONES.
planemask is an unsigned long initialised to ~0, on 64-bit this is not equal
to an (unsigned int)-1.
Use the macro provided to do this.
Signed-off-by: Dave Airlie <airlied@redhat.com>
(cherry picked from commit feff2ec80eeeba5074d19efcddf4867adf639b4f)
Signed-off-by: Owain G. Ainsworth <oga@openbsd.org>
Diffstat (limited to 'uxa/uxa-accel.c')
| -rw-r--r-- | uxa/uxa-accel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/uxa/uxa-accel.c b/uxa/uxa-accel.c index 245738a6..a5a7a011 100644 --- a/uxa/uxa-accel.c +++ b/uxa/uxa-accel.c @@ -83,7 +83,7 @@ uxa_fill_spans(DrawablePtr pDrawable, GCPtr pGC, int n, if (!dst_pixmap) goto fallback; - if (pGC->alu != GXcopy || pGC->planemask != FB_ALLONES) + if (pGC->alu != GXcopy || !UXA_IS_PM_SOLID(pDrawable, pGC->planemask)) goto solid; format = PictureMatchFormat(screen, @@ -1043,7 +1043,7 @@ uxa_fill_region_solid(DrawablePtr pDrawable, extents = REGION_EXTENTS(screen, pRegion); /* Using GEM, the relocation costs outweigh the advantages of the blitter */ - if (nbox == 1 || (alu != GXcopy && alu != GXclear) || planemask != FB_ALLONES) { + if (nbox == 1 || (alu != GXcopy && alu != GXclear) || !UXA_PM_IS_SOLID(&pixmap->drawable, planemask)) { try_solid: if (uxa_screen->info->check_solid && !uxa_screen->info->check_solid(&pixmap->drawable, alu, planemask)) |