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>
This commit is contained in:
Dave Airlie 2010-07-05 09:07:08 +10:00
parent 7ad9c0bebf
commit feff2ec80e
1 changed files with 2 additions and 2 deletions

View File

@ -81,7 +81,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,
@ -1048,7 +1048,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))