From 771b366abe0bc060592b548612ec413291e14bf0 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 18 Apr 2006 18:50:35 +0000 Subject: [PATCH] Fix exaGetPixmapFirstPixel to migrate as unaccelerated. Also adds a bit of fallback debugging info to PolyGlyphBlt. --- ChangeLog | 7 +++++++ exa/exa_unaccel.c | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a263050ae..fbdd69c88 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-04-18 Eric Anholt + + * exa/exa_unaccel.c: (ExaCheckPolyGlyphBlt), + (exaGetPixmapFirstPixel): + Fix exaGetPixmapFirstPixel to migrate as unaccelerated. Also adds a bit + of fallback debugging info to PolyGlyphBlt. + 2006-04-18 Donnie Berkholz reviewed by: Alan Coopersmith diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c index b28c5a5b0..cc5c61a38 100644 --- a/exa/exa_unaccel.c +++ b/exa/exa_unaccel.c @@ -212,7 +212,8 @@ ExaCheckPolyGlyphBlt (DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase) { - EXA_FALLBACK(("to 0x%lx\n", (long)pDrawable)); + EXA_FALLBACK(("to 0x%lx, style %d alu %d\n", (long)pDrawable, + pGC->fillStyle, pGC->alu)); exaPrepareAccess (pDrawable, EXA_PREPARE_DEST); exaPrepareAccessGC (pGC); fbPolyGlyphBlt (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase); @@ -352,7 +353,7 @@ exaGetPixmapFirstPixel (PixmapPtr pPixmap) pixmaps[0].as_dst = FALSE; pixmaps[0].as_src = TRUE; pixmaps[0].pPix = pPixmap; - exaDoMigration (pixmaps, 1, TRUE); + exaDoMigration (pixmaps, 1, FALSE); exaPrepareAccess(&pPixmap->drawable, EXA_PREPARE_SRC); switch (pPixmap->drawable.bitsPerPixel) {