[xorg-x11-drv-intel] 0001-uxa-Fix-clip-processing-for-uxa_fill_spans.patch: Backport clipping fixes from master.

[Adam Jackson]

commit 535a1973d36acab821659560da82e57287b517a0
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Dec 13 10:23:41 2011 -0500

    0001-uxa-Fix-clip-processing-for-uxa_fill_spans.patch: Backport clipping
    fixes from master.

 ...xa-Fix-clip-processing-for-uxa_fill_spans.patch |   53 ++++++++++++++++++++
 xorg-x11-drv-intel.spec                            |    8 +++-
 2 files changed, 60 insertions(+), 1 deletions(-)
---
diff --git a/0001-uxa-Fix-clip-processing-for-uxa_fill_spans.patch b/0001-uxa-Fix-clip-processing-for-uxa_fill_spans.patch
new file mode 100644
index 0000000..bb88759
--- /dev/null
+++ b/0001-uxa-Fix-clip-processing-for-uxa_fill_spans.patch
@@ -0,0 +1,53 @@
+From 429a36f7481b9bfd5ed137642d2916d69a713557 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris at chris-wilson.co.uk>
+Date: Fri, 9 Dec 2011 09:54:12 +0000
+Subject: [PATCH] uxa: Fix clip processing for uxa_fill_spans()
+
+Fixes regression from e0066e77e026b0dd0daa0c3765473c7d63aa6753
+(uxa: Simplify Composite solid acceleration for spans by only clipping
+once) [2.15.901]
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43649
+Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
+---
+ uxa/uxa-accel.c |   22 +++++++++-------------
+ 1 files changed, 9 insertions(+), 13 deletions(-)
+
+diff --git a/uxa/uxa-accel.c b/uxa/uxa-accel.c
+index 21957a3..e4afd13 100644
+--- a/uxa/uxa-accel.c
++++ b/uxa/uxa-accel.c
+@@ -92,21 +92,17 @@ uxa_fill_spans(DrawablePtr pDrawable, GCPtr pGC, int n,
+ 		nbox = REGION_NUM_RECTS(pClip);
+ 		pbox = REGION_RECTS(pClip);
+ 		while (nbox--) {
+-			if (pbox->y1 > y || pbox->y2 <= y)
+-				continue;
+-
+-			if (x1 < pbox->x1)
+-				x1 = pbox->x1;
++			int X1 = x1, X2 = x2;
++			if (X1 < pbox->x1)
++				X1 = pbox->x1;
+ 
+-			if (x2 > pbox->x2)
+-				x2 = pbox->x2;
+-
+-			if (x2 <= x1)
+-				continue;
++			if (X2 > pbox->x2)
++				X2 = pbox->x2;
+ 
+-			(*uxa_screen->info->solid) (dst_pixmap,
+-						    x1 + off_x, y + off_y,
+-						    x2 + off_x, y + 1 + off_y);
++			if (X2 > X1 && pbox->y1 <= y && pbox->y2 > y)
++				(*uxa_screen->info->solid) (dst_pixmap,
++							    X1 + off_x, y + off_y,
++							    X2 + off_x, y + 1 + off_y);
+ 			pbox++;
+ 		}
+ 	}
+-- 
+1.7.6.4
+
diff --git a/xorg-x11-drv-intel.spec b/xorg-x11-drv-intel.spec
index a7b587c..de73044 100644
--- a/xorg-x11-drv-intel.spec
+++ b/xorg-x11-drv-intel.spec
@@ -6,7 +6,7 @@
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.17.0
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -25,6 +25,7 @@ Patch2: copy-fb.patch
 # needs to be upstreamed
 Patch22: intel-2.11.0-vga-clock-max.patch
 Patch23: intel-2.17.0-legacy-dri1.patch
+Patch24: 0001-uxa-Fix-clip-processing-for-uxa_fill_spans.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -76,6 +77,7 @@ Debugging tools for Intel graphics chips
 %setup -q -n xf86-video-intel-%{?gitdate:%{gitdate}}%{!?gitdate:%{dirsuffix}} -b3
 %patch22 -p1 -b .vga-clock
 #patch23 -p1 -b .legacy
+%patch24 -p1 -b .clip
 
 %build
  
@@ -130,6 +132,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Tue Dec 13 2011 Adam Jackson <ajax at redhat.com> 2.17.0-4
+- 0001-uxa-Fix-clip-processing-for-uxa_fill_spans.patch: Backport clipping
+  fixes from master.
+
 * Tue Nov 29 2011 Adam Jackson <ajax at redhat.com> 2.17.0-3
 - Rebuild for new xcb-util