From patchwork Tue Dec 1 13:32:30 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 63950 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nB1DXHUu002790 for ; Tue, 1 Dec 2009 13:33:17 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 909D79EFC3; Tue, 1 Dec 2009 05:33:17 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail.ffwll.ch (cable-static-49-187.intergga.ch [157.161.49.187]) by gabe.freedesktop.org (Postfix) with ESMTP id 221779EFC3 for ; Tue, 1 Dec 2009 05:33:14 -0800 (PST) Received: by mail.ffwll.ch (Postfix, from userid 1000) id 8C09920C221; Tue, 1 Dec 2009 14:33:13 +0100 (CET) X-Spam-ASN: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on orange.ffwll.ch X-Spam-Level: X-Spam-Hammy: 0.000-+--signed-off-by, 0.000-+--signedoffby, 0.000-+--100644 X-Spam-Status: No, score=-4.4 required=6.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Spammy: 0.987-1--crusade, 0.965-+--H*Ad:U*daniel.vetter, 0.963-+--H*m:ffwll Received: from biene (unknown [192.168.23.129]) by mail.ffwll.ch (Postfix) with ESMTP id A8CEE20C20A; Tue, 1 Dec 2009 14:32:56 +0100 (CET) Received: from daniel by biene with local (Exim 4.69) (envelope-from ) id 1NFSqf-0000nO-2F; Tue, 01 Dec 2009 14:32:57 +0100 From: Daniel Vetter To: intel-gfx@lists.freedesktop.org Date: Tue, 1 Dec 2009 14:32:30 +0100 Message-Id: <5daa18610a07c32f5b03d2a06f0837d1d8794d35.1259673868.git.daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.6.5.3 In-Reply-To: References: <6b93d5c17f0fb97e8018db344c234e19e36f3120.1259673868.git.daniel.vetter@ffwll.ch> In-Reply-To: References: Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 3/7] Xv: kill unnecessary parameters for hw PutImage functions X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org diff --git a/src/i830_video.c b/src/i830_video.c index e79933a..bab8687 100644 --- a/src/i830_video.c +++ b/src/i830_video.c @@ -269,7 +269,7 @@ static void drmmode_overlay_off(ScrnInfoPtr scrn) static Bool drmmode_overlay_put_image(ScrnInfoPtr scrn, xf86CrtcPtr crtc, int id, short width, short height, - int dstPitch, int x1, int y1, int x2, int y2, + int dstPitch, BoxPtr dstBox, short src_w, short src_h, short drw_w, short drw_h) { @@ -1180,7 +1180,7 @@ static int xvmc_passthrough(int id) static Bool i830_display_overlay(ScrnInfoPtr scrn, xf86CrtcPtr crtc, int id, short width, short height, - int dstPitch, int x1, int y1, int x2, int y2, + int dstPitch, BoxPtr dstBox, short src_w, short src_h, short drw_w, short drw_h) { @@ -1213,7 +1213,7 @@ i830_display_overlay(ScrnInfoPtr scrn, xf86CrtcPtr crtc, } return drmmode_overlay_put_image(scrn, crtc, id, width, height, - dstPitch, x1, y1, x2, y2, dstBox, + dstPitch, dstBox, src_w, src_h, drw_w, drw_h); } @@ -1575,13 +1575,13 @@ I830PutImageTextured(ScrnInfoPtr scrn, if (IS_I965G(intel)) { I965DisplayVideoTextured(scrn, adaptor_priv, id, clipBoxes, - width, height, dstPitch, x1, - y1, x2, y2, src_w, src_h, + width, height, dstPitch, + src_w, src_h, drw_w, drw_h, pixmap); } else { I915DisplayVideoTextured(scrn, adaptor_priv, id, clipBoxes, width, height, dstPitch, - dstPitch2, x1, y1, x2, y2, + dstPitch2, src_w, src_h, drw_w, drw_h, pixmap); } @@ -1658,7 +1658,7 @@ I830PutImageOverlay(ScrnInfoPtr scrn, return BadAlloc; if (!i830_display_overlay - (scrn, crtc, id, width, height, dstPitch, x1, y1, x2, y2, + (scrn, crtc, id, width, height, dstPitch, &dstBox, src_w, src_h, drw_w, drw_h)) return BadAlloc; diff --git a/src/i830_video.h b/src/i830_video.h index 8bb536c..fcdae73 100644 --- a/src/i830_video.h +++ b/src/i830_video.h @@ -70,7 +70,6 @@ void I915DisplayVideoTextured(ScrnInfoPtr scrn, intel_adaptor_private *adaptor_priv, int id, RegionPtr dstRegion, short width, short height, int video_pitch, int video_pitch2, - int x1, int y1, int x2, int y2, short src_w, short src_h, short drw_w, short drw_h, PixmapPtr pixmap); @@ -78,7 +77,6 @@ void I965DisplayVideoTextured(ScrnInfoPtr scrn, intel_adaptor_private *adaptor_priv, int id, RegionPtr dstRegion, short width, short height, int video_pitch, - int x1, int y1, int x2, int y2, short src_w, short src_h, short drw_w, short drw_h, PixmapPtr pixmap); diff --git a/src/i915_video.c b/src/i915_video.c index 4e4ec03..927047b 100644 --- a/src/i915_video.c +++ b/src/i915_video.c @@ -44,7 +44,7 @@ I915DisplayVideoTextured(ScrnInfoPtr scrn, intel_adaptor_private *adaptor_priv, int id, RegionPtr dstRegion, short width, short height, int video_pitch, - int video_pitch2, int x1, int y1, int x2, int y2, + int video_pitch2, short src_w, short src_h, short drw_w, short drw_h, PixmapPtr pixmap) { diff --git a/src/i965_video.c b/src/i965_video.c index 6225aa4..a0dab98 100644 --- a/src/i965_video.c +++ b/src/i965_video.c @@ -981,7 +981,6 @@ I965DisplayVideoTextured(ScrnInfoPtr scrn, intel_adaptor_private *adaptor_priv, int id, RegionPtr dstRegion, short width, short height, int video_pitch, - int x1, int y1, int x2, int y2, short src_w, short src_h, short drw_w, short drw_h, PixmapPtr pixmap) {