Attachment 38657 Details for Bug 30120 – Source clipping v2

[patch] Source clipping v2

0001-uxa-Apply-source-clipping-to-blits.patch (text/plain), 2.07 KB, created by Chris Wilson on 2010-09-12 16:55:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2010-09-12 16:55:35 UTC

Size: 2.07 KB

patch

obsolete

>From b86de8ca4bfa78f02e8607e82c96fc538e9a7b53 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Sun, 12 Sep 2010 12:34:51 +0100
>Subject: [PATCH] uxa: Apply source clipping to blits
>
>Yes, this should be done in the higher layers. Yes, I have written code
>to that. No, it is not ready, hence add the sanity check to the
>SRC_COPY_BLT.
>
>This isn't the first report that I've seen, but will be the last.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=30120
>Reported-by: rezbit.hex@gmail.com
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> src/intel_uxa.c |   29 ++++++++++++++++++++++++++++-
> 1 files changed, 28 insertions(+), 1 deletions(-)
>
>diff --git a/src/intel_uxa.c b/src/intel_uxa.c
>index 706d634..c5ddc20 100644
>--- a/src/intel_uxa.c
>+++ b/src/intel_uxa.c
>@@ -411,12 +411,39 @@ i830_uxa_copy(PixmapPtr dest, int src_x1, int src_y1, int dst_x1,
> 	ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
> 	intel_screen_private *intel = intel_get_screen_private(scrn);
> 	uint32_t cmd;
>-	int dst_x2, dst_y2;
>+	int dst_x2, dst_y2, src_x2, src_y2;
> 	unsigned int dst_pitch, src_pitch;
> 
> 	dst_x2 = dst_x1 + w;
> 	dst_y2 = dst_y1 + h;
> 
>+	/* XXX Fixup extents as a lamentable workaround for missing
>+	 * source clipping in the upper layers.
>+	 */
>+	if (dst_x1 < 0)
>+		src_x1 -= dst_x1, dst_x1 = 0;
>+	if (dst_y1 < 0)
>+		src_y1 -= dst_y1, dst_y1 = 0;
>+	if (dst_x2 > dest->drawable.width)
>+		dst_x2 = dest->drawable.width;
>+	if (dst_y2 > dest->drawable.height)
>+		dst_y2 = dest->drawable.height;
>+
>+	src_x2 = src_x1 + (dst_x2 - dst_x1);
>+	src_y2 = src_y1 + (dst_y2 - dst_y1);
>+
>+	if (src_x1 < 0)
>+		dst_x1 -= src_x1, src_x1 = 0;
>+	if (src_y1 < 0)
>+		dst_y1 -= src_y1, src_y1 = 0;
>+	if (src_x2 > intel->render_source->drawable.width)
>+		dst_x2 -= src_x2 - intel->render_source->drawable.width;
>+	if (src_y2 > intel->render_source->drawable.height)
>+		dst_y2 -= src_y2 - intel->render_source->drawable.height;
>+
>+	if (dst_x2 <= dst_x1 || dst_y2 <= dst_y1)
>+		return;
>+
> 	dst_pitch = intel_pixmap_pitch(dest);
> 	src_pitch = intel_pixmap_pitch(intel->render_source);
> 
>-- 
>1.7.1
>

Actions: View | Splinter Review

Attachments on bug 30120: 38606 | 38607 | 38608 | 38609 | 38610 | 38611 | 38617 | 38621 | 38622 | 38623 | 38624 | 38625 | 38626 | 38628 | 38632 | 38643 | 38656 | 38657

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.