summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2011-09-19 12:48:38 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2011-09-19 12:49:27 +0100
commit0390105bc239bf2ac22189f39fccc9d98bae4992 (patch)
tree68f9cb7ade94cb8f07591c3e4c04d523aa53d376
parent7f0cba3a255eb9e76d56201b26d15f2d49134b58 (diff)
sna: compile fixes for debugging
Update the DBG messages to reflect changes in function parameters. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/kgem.c2
-rw-r--r--src/sna/sna_render.c4
-rw-r--r--src/sna/sna_tiling.c3
3 files changed, 5 insertions, 4 deletions
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index e1549729..7df019a4 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -1974,7 +1974,7 @@ struct kgem_bo *kgem_upload_source_image(struct kgem *kgem,
void *dst;
DBG(("%s : (%d, %d), (%d, %d), stride=%d, bpp=%d\n",
- __FUNCTION__, x, y, width, height, stride, bpp));
+ __FUNCTION__, box->x1, box->y1, box->x2, box->y2, stride, bpp));
bo = kgem_create_buffer(kgem, size, KGEM_BUFFER_WRITE, &dst);
if (bo == NULL)
diff --git a/src/sna/sna_render.c b/src/sna/sna_render.c
index 60e98441..292853a0 100644
--- a/src/sna/sna_render.c
+++ b/src/sna/sna_render.c
@@ -310,8 +310,8 @@ static struct kgem_bo *upload(struct sna *sna,
{
struct kgem_bo *bo;
- DBG(("%s: origin=(%d, %d), box=(%d, %d), (%d, %d), pixmap=%dx%d\n",
- __FUNCTION__, x, y, box->x1, box->y1, box->x2, box->y2, pixmap->drawable.width, pixmap->drawable.height));
+ DBG(("%s: box=(%d, %d), (%d, %d), pixmap=%dx%d\n",
+ __FUNCTION__, box->x1, box->y1, box->x2, box->y2, pixmap->drawable.width, pixmap->drawable.height));
assert(box->x1 >= 0);
assert(box->y1 >= 0);
assert(box->x2 <= pixmap->drawable.width);
diff --git a/src/sna/sna_tiling.c b/src/sna/sna_tiling.c
index 27b0fbfa..80989d8d 100644
--- a/src/sna/sna_tiling.c
+++ b/src/sna/sna_tiling.c
@@ -228,7 +228,8 @@ sna_tiling_composite(uint32_t op,
struct sna_pixmap *priv;
DBG(("%s size=(%d, %d), tile=%d\n",
- __FUNCTION__, width, height, sna->render.max_3d_size));
+ __FUNCTION__, width, height,
+ to_sna_from_drawable(dst->pDrawable)->render.max_3d_size));
priv = sna_pixmap(get_drawable_pixmap(dst->pDrawable));
if (priv == NULL || priv->gpu_bo == NULL)