Attachment 69975 Details for Bug 56940 – patch to fix compositerects segfault bug

[patch] patch to fix compositerects segfault bug

0001-glamor_compositerects-Need-to-initialize-region-befo.patch (text/plain), 1.64 KB, created by Zhigang Gong on 2012-11-13 02:15:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zhigang Gong

Created: 2012-11-13 02:15:41 UTC

Size: 1.64 KB

patch

obsolete

>From f1457c1c59efdadbad25f01dce9433643d688844 Mon Sep 17 00:00:00 2001
>From: Zhigang Gong <zhigang.gong@linux.intel.com>
>Date: Tue, 13 Nov 2012 10:08:02 +0800
>Subject: [PATCH] glamor_compositerects: Need to initialize region before
> fallback.
>
>As we need to call DamageRegionAppend even for fallback path,
>we must initialize the region before do that. Pointed by
>Igor Vagulin.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=56940
>
>Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
>---
> src/glamor_compositerects.c | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
>diff --git a/src/glamor_compositerects.c b/src/glamor_compositerects.c
>index 5fe1bbf..f1564a2 100644
>--- a/src/glamor_compositerects.c
>+++ b/src/glamor_compositerects.c
>@@ -131,16 +131,6 @@ glamor_composite_rectangles(CARD8	 op,
> 		return;
> 	}
> 
>-	pixmap = glamor_get_drawable_pixmap(dst->pDrawable);
>-	priv = glamor_get_pixmap_private(pixmap);
>-
>-	if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(priv))
>-		goto fallback;
>-	if (dst->alphaMap) {
>-		DEBUGF("%s: fallback, dst has an alpha-map\n", __FUNCTION__);
>-		goto fallback;
>-	}
>-
> 	if ((color->red|color->green|color->blue|color->alpha) <= 0x00ff) {
> 		switch (op) {
> 		case PictOpOver:
>@@ -204,6 +194,16 @@ glamor_composite_rectangles(CARD8	 op,
> 		return;
> 	}
> 
>+	pixmap = glamor_get_drawable_pixmap(dst->pDrawable);
>+	priv = glamor_get_pixmap_private(pixmap);
>+
>+	if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(priv))
>+		goto fallback;
>+	if (dst->alphaMap) {
>+		DEBUGF("%s: fallback, dst has an alpha-map\n", __FUNCTION__);
>+		goto fallback;
>+	}
>+
> 	need_free_region = TRUE;
> 
> 	DEBUGF("%s: drawable extents (%d, %d),(%d, %d) x %d\n",
>-- 
>1.7.11.2
>

Actions: View | Splinter Review

Attachments on bug 56940: 69842 | 69843 | 69844 | 69845 | 69846 | 69975

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.