xserver-xorg-video-intel: Changes to 'debian-experimental'

[Cyril Brulebois <kibi@alioth.debian.org>]

 debian/changelog |    8 ++++++++
 uxa/uxa-render.c |    1 +
 2 files changed, 9 insertions(+)

New commits:
commit dce14a7ed47defc3426286c17b7c89e719087ba1
Author: Cyril Brulebois <kibi@debian.org>
Date:   Fri Feb 4 15:37:57 2011 +0100

    Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 8d0d7b9..f6d3c95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-video-intel (2:2.14.0-2) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.14.0-2) experimental; urgency=low
 
   * Cherry-pick from upstream to fix many rendering issues
     (https://bugs.freedesktop.org/show_bug.cgi?id=33650):
     - uxa: Undo damage translation before appending
 
- -- Cyril Brulebois <kibi@debian.org>  Fri, 04 Feb 2011 15:32:09 +0100
+ -- Cyril Brulebois <kibi@debian.org>  Fri, 04 Feb 2011 15:37:47 +0100
 
 xserver-xorg-video-intel (2:2.14.0-1) experimental; urgency=low
 

commit 3d09c300b1c69b17a12ebee975a8cb8e9aa4e95d
Author: Cyril Brulebois <kibi@debian.org>
Date:   Fri Feb 4 15:37:37 2011 +0100

    Document the cherry-pick.

diff --git a/debian/changelog b/debian/changelog
index c48ab8f..8d0d7b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.14.0-2) UNRELEASED; urgency=low
+
+  * Cherry-pick from upstream to fix many rendering issues
+    (https://bugs.freedesktop.org/show_bug.cgi?id=33650):
+    - uxa: Undo damage translation before appending
+
+ -- Cyril Brulebois <kibi@debian.org>  Fri, 04 Feb 2011 15:32:09 +0100
+
 xserver-xorg-video-intel (2:2.14.0-1) experimental; urgency=low
 
   * New upstream release.

commit 9cb0d56b38384f21d72fb2e5b3791af7fd92b3e7
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Thu Feb 3 09:41:48 2011 +0000

    uxa: Undo damage translation before appending
    
    The region is used to paint onto the backing pixmap (and thus
    translated) prior to being passed to the damage layer (wrt to the
    drawable). So the local translation needs to be undone first.
    
    Identified by Christopher James Halse Rogers.
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=33650
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    (cherry picked from commit da990536eca09c6de74627541cd56ecfad925eda)

diff --git a/uxa/uxa-render.c b/uxa/uxa-render.c
index cf8b8ea..02bfa03 100644
--- a/uxa/uxa-render.c
+++ b/uxa/uxa-render.c
@@ -1090,6 +1090,7 @@ try_solid:
 	/* XXX xserver-1.8: CompositeRects is not tracked by Damage, so we must
 	 * manually append the damaged regions ourselves.
 	 */
+	pixman_region_translate(&region, -dst_x, -dst_y);
 	DamageRegionAppend(dst->pDrawable, &region);
 
 	pixman_region_fini(&region);