diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-12-20 21:40:19 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-12-20 21:40:19 +0000 |
| commit | b37e738d5f4e1769bdee98acca788aeeb1556bcc (patch) | |
| tree | 422c4807dfe58970a5cc05f10bfcdc0317dfb409 | |
| parent | 03d37eb03864cfc1a2f8d239d5a4c8341bf274f7 (diff) | |
Fix an fb regression on A8 pictures. (Fredrik Höglund)
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | fb/fbpict.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -3,6 +3,9 @@ * hw/xfree86/common/xf86Config.c: Bug #5359: Fix a segfault (Mark Kettenis) + * fb/fbpict.c: + Fix an fb regression on A8 pictures. (Fredrik Höglund) + 2005-12-19 Adam Jackson <ajax@freedesktop.org> * hw/xfree86/doc/man/xorg.conf.man.pre: diff --git a/fb/fbpict.c b/fb/fbpict.c index 05e0ef03f..5ab3756b9 100644 --- a/fb/fbpict.c +++ b/fb/fbpict.c @@ -881,7 +881,7 @@ fbComposite (CARD8 op, case PictOpSrc: #ifdef USE_MMX if (!pMask && pSrc->format == pDst->format && - pSrc->pDrawable != pDst->pDrawable) + pSrc->format != PICT_a8 && pSrc->pDrawable != pDst->pDrawable) { func = fbCompositeCopyAreammx; } |