xserver: Branch 'master'
Matthias Hopf
mhopf at kemper.freedesktop.org
Wed Jun 21 18:09:51 EEST 2006
hw/xfree86/xaa/xaaPict.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletion(-)
New commits:
diff-tree ea5e0eabd1303a55d8fc10f44d21a3d371ce8919 (from d44b2a0a57fb89741173c31676af0ccc822387dc)
Author: Matthias Hopf <mhopf at suse.de>
Date: Wed Jun 21 17:08:51 2006 +0200
Bug 4320: Fastpath corner case improvement for Composite.
diff --git a/hw/xfree86/xaa/xaaPict.c b/hw/xfree86/xaa/xaaPict.c
index f7c1f3d..a1ff510 100644
--- a/hw/xfree86/xaa/xaaPict.c
+++ b/hw/xfree86/xaa/xaaPict.c
@@ -516,7 +516,10 @@ XAAComposite (CARD8 op,
(!pSrc->repeat || (xSrc >= 0 && ySrc >= 0 &&
xSrc+width<=pSrc->pDrawable->width &&
ySrc+height<=pSrc->pDrawable->height)) &&
- ((op == PictOpSrc && pSrc->format == pDst->format) ||
+ ((op == PictOpSrc &&
+ ((pSrc->format==pDst->format) ||
+ (pSrc->format==PICT_a8r8g8b8 && pDst->format==PICT_x8r8g8b8) ||
+ (pSrc->format==PICT_a8b8g8r8 && pDst->format==PICT_x8b8g8r8))) ||
(op == PictOpOver && !pSrc->alphaMap && !pDst->alphaMap &&
pSrc->format==pDst->format &&
(pSrc->format==PICT_x8r8g8b8 || pSrc->format==PICT_x8b8g8r8))))
More information about the xorg-commit
mailing list