diff options
| author | Eric Anholt <anholt@freebsd.org> | 2006-04-01 23:41:23 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2006-04-01 23:41:23 +0000 |
| commit | ccca76b8083b83825fa16483b44e8926a35412bb (patch) | |
| tree | 16b61d2f7058a37d3cf16c73f74831ddd7c780e2 | |
| parent | 6afa814ab16f351b2eb787e5bf481a1f9738b391 (diff) | |
Clean up warnings and a debug printf.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | exa/exa_accel.c | 1 | ||||
| -rw-r--r-- | hw/kdrive/ephyr/ephyr_draw.c | 5 |
3 files changed, 9 insertions, 4 deletions
@@ -1,5 +1,12 @@ 2006-04-01 Eric Anholt <anholt@FreeBSD.org> + * exa/exa_accel.c: (exaCopyWindow): + * hw/kdrive/ephyr/ephyr_draw.c: (ephyrFinishPipelinedAccess), + (ephyrUploadToScreen): + Clean up warnings and a debug printf. + +2006-04-01 Eric Anholt <anholt@FreeBSD.org> + * exa/exa.c: (exaValidateGC): Pull out fb's tile handling during fbValidateGC so we can do the necessary exaPrepare/FinishAccess()es. Revealed by xtest with fakexa. diff --git a/exa/exa_accel.c b/exa/exa_accel.c index 1978852b6..b51cd87dd 100644 --- a/exa/exa_accel.c +++ b/exa/exa_accel.c @@ -822,7 +822,6 @@ const GCOps exaOps = { void exaCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc) { - ExaScreenPriv (pWin->drawable.pScreen); RegionRec rgnDst; int dx, dy; PixmapPtr pPixmap = (*pWin->drawable.pScreen->GetWindowPixmap) (pWin); diff --git a/hw/kdrive/ephyr/ephyr_draw.c b/hw/kdrive/ephyr/ephyr_draw.c index b155c6f6e..68ffa9ef3 100644 --- a/hw/kdrive/ephyr/ephyr_draw.c +++ b/hw/kdrive/ephyr/ephyr_draw.c @@ -81,7 +81,6 @@ ephyrFinishPipelinedAccess(PixmapPtr pPix, int index) KdScreenInfo *screen = pScreenPriv->screen; EphyrScrPriv *scrpriv = screen->driver; EphyrFakexaPriv *fakexa = scrpriv->fakexa; - void *offscreen_begin, *offscreen_end; pPix->devPrivate.ptr = fakexa->saved_ptrs[index]; fakexa->saved_ptrs[index] = NULL; @@ -330,7 +329,7 @@ ephyrDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h, char *dst, } /** - * Does fake acceleration of DownloadFromScren using memcpy. + * Does fake acceleration of UploadToScreen using memcpy. */ static Bool ephyrUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h, char *src, @@ -352,7 +351,7 @@ ephyrUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h, char *src, dst_pitch = exaGetPixmapPitch(pDst); dst = fakexa->exa->memoryBase + exaGetPixmapOffset(pDst); dst += y * dst_pitch + x * cpp; - ErrorF("uts %d,%d, %dx%d, %dbpp %p/%x\n", x, y, w, h, pDst->drawable.bitsPerPixel, dst, dst_pitch); + for (; h > 0; h--) { memcpy(dst, src, w * cpp); dst += dst_pitch; |