sna: Fix debug compilation, again.

7 files changed, 10 insertions, 10 deletions

diff --git a/src/sna/gen2_render.c b/src/sna/gen2_render.c
index 3ec2e084..440a343a 100644
--- a/src/sna/gen2_render.c
+++ b/src/sna/gen2_render.c
@@ -2063,7 +2063,7 @@ gen2_render_fill_op_boxes(struct sna *sna,
 			  int nbox)
 {
 	DBG(("%s: (%d, %d),(%d, %d)... x %d\n", __FUNCTION__,
-	     box->x1, box->y1, box->x2, box->y2, n));
+	     box->x1, box->y1, box->x2, box->y2, nbox));
 
 	do {
 		int nbox_this_time = gen2_get_rectangles(sna, &op->base, nbox);
diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c
index b9ce45f0..2b70b857 100644
--- a/src/sna/gen3_render.c
+++ b/src/sna/gen3_render.c
@@ -3818,7 +3818,7 @@ gen3_render_fill_op_boxes(struct sna *sna,
 			  int nbox)
 {
 	DBG(("%s: (%d, %d),(%d, %d)... x %d\n", __FUNCTION__,
-	     box->x1, box->y1, box->x2, box->y2, n));
+	     box->x1, box->y1, box->x2, box->y2, nbox));
 
 	do {
 		int nbox_this_time = gen3_get_rectangles(sna, &op->base, nbox);
diff --git a/src/sna/gen5_render.c b/src/sna/gen5_render.c
index e72283e0..a177d325 100644
--- a/src/sna/gen5_render.c
+++ b/src/sna/gen5_render.c
@@ -2540,7 +2540,7 @@ gen5_render_fill_op_boxes(struct sna *sna,
 			  int nbox)
 {
 	DBG(("%s: (%d, %d),(%d, %d)... x %d\n", __FUNCTION__,
-	     box->x1, box->y1, box->x2, box->y2, n));
+	     box->x1, box->y1, box->x2, box->y2, nbox));
 
 	do {
 		int nbox_this_time = gen5_get_rectangles(sna, &op->base, nbox);
diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
index 05e6d633..0dde6253 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -2753,7 +2753,7 @@ gen6_render_op_fill_boxes(struct sna *sna,
 			  int nbox)
 {
 	DBG(("%s: (%d, %d),(%d, %d)... x %d\n", __FUNCTION__,
-	     box->x1, box->y1, box->x2, box->y2, n));
+	     box->x1, box->y1, box->x2, box->y2, nbox));
 
 	do {
 		int nbox_this_time = gen6_get_rectangles(sna, &op->base, nbox);
diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index 05b65f39..b9f23ee8 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -2903,7 +2903,7 @@ gen7_render_fill_op_boxes(struct sna *sna,
 			  int nbox)
 {
 	DBG(("%s: (%d, %d),(%d, %d)... x %d\n", __FUNCTION__,
-	     box->x1, box->y1, box->x2, box->y2, n));
+	     box->x1, box->y1, box->x2, box->y2, nbox));
 
 	do {
 		int nbox_this_time = gen7_get_rectangles(sna, &op->base, nbox);
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 6f98f273..e8df7d9a 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -998,10 +998,10 @@ void _kgem_submit(struct kgem *kgem)
 					       i,
 					       kgem->exec[i].handle,
 					       (int)kgem->exec[i].offset,
-					       found ? found->size : 0,
-					       found ? found->tiling : 0,
+					       found ? found->size : -1,
+					       found ? found->tiling : -1,
 					       (int)(kgem->exec[i].flags & EXEC_OBJECT_NEEDS_FENCE),
-					       found ? found->deleted : 1);
+					       found ? found->deleted : -1);
 				}
 				for (i = 0; i < kgem->nreloc; i++) {
 					ErrorF("reloc[%d] = pos:%d, target:%d, delta:%d, read:%x, write:%x, offset:%x\n",
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 153ec21f..c8936fa4 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -2537,7 +2537,7 @@ sna_poly_zero_line_blt(DrawablePtr drawable,
 	void *jump, *ret;
 
 	DBG(("%s: alu=%d, pixel=%lx, n=%d, clipped=%d, damage=%p\n",
-	     __FUNCTION__, gc->alu, gc->fgPixel, n, clipped, damage));
+	     __FUNCTION__, gc->alu, gc->fgPixel, _n, clipped, damage));
 	if (!sna_fill_init_blt(&fill, sna, pixmap, bo, gc->alu, gc->fgPixel))
 		return FALSE;
 
@@ -3348,7 +3348,7 @@ sna_poly_zero_segment_blt(DrawablePtr drawable,
 	void *jump, *ret;
 
 	DBG(("%s: alu=%d, pixel=%lx, n=%d, clipped=%d, damage=%p\n",
-	     __FUNCTION__, gc->alu, gc->fgPixel, n, clipped, damage));
+	     __FUNCTION__, gc->alu, gc->fgPixel, _n, clipped, damage));
 	if (!sna_fill_init_blt(&fill, sna, pixmap, bo, gc->alu, gc->fgPixel))
 		return FALSE;