xf86-video-intel: 2 commits - src/sna/sna_accel.c src/sna/sna_tiling.c

[Chris Wilson]

 src/sna/sna_accel.c  |    2 +-
 src/sna/sna_tiling.c |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 5a675b61f27273f7ef344d4056dbba1f8cd97737
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Jun 17 15:42:17 2012 +0100

    sna: Correct typo forcing everything to be clear to 0!
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 1e86643..97df25a 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -3002,7 +3002,7 @@ sna_put_zpixmap_blt(DrawablePtr drawable, GCPtr gc, RegionPtr region,
 			kgem_bo_sync__cpu(&sna->kgem, priv->cpu_bo);
 		}
 
-		if (priv->clear_color = 0) {
+		if (priv->clear_color == 0) {
 			memset(pixmap->devPrivate.ptr,
 			       0, pixmap->devKind * pixmap->drawable.height);
 		} else {
commit b55bf1abbe71281e3d9ebde1c4005d40902d5e7f
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Jun 17 14:14:44 2012 +0100

    sna: Fix cut'n'paste errors in tiling debug
    
    Rename for different variables
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_tiling.c b/src/sna/sna_tiling.c
index 16b90ca..27a9dc8 100644
--- a/src/sna/sna_tiling.c
+++ b/src/sna/sna_tiling.c
@@ -431,8 +431,8 @@ sna_tiling_composite_spans_done(struct sna *sna,
 
 					DBG(("%s: rect[%d] = (%d, %d)x(%d,%d), tile=(%d,%d)x(%d, %d), blt=(%d,%d),(%d,%d)\n",
 					     __FUNCTION__, n,
-					     r->dst.x, r->dst.y,
-					     r->width, r->height,
+					     r->box.x1, r->box.y1,
+					     r->box.x2-r->box.x1, r->box.y2-r->box.y1,
 					     x, y, width, height,
 					     b.x1, b.y1, b.x2, b.y2));
 
@@ -488,8 +488,8 @@ sna_tiling_composite_spans_done(struct sna *sna,
 
 					DBG(("%s: rect[%d] = (%d, %d)x(%d,%d), tile=(%d,%d)x(%d, %d), blt=(%d,%d),(%d,%d)\n",
 					     __FUNCTION__, n,
-					     r->dst.x, r->dst.y,
-					     r->width, r->height,
+					     r->box.x1, r->box.y1,
+					     r->box.x2-r->box.x1, r->box.y2-r->box.y1,
 					     x, y, width, height,
 					     b.x1, b.y1, b.x2, b.y2));