Hello community, here is the log from the commit of package glamor for openSUSE:Factory checked in at 2013-09-23 08:59:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glamor (Old) and /work/SRC/openSUSE:Factory/.glamor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glamor" Changes: -------- --- /work/SRC/openSUSE:Factory/glamor/glamor.changes 2013-09-04 13:44:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.glamor.new/glamor.changes 2013-09-23 08:59:21.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Sep 19 20:13:22 UTC 2013 - [email protected] + +- Added U_Fix-RegionContainsRect-test-for-PutImage.patch from + upstream, fdo#65964 + +------------------------------------------------------------------- New: ---- U_Fix-RegionContainsRect-test-for-PutImage.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glamor.spec ++++++ --- /var/tmp/diff_new_pack.bnySJU/_old 2013-09-23 08:59:22.000000000 +0200 +++ /var/tmp/diff_new_pack.bnySJU/_new 2013-09-23 08:59:22.000000000 +0200 @@ -24,6 +24,8 @@ Group: System/X11/Servers/XF86_4 Url: http://www.freedesktop.org/wiki/Software/Glamor Source: http://xorg.freedesktop.org/releases/individual/driver/%{name}-egl-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM U_Fix-RegionContainsRect-test-for-PutImage.patch -- fdo#65964 +Patch0: U_Fix-RegionContainsRect-test-for-PutImage.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -70,6 +72,7 @@ %prep %setup -q -n %{name}-egl-%{version} +%patch0 -p1 %build autoreconf -fi ++++++ U_Fix-RegionContainsRect-test-for-PutImage.patch ++++++ >From 29c0907d413ad5be2af3480d008018cd7f5a9e85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <[email protected]> Date: Tue, 17 Sep 2013 13:25:02 +0200 Subject: [PATCH 1/1] Fix RegionContainsRect test for PutImage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The return value of RegionContainsRect() is not a boolean but an enum indicating that the region contains the rectangle completely, partially or not at all. We can only take the PutImage fastpath when the region contatins the rectangle completely. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=65964 Signed-off-by: Michel Dänzer <[email protected]> Reviewed-by: Zhigang Gong <[email protected]> --- src/glamor_putimage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/glamor_putimage.c b/src/glamor_putimage.c index 34e86a1..6567f14 100644 --- a/src/glamor_putimage.c +++ b/src/glamor_putimage.c @@ -287,7 +287,7 @@ _glamor_put_image(DrawablePtr drawable, GCPtr gc, int depth, int x, int y, box.x2 = x + w + drawable->x; box.y2 = y + h + drawable->y; - if ((clip != NULL && !RegionContainsRect(clip, &box)) + if ((clip != NULL && RegionContainsRect(clip, &box) != rgnIN) || gc->alu != GXcopy) { temp_pixmap = glamor_create_pixmap(drawable->pScreen, w, h, depth, 0); if (temp_pixmap == NULL) -- 1.8.4 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
