summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/sna/gen2_render.c4
-rw-r--r--src/sna/gen3_render.c4
-rw-r--r--src/sna/gen4_render.c4
-rw-r--r--src/sna/gen5_render.c4
-rw-r--r--src/sna/gen6_render.c4
-rw-r--r--src/sna/gen7_render.c4
-rw-r--r--src/sna/gen8_render.c4
-rw-r--r--src/sna/sna.h2
-rw-r--r--src/sna/sna_composite.c9
-rw-r--r--src/sna/sna_render_inline.h5
10 files changed, 25 insertions, 19 deletions
diff --git a/src/sna/gen2_render.c b/src/sna/gen2_render.c
index 379079df..1104f462 100644
--- a/src/sna/gen2_render.c
+++ b/src/sna/gen2_render.c
@@ -1640,9 +1640,9 @@ gen2_composite_set_target(struct sna *sna,
get_drawable_deltas(dst->pDrawable, op->dst.pixmap,
&op->dst.x, &op->dst.y);
- DBG(("%s: pixmap=%p, format=%08x, size=%dx%d, pitch=%d, delta=(%d,%d),damage=%p\n",
+ DBG(("%s: pixmap=%ld, format=%08x, size=%dx%d, pitch=%d, delta=(%d,%d),damage=%p\n",
__FUNCTION__,
- op->dst.pixmap, (int)op->dst.format,
+ op->dst.pixmap->drawable.serialNumber, (int)op->dst.format,
op->dst.width, op->dst.height,
op->dst.bo->pitch,
op->dst.x, op->dst.y,
diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c
index bb18dd11..78289f00 100644
--- a/src/sna/gen3_render.c
+++ b/src/sna/gen3_render.c
@@ -3211,9 +3211,9 @@ gen3_composite_set_target(struct sna *sna,
get_drawable_deltas(dst->pDrawable, op->dst.pixmap,
&op->dst.x, &op->dst.y);
- DBG(("%s: pixmap=%p, format=%08x, size=%dx%d, pitch=%d, delta=(%d,%d),damage=%p\n",
+ DBG(("%s: pixmap=%ld, format=%08x, size=%dx%d, pitch=%d, delta=(%d,%d),damage=%p\n",
__FUNCTION__,
- op->dst.pixmap, (int)op->dst.format,
+ op->dst.pixmap->drawable.serialNumber, (int)op->dst.format,
op->dst.width, op->dst.height,
op->dst.bo->pitch,
op->dst.x, op->dst.y,
diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
index 32ad8688..9a6761f6 100644
--- a/src/sna/gen4_render.c
+++ b/src/sna/gen4_render.c
@@ -1683,9 +1683,9 @@ gen4_composite_set_target(struct sna *sna,
get_drawable_deltas(dst->pDrawable, op->dst.pixmap,
&op->dst.x, &op->dst.y);
- DBG(("%s: pixmap=%p, format=%08x, size=%dx%d, pitch=%d, delta=(%d,%d),damage=%p\n",
+ DBG(("%s: pixmap=%ld, format=%08x, size=%dx%d, pitch=%d, delta=(%d,%d),damage=%p\n",
__FUNCTION__,
- op->dst.pixmap, (int)op->dst.format,
+ op->dst.pixmap->drawable.serialNumber, (int)op->dst.format,
op->dst.width, op->dst.height,
op->dst.bo->pitch,
op->dst.x, op->dst.y,
diff --git a/src/sna/gen5_render.c b/src/sna/gen5_render.c
index 93bc0d21..1ebaef9d 100644
--- a/src/sna/gen5_render.c
+++ b/src/sna/gen5_render.c
@@ -1637,9 +1637,9 @@ gen5_composite_set_target(struct sna *sna,
get_drawable_deltas(dst->pDrawable, op->dst.pixmap,
&op->dst.x, &op->dst.y);
- DBG(("%s: pixmap=%p, format=%08x, size=%dx%d, pitch=%d, delta=(%d,%d),damage=%p\n",
+ DBG(("%s: pixmap=%ld, format=%08x, size=%dx%d, pitch=%d, delta=(%d,%d),damage=%p\n",
__FUNCTION__,
- op->dst.pixmap, (int)op->dst.format,
+ op->dst.pixmap->drawable.serialNumber, (int)op->dst.format,
op->dst.width, op->dst.height,
op->dst.bo->pitch,
op->dst.x, op->dst.y,
diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
index 4ee786bd..86ea1467 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -1907,9 +1907,9 @@ gen6_composite_set_target(struct sna *sna,
get_drawable_deltas(dst->pDrawable, op->dst.pixmap,
&op->dst.x, &op->dst.y);
- DBG(("%s: pixmap=%p, format=%08x, size=%dx%d, pitch=%d, delta=(%d,%d),damage=%p\n",
+ DBG(("%s: pixmap=%ld, format=%08x, size=%dx%d, pitch=%d, delta=(%d,%d),damage=%p\n",
__FUNCTION__,
- op->dst.pixmap, (int)op->dst.format,
+ op->dst.pixmap->drawable.serialNumber, (int)op->dst.format,
op->dst.width, op->dst.height,
op->dst.bo->pitch,
op->dst.x, op->dst.y,
diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index 59b954d3..571de6e0 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -2159,9 +2159,9 @@ gen7_composite_set_target(struct sna *sna,
get_drawable_deltas(dst->pDrawable, op->dst.pixmap,
&op->dst.x, &op->dst.y);
- DBG(("%s: pixmap=%p, format=%08x, size=%dx%d, pitch=%d, delta=(%d,%d),damage=%p\n",
+ DBG(("%s: pixmap=%ld, format=%08x, size=%dx%d, pitch=%d, delta=(%d,%d),damage=%p\n",
__FUNCTION__,
- op->dst.pixmap, (int)op->dst.format,
+ op->dst.pixmap->drawable.serialNumber, (int)op->dst.format,
op->dst.width, op->dst.height,
op->dst.bo->pitch,
op->dst.x, op->dst.y,
diff --git a/src/sna/gen8_render.c b/src/sna/gen8_render.c
index 22df53db..1eb54aaf 100644
--- a/src/sna/gen8_render.c
+++ b/src/sna/gen8_render.c
@@ -1977,9 +1977,9 @@ gen8_composite_set_target(struct sna *sna,
get_drawable_deltas(dst->pDrawable, op->dst.pixmap,
&op->dst.x, &op->dst.y);
- DBG(("%s: pixmap=%p, format=%08x, size=%dx%d, pitch=%d, delta=(%d,%d),damage=%p\n",
+ DBG(("%s: pixmap=%ld, format=%08x, size=%dx%d, pitch=%d, delta=(%d,%d),damage=%p\n",
__FUNCTION__,
- op->dst.pixmap, (int)op->dst.format,
+ op->dst.pixmap->drawable.serialNumber, (int)op->dst.format,
op->dst.width, op->dst.height,
op->dst.bo->pitch,
op->dst.x, op->dst.y,
diff --git a/src/sna/sna.h b/src/sna/sna.h
index 24f96bbb..bb0cbb28 100644
--- a/src/sna/sna.h
+++ b/src/sna/sna.h
@@ -715,7 +715,7 @@ static inline struct sna_pixmap *
sna_pixmap_force_to_gpu(PixmapPtr pixmap, unsigned flags)
{
/* Unlike move-to-gpu, we ignore wedged and always create the GPU bo */
- DBG(("%s(pixmap=%p, flags=%x)\n", __FUNCTION__, pixmap, flags));
+ DBG(("%s(pixmap=%ld, flags=%x)\n", __FUNCTION__, pixmap->drawable.serialNumber, flags));
return sna_pixmap_move_to_gpu(pixmap, flags | __MOVE_FORCE);
}
bool must_check _sna_pixmap_move_to_cpu(PixmapPtr pixmap, unsigned flags);
diff --git a/src/sna/sna_composite.c b/src/sna/sna_composite.c
index e65bce03..c76258cb 100644
--- a/src/sna/sna_composite.c
+++ b/src/sna/sna_composite.c
@@ -643,11 +643,12 @@ sna_composite(CARD8 op,
RegionRec region;
int dx, dy;
- DBG(("%s(%d src=(%d, %d), mask=(%d, %d), dst=(%d, %d)+(%d, %d), size=(%d, %d)\n",
+ DBG(("%s(%d src=%ld+(%d, %d), mask=%ld+(%d, %d), dst=%ld+(%d, %d)+(%d, %d), size=(%d, %d)\n",
__FUNCTION__, op,
- src_x, src_y,
- mask_x, mask_y,
- dst_x, dst_y, dst->pDrawable->x, dst->pDrawable->y,
+ get_picture_id(src), src_x, src_y,
+ get_picture_id(mask), mask_x, mask_y,
+ get_picture_id(dst), dst_x, dst_y,
+ dst->pDrawable->x, dst->pDrawable->y,
width, height));
if (region_is_empty(dst->pCompositeClip)) {
diff --git a/src/sna/sna_render_inline.h b/src/sna/sna_render_inline.h
index 40a9ac4e..3d24c5c8 100644
--- a/src/sna/sna_render_inline.h
+++ b/src/sna/sna_render_inline.h
@@ -358,4 +358,9 @@ overlaps(struct sna *sna,
extents->y1 + src_dy < extents->y2 + dst_dy);
}
+static inline long get_picture_id(PicturePtr picture)
+{
+ return picture && picture->pDrawable ? get_drawable_pixmap(picture->pDrawable)->drawable.serialNumber : 0;
+}
+
#endif /* SNA_RENDER_INLINE_H */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 22:45:02 +0000