diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2009-08-11 16:06:42 +0200 |
|---|---|---|
| committer | Owain G. Ainsworth <oga@openbsd.org> | 2010-02-28 18:35:46 +0000 |
| commit | 0f42ecd511f55bf014ea1794684838c2d14a6d31 (patch) | |
| tree | 62ae8afc655c682c0228a914e2bf3211ec78955c | |
| parent | eaceb86f1d7bbe1f0757bfe9da31a7a53410ba96 (diff) | |
Xv: small cleanups in I830PutImage
- scrap unused variable overlay
- scrap an superflous if and attach the code to the preceeding else
- tiny layout fix.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Eric Anholt <eric@anholt.net>
(cherry picked from commit 99afdf985fa9f763fda4bc49ccd8111960a4ae0f)
Signed-off-by: Owain G. Ainsworth <oga@openbsd.org>
| -rw-r--r-- | src/i830_video.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/i830_video.c b/src/i830_video.c index 8dfa2dd9..c8da46df 100644 --- a/src/i830_video.c +++ b/src/i830_video.c @@ -2414,7 +2414,6 @@ I830PutImage(ScrnInfoPtr pScrn, I830Ptr pI830 = I830PTR(pScrn); I830PortPrivPtr pPriv = (I830PortPrivPtr) data; ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex]; - I830OverlayRegPtr overlay; PixmapPtr pPixmap = get_drawable_pixmap(pDraw);; INT32 x1, x2, y1, y2; int dstPitch; @@ -2422,11 +2421,6 @@ I830PutImage(ScrnInfoPtr pScrn, BoxRec dstBox; xf86CrtcPtr crtc; - if (pPriv->textured) - overlay = NULL; - else - overlay = I830OVERLAYREG(pI830); - #if 0 ErrorF("I830PutImage: src: (%d,%d)(%d,%d), dst: (%d,%d)(%d,%d)\n" "width %d, height %d\n", src_x, src_y, src_w, src_h, drw_x, drw_y, @@ -2462,7 +2456,7 @@ I830PutImage(ScrnInfoPtr pScrn, width, height)) return Success; - if (!pPriv->textured) { + if (!pPriv->textured) { /* texture video handles rotation differently. */ if (crtc) pPriv->rotation = crtc->rotation; @@ -2471,14 +2465,13 @@ I830PutImage(ScrnInfoPtr pScrn, "Fail to clip video to any crtc!\n"); return Success; } - } + } if (!i830_copy_video_data(pScrn, pPriv, width, height, &dstPitch, &dstPitch2, x1, y1, x2, y2, id, buf)) return BadAlloc; - if (!pPriv->textured) { i830_display_overlay(pScrn, crtc, id, width, height, dstPitch, x1, y1, x2, y2, &dstBox, src_w, src_h, @@ -2510,8 +2503,7 @@ I830PutImage(ScrnInfoPtr pScrn, dstPitch, dstPitch2, x1, y1, x2, y2, src_w, src_h, drw_w, drw_h, pPixmap); } - } - if (pPriv->textured) { + DamageDamageRegion(pDraw, clipBoxes); } |