xf86-video-intel: src/sna/sna_trapezoids.c

[Chris Wilson]

 src/sna/sna_trapezoids.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 706d3a97bd3049e60c08d121a3d4d81c03029a87
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Dec 8 18:05:14 2011 +0000

    sna/trapezoids: Fix detection of rectilinearity after projection
    
    A typo confused left and right, rejecting true vertical edges, and worse
    might have incurred false positives.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_trapezoids.c b/src/sna/sna_trapezoids.c
index a85f58e..4ea1c06 100644
--- a/src/sna/sna_trapezoids.c
+++ b/src/sna/sna_trapezoids.c
@@ -3040,15 +3040,15 @@ sna_composite_trapezoids(CARD8 op,
 		for (n = 0; n < ntrap && rectilinear; n++) {
 			int lx1 = pixman_fixed_to_int(traps[n].left.p1.x + pixman_fixed_1_minus_e/2);
 			int lx2 = pixman_fixed_to_int(traps[n].left.p2.x + pixman_fixed_1_minus_e/2);
-			int rx1 = pixman_fixed_to_int(traps[n].left.p1.x + pixman_fixed_1_minus_e/2);
-			int rx2 = pixman_fixed_to_int(traps[n].left.p2.x + pixman_fixed_1_minus_e/2);
+			int rx1 = pixman_fixed_to_int(traps[n].right.p1.x + pixman_fixed_1_minus_e/2);
+			int rx2 = pixman_fixed_to_int(traps[n].right.p2.x + pixman_fixed_1_minus_e/2);
 			rectilinear &= lx1 == lx2 && rx1 == rx2;
 		}
 	} else if (dst->polyMode != PolyModePrecise) {
 		for (n = 0; n < ntrap && rectilinear; n++) {
 			int lx1 = pixman_fixed_to_grid(traps[n].left.p1.x);
-			int lx2 = pixman_fixed_to_grid(traps[n].right.p2.x);
-			int rx1 = pixman_fixed_to_grid(traps[n].left.p1.x);
+			int lx2 = pixman_fixed_to_grid(traps[n].left.p2.x);
+			int rx1 = pixman_fixed_to_grid(traps[n].right.p1.x);
 			int rx2 = pixman_fixed_to_grid(traps[n].right.p2.x);
 			int top = pixman_fixed_to_grid(traps[n].top);
 			int bot = pixman_fixed_to_grid(traps[n].bottom);