xf86-video-intel: 2 commits - src/sna/sna_render.c src/sna/sna_trapezoids_imprecise.c

[Chris Wilson]

 src/sna/sna_render.c               |   14 ++++++++------
 src/sna/sna_trapezoids_imprecise.c |    3 ++-
 2 files changed, 10 insertions(+), 7 deletions(-)

New commits:
commit dff59000d43c5449b3ed79ff144236c17b507bd6
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Oct 7 07:18:47 2014 +0100

    sna/trapezoids: Remove stale assert
    
    The variable changed meaning, but the assert did not. Fix that up.
    
    Reported-by: Matti Hämäläinen <ccr at tnsp.org>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_trapezoids_imprecise.c b/src/sna/sna_trapezoids_imprecise.c
index 865a723..414e80a 100644
--- a/src/sna/sna_trapezoids_imprecise.c
+++ b/src/sna/sna_trapezoids_imprecise.c
@@ -473,7 +473,8 @@ polygon_add_edge(struct polygon *polygon,
 	struct edge *e = &polygon->edges[polygon->num_edges];
 	int ytop, ybot;
 
-	assert (dy > 0);
+	assert(t->bottom > t->top);
+	assert(edge->p2.y > edge->p1.y);
 
 	e->dir = dir;
 
commit 11c7f2d2f485e75feadb15d388960c581a96154d
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Oct 7 07:18:22 2014 +0100

    sna: Add pixmap id to DBG hints inside rende migration
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_render.c b/src/sna/sna_render.c
index af072f0..8cc63a0 100644
--- a/src/sna/sna_render.c
+++ b/src/sna/sna_render.c
@@ -430,8 +430,8 @@ move_to_gpu(PixmapPtr pixmap, const BoxRec *box, bool blt)
 
 	priv = sna_pixmap(pixmap);
 	if (priv == NULL) {
-		DBG(("%s: not migrating unattached pixmap\n",
-		     __FUNCTION__));
+		DBG(("%s: not migrating unattached pixmap=%ld\n",
+		     __FUNCTION__, pixmap->drawable.serialNumber));
 		return NULL;
 	}
 
@@ -448,14 +448,16 @@ move_to_gpu(PixmapPtr pixmap, const BoxRec *box, bool blt)
 	}
 
 	if (priv->cpu_damage == NULL) {
-		DBG(("%s: not migrating uninitialised pixmap\n",
-		     __FUNCTION__));
+		DBG(("%s: not migrating uninitialised pixmap=%ld\n",
+		     __FUNCTION__, pixmap->drawable.serialNumber));
 		return NULL;
 	}
 
 	if (pixmap->usage_hint) {
-		DBG(("%s: not migrating pixmap due to usage_hint=%d\n",
-		     __FUNCTION__, pixmap->usage_hint));
+		DBG(("%s: not migrating pixmap=%ld due to usage_hint=%d\n",
+		     __FUNCTION__,
+		     pixmap->drawable.serialNumber,
+		     pixmap->usage_hint));
 		return NULL;
 	}