sna: Fix format specifier for mismatching int/long in DBG

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2013-06-06 14:11:50 +01:00
parent 2770655371
commit 0da5cc23b1
9 changed files with 15 additions and 13 deletions

View File

@ -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),

View File

@ -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),

View File

@ -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]);

View File

@ -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,

View File

@ -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),

View File

@ -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,

View File

@ -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;

View File

@ -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));

View File

@ -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));