diff options
| author | Wang Zhenyu <zhenyu.z.wang@intel.com> | 2006-09-19 10:08:31 +0800 |
|---|---|---|
| committer | Wang Zhenyu <zhenyu.z.wang@intel.com> | 2006-09-19 10:08:31 +0800 |
| commit | 37429c3ecb97df8faf0f3f56128d7a2b22eb8a5e (patch) | |
| tree | 493ca4220390c2dbe22b042bbc4c21bcbc6ea57f /src/i830_exa.c | |
| parent | bd758030a6a59af32f9d73655cb691e018e94a7d (diff) | |
misc cleanup
Diffstat (limited to 'src/i830_exa.c')
| -rw-r--r-- | src/i830_exa.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/i830_exa.c b/src/i830_exa.c index c6337472..a1c75463 100644 --- a/src/i830_exa.c +++ b/src/i830_exa.c @@ -197,8 +197,8 @@ I830EXASolid(PixmapPtr pPixmap, int x1, int y1, int x2, int y2) OUT_RING(XY_COLOR_BLT_CMD); OUT_RING(pI830->BR[13]); - OUT_RING((y1 << 16) | x1); - OUT_RING((y2 << 16) | x2); + OUT_RING((y1 << 16) | (x1 & 0xffff)); + OUT_RING((y2 << 16) | (x2 & 0xffff)); OUT_RING(offset); OUT_RING(pI830->BR[16]); ADVANCE_LP_RING(); @@ -255,12 +255,11 @@ I830EXACopy(PixmapPtr pDstPixmap, int src_x1, int src_y1, int dst_x1, ScrnInfoPtr pScrn = xf86Screens[pDstPixmap->drawable.pScreen->myNum]; I830Ptr pI830 = I830PTR(pScrn); int dst_x2, dst_y2; - unsigned int src_off, dst_off; + unsigned int dst_off; dst_x2 = dst_x1 + w; dst_y2 = dst_y1 + h; - src_off = pI830->copy_src_off; dst_off = exaGetPixmapOffset(pDstPixmap); { @@ -278,7 +277,7 @@ I830EXACopy(PixmapPtr pDstPixmap, int src_x1, int src_y1, int dst_x1, OUT_RING(dst_off); OUT_RING((src_y1 << 16) | (src_x1 & 0xffff)); OUT_RING(pI830->copy_src_pitch); - OUT_RING(src_off); + OUT_RING(pI830->copy_src_off); ADVANCE_LP_RING(); } @@ -298,7 +297,6 @@ static void IntelEXAComposite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY, int dstX, int dstY, int w, int h) { - /* should be same like I830Composite */ ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum]; I830Ptr pI830 = I830PTR(pScrn); int srcXend, srcYend, maskXend, maskYend; |