Attachment 879570 Details for Bug 1081625 – Patch to pull in buffer age fix

[patch] Patch to pull in buffer age fix

0001-Add-buffer-age-fix-patch-and-add-to-clutter.spec.patch (text/plain), 3.12 KB, created by Ivan Kelly on 2014-03-27 18:16:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Kelly

Created: 2014-03-27 18:16:40 UTC

Size: 3.12 KB

patch

obsolete

>From 07c5de3c99b42c244877e21dcdb1b349cf116a87 Mon Sep 17 00:00:00 2001
>From: Ivan Kelly <ivank@yahoo-inc.com>
>Date: Thu, 27 Mar 2014 11:12:14 -0700
>Subject: [PATCH] Add buffer age fix patch and add to clutter.spec
>
>---
> 0001-stage-cogl-fix-buffer-age-code-path.patch | 34 ++++++++++++++++++++++++++
> clutter.spec                                   |  2 ++
> 2 files changed, 36 insertions(+)
> create mode 100644 0001-stage-cogl-fix-buffer-age-code-path.patch
>
>diff --git a/0001-stage-cogl-fix-buffer-age-code-path.patch b/0001-stage-cogl-fix-buffer-age-code-path.patch
>new file mode 100644
>index 0000000..c42101e
>--- /dev/null
>+++ b/0001-stage-cogl-fix-buffer-age-code-path.patch
>@@ -0,0 +1,34 @@
>+From 6665f47d66a871b6e1a5f4200282f42da043a0e8 Mon Sep 17 00:00:00 2001
>+From: Adel Gadllah <adel.gadllah@gmail.com>
>+Date: Sun, 16 Feb 2014 21:07:43 +0000
>+Subject: stage-cogl: Fix buffer_age code path
>+
>+Currently we where checking whether the damage_history list contains
>+more or equal then buffer_age entries. This is wrong because we prepend
>+our current clip to the list just before the check.
>+
>+Fix that to check whether we have more entries instead of more or equal.
>+
>+https://bugzilla.gnome.org/show_bug.cgi?id=724788
>+---
>+diff --git a/clutter/cogl/clutter-stage-cogl.c b/clutter/cogl/clutter-stage-cogl.c
>+index 86546b1..cff8444 100644
>+--- a/clutter/cogl/clutter-stage-cogl.c
>++++ b/clutter/cogl/clutter-stage-cogl.c
>+@@ -483,11 +483,12 @@ clutter_stage_cogl_redraw (ClutterStageWindow *stage_window)
>+ 
>+         stage_cogl->damage_history = g_slist_prepend (stage_cogl->damage_history, current_damage);
>+ 
>+-        if (age != 0 && !stage_cogl->dirty_backbuffer && g_slist_length (stage_cogl->damage_history) >= age)
>++        if (age != 0 && !stage_cogl->dirty_backbuffer && g_slist_length (stage_cogl->damage_history) > age)
>+           {
>+             int i = 0;
>+             GSList *tmp = NULL;
>+-            for (tmp = stage_cogl->damage_history; tmp; tmp = tmp->next)
>++            /* We skip the first entry because it is the clip_region itself */
>++            for (tmp = stage_cogl->damage_history->next; tmp; tmp = tmp->next)
>+               {
>+                 _clutter_util_rectangle_union (clip_region, tmp->data, clip_region);
>+                 i++;
>+--
>+cgit v0.9.2
>diff --git a/clutter.spec b/clutter.spec
>index 4a2b34f..30f5c9e 100644
>--- a/clutter.spec
>+++ b/clutter.spec
>@@ -18,6 +18,7 @@ Patch2:        0001-clutter-offscreen-effect-Allocate-the-cogl-texture-d.patch
> Patch3: 	0001-Bind-constraints-Don-t-force-redraws-on-source-relay.patch
> Patch4:		0002-Don-t-queue-redraws-when-reallocating-actor-that-hav.patch
> Patch5:		0001-ClutterStageCogl-Ignore-a-clip-the-size-of-the-stage.patch
>+Patch6:         0001-stage-cogl-fix-buffer-age-code-path.patch
> 
> BuildRequires: glib2-devel mesa-libGL-devel pkgconfig pango-devel
> BuildRequires: cairo-gobject-devel gdk-pixbuf2-devel atk-devel
>@@ -81,6 +82,7 @@ This package contains documentation for clutter.
> %patch3 -p1 -b .redraw1
> %patch4 -p1 -b .redraw2
> %patch5 -p1 -b .redraw3
>+%patch6 -p1 -b .redraw4
> 
> %build
> (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;
>-- 
>false
>

Actions: View | Diff

Attachments on bug 1081625: 879570