diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-09-06 19:44:39 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-09-06 19:44:39 +0000 |
| commit | 9401e5643e90e23287b785e5fc238bb7c7f2d896 (patch) | |
| tree | 759a23118c7bb4a1cddc87b3ad5c63f459a64bd2 /xserver/fb/fbwindow.c | |
| parent | 6d29d2deb77299e537a0daf2babf0e217ce51376 (diff) | |
update to xserver 1.6.4rc1. Tested by many, ok oga@.
Diffstat (limited to 'xserver/fb/fbwindow.c')
| -rw-r--r-- | xserver/fb/fbwindow.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/xserver/fb/fbwindow.c b/xserver/fb/fbwindow.c index f6fe8aa83..70e75a9e9 100644 --- a/xserver/fb/fbwindow.c +++ b/xserver/fb/fbwindow.c @@ -31,10 +31,8 @@ Bool fbCreateWindow(WindowPtr pWin) { -#ifndef FB_NO_WINDOW_PIXMAPS dixSetPrivate(&pWin->devPrivates, fbGetWinPrivateKey(), fbGetScreenPixmap(pWin->drawable.pScreen)); -#endif #ifdef FB_SCREEN_PRIVATE if (pWin->drawable.bitsPerPixel == 32) pWin->drawable.bitsPerPixel = fbGetScreenPrivate(pWin->drawable.pScreen)->win32bpp; @@ -227,7 +225,7 @@ fbFillRegionSolid (DrawablePtr pDrawable, while (n--) { #ifndef FB_ACCESS_WRAPPER - if (!try_mmx || !pixman_fill (dst, dstStride, dstBpp, + if (!try_mmx || !pixman_fill ((uint32_t *)dst, dstStride, dstBpp, pbox->x1 + dstXoff, pbox->y1 + dstYoff, (pbox->x2 - pbox->x1), (pbox->y2 - pbox->y1), |