summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/sna/gen6_render.c2
-rw-r--r--src/sna/gen7_render.c2
-rw-r--r--src/sna/kgem.c2
-rw-r--r--src/sna/sna_accel.c4
-rw-r--r--src/sna/sna_damage.c5
-rw-r--r--src/sna/sna_display.c2
-rw-r--r--src/sna/sna_trapezoids.c7
-rw-r--r--src/sna/sna_video_overlay.c2
-rw-r--r--src/sna/sna_video_textured.c2
9 files changed, 15 insertions, 13 deletions
diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
index 187cc15b..4279538a 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -1591,7 +1591,7 @@ gen6_render_video(struct sna *sna,
unsigned filter;
BoxPtr box;
- DBG(("%s: src=(%d, %d), dst=(%d, %d), %dx[(%d, %d), (%d, %d)...]\n",
+ DBG(("%s: src=(%d, %d), dst=(%d, %d), %ldx[(%d, %d), (%d, %d)...]\n",
__FUNCTION__,
src_width, src_height, dst_width, dst_height,
REGION_NUM_RECTS(dstRegion),
diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index 3e3da484..901a12c4 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -1751,7 +1751,7 @@ gen7_render_video(struct sna *sna,
unsigned filter;
BoxPtr box;
- DBG(("%s: src=(%d, %d), dst=(%d, %d), %dx[(%d, %d), (%d, %d)...]\n",
+ DBG(("%s: src=(%d, %d), dst=(%d, %d), %ldx[(%d, %d), (%d, %d)...]\n",
__FUNCTION__,
src_width, src_height, dst_width, dst_height,
REGION_NUM_RECTS(dstRegion),
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index fefaa8b4..4c5686f3 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -1775,7 +1775,7 @@ void kgem_bo_undo(struct kgem *kgem, struct kgem_bo *bo)
if (kgem->nexec != 1 || bo->exec == NULL)
return;
- DBG(("%s: only handle in batch, discarding last operations for handle=%ld\n",
+ DBG(("%s: only handle in batch, discarding last operations for handle=%d\n",
__FUNCTION__, bo->handle));
assert(bo->exec == &kgem->exec[0]);
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 7e0ca6d5..42f1fa23 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -1548,7 +1548,7 @@ sna_pixmap_undo_cow(struct sna *sna, struct sna_pixmap *priv, unsigned flags)
{
struct sna_cow *cow = COW(priv->cow);
- DBG(("%s: pixmap=%ld, handle=%ld, flags=%x\n",
+ DBG(("%s: pixmap=%ld, handle=%d, flags=%x\n",
__FUNCTION__,
priv->pixmap->drawable.serialNumber,
priv->gpu_bo->handle,
@@ -1668,7 +1668,7 @@ sna_pixmap_make_cow(struct sna *sna,
if (src_priv->gpu_bo->proxy)
return false;
- DBG(("%s: make cow src=%ld, dst=%ld, handle=%ld (already cow? src=%d, dst=%d)\n",
+ DBG(("%s: make cow src=%ld, dst=%ld, handle=%d (already cow? src=%d, dst=%d)\n",
__FUNCTION__,
src_priv->pixmap->drawable.serialNumber,
dst_priv->pixmap->drawable.serialNumber,
diff --git a/src/sna/sna_damage.c b/src/sna/sna_damage.c
index ab693af3..d1ab9034 100644
--- a/src/sna/sna_damage.c
+++ b/src/sna/sna_damage.c
@@ -415,7 +415,7 @@ static void __sna_damage_reduce(struct sna_damage *damage)
assert(damage->mode != DAMAGE_ALL);
assert(damage->dirty);
- DBG((" reduce: before region.n=%d\n", REGION_NUM_RECTS(region)));
+ DBG((" reduce: before region.n=%ld\n", REGION_NUM_RECTS(region)));
nboxes = damage->embedded_box.size;
list_for_each_entry(iter, &damage->embedded_box.list, list)
@@ -529,7 +529,7 @@ done:
free_list(&damage->embedded_box.list);
reset_embedded_box(damage);
- DBG((" reduce: after region.n=%d\n", REGION_NUM_RECTS(region)));
+ DBG((" reduce: after region.n=%ld\n", REGION_NUM_RECTS(region)));
}
static void damage_union(struct sna_damage *damage, const BoxRec *box)
@@ -1251,7 +1251,6 @@ fastcall struct sna_damage *_sna_damage_subtract_boxes(struct sna_damage *damage
int dx, int dy)
{
char damage_buf[1000];
- char region_buf[120];
ErrorF("%s(%s - [(%d,%d), (%d,%d)...x%d])...\n", __FUNCTION__,
_debug_describe_damage(damage_buf, sizeof(damage_buf), damage),
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 99e73110..2a5e1c3c 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -3471,7 +3471,7 @@ sna_crtc_redisplay(xf86CrtcPtr crtc, RegionPtr region)
struct sna_crtc *sna_crtc = to_sna_crtc(crtc);
int16_t tx, ty;
- DBG(("%s: crtc %d [pipe=%d], damage (%d, %d), (%d, %d) x %d\n",
+ DBG(("%s: crtc %d [pipe=%d], damage (%d, %d), (%d, %d) x %ld\n",
__FUNCTION__, sna_crtc->id, sna_crtc->pipe,
region->extents.x1, region->extents.y1,
region->extents.x2, region->extents.y2,
diff --git a/src/sna/sna_trapezoids.c b/src/sna/sna_trapezoids.c
index 5af7d418..e07ff2cd 100644
--- a/src/sna/sna_trapezoids.c
+++ b/src/sna/sna_trapezoids.c
@@ -100,8 +100,11 @@ static void _assert_pixmap_contains_box(PixmapPtr pixmap, BoxPtr box, const char
static void apply_damage(struct sna_composite_op *op, RegionPtr region)
{
- DBG(("%s: damage=%p, region=%d\n",
- __FUNCTION__, op->damage, REGION_NUM_RECTS(region)));
+ DBG(("%s: damage=%p, region=%ldx[(%d, %d), (%d, %d)]\n",
+ __FUNCTION__, op->damage,
+ REGION_NUM_RECTS(region),
+ region->extents.x1, region->extents.y1,
+ region->extents.x2, region->extents.y2));
if (op->damage == NULL)
return;
diff --git a/src/sna/sna_video_overlay.c b/src/sna/sna_video_overlay.c
index e3140b32..26b30e2d 100644
--- a/src/sna/sna_video_overlay.c
+++ b/src/sna/sna_video_overlay.c
@@ -495,7 +495,7 @@ sna_video_overlay_put_image(ClientPtr client,
drw_x, drw_y, drw_w, drw_h,
format->id, width, height, sync));
- DBG(("%s: region %d:(%d, %d), (%d, %d)\n", __FUNCTION__,
+ DBG(("%s: region %ld:(%d, %d), (%d, %d)\n", __FUNCTION__,
RegionNumRects(&clip),
clip.extents.x1, clip.extents.y1,
clip.extents.x2, clip.extents.y2));
diff --git a/src/sna/sna_video_textured.c b/src/sna/sna_video_textured.c
index 47f4e5d5..70f1f6e0 100644
--- a/src/sna/sna_video_textured.c
+++ b/src/sna/sna_video_textured.c
@@ -192,7 +192,7 @@ sna_video_textured_put_image(ClientPtr client,
drw_x, drw_y, drw_w, drw_h,
format->id, width, height, sync));
- DBG(("%s: region %d:(%d, %d), (%d, %d)\n", __FUNCTION__,
+ DBG(("%s: region %ld:(%d, %d), (%d, %d)\n", __FUNCTION__,
RegionNumRects(&clip),
clip.extents.x1, clip.extents.y1,
clip.extents.x2, clip.extents.y2));
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 21:24:19 +0000