[12/18] Xv: small cleanups in I830PutImage
diff mbox

Message ID 3a4e39fa527e6f1bec9306a0c9d7b69b222532a6.1249999028.git.daniel.vetter@ffwll.ch
State Not Applicable
Headers show

Commit Message

Daniel Vetter Aug. 11, 2009, 2:06 p.m. UTC
- 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>
---
 src/i830_video.c |   14 +++-----------
 1 files changed, 3 insertions(+), 11 deletions(-)

Patch
diff mbox

diff --git a/src/i830_video.c b/src/i830_video.c
index 6b65e5e..5a961f9 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);
     }