summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2011-10-19 20:20:55 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2011-10-19 20:20:55 +0100
commitfc224e2f8c0200c114f8dbddfc4f5395a3ef0fad (patch)
tree471fcc43836848889d3c7ae13051de764ced7038
parentf4346e5d255f419ee6148f7d69f02560732dd4de (diff)
sna: Clean up some debug messages for 64bit
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/sna_dri.c6
-rw-r--r--src/sna/sna_glyphs.c5
2 files changed, 6 insertions, 5 deletions
diff --git a/src/sna/sna_dri.c b/src/sna/sna_dri.c
index 82cec08c..ae4f1fa8 100644
--- a/src/sna/sna_dri.c
+++ b/src/sna/sna_dri.c
@@ -630,7 +630,7 @@ sna_dri_frame_event_drawable_gone(void *data, XID id)
drawable_resource);
DBG(("%s: marking drawable gone [%p]: %ld\n",
- __FUNCTION__, info, info->drawable_id));
+ __FUNCTION__, info, (long)info->drawable_id));
list_del(&info->drawable_resource);
info->drawable_id = None;
@@ -696,7 +696,7 @@ sna_dri_add_frame_event(struct sna_dri_frame_event *info)
list_add(&info->drawable_resource, resource);
DBG(("%s: add[%p] (%p, %ld)\n", __FUNCTION__,
- info, info->client, info->drawable_id));
+ info, info->client, (long)info->drawable_id));
return TRUE;
}
@@ -705,7 +705,7 @@ static void
sna_dri_frame_event_info_free(struct sna_dri_frame_event *info)
{
DBG(("%s: del[%p] (%p, %ld)\n", __FUNCTION__,
- info, info->client, info->drawable_id));
+ info, info->client, (long)info->drawable_id));
list_del(&info->client_resource);
list_del(&info->drawable_resource);
diff --git a/src/sna/sna_glyphs.c b/src/sna/sna_glyphs.c
index 13b0ccaf..928c9fb2 100644
--- a/src/sna/sna_glyphs.c
+++ b/src/sna/sna_glyphs.c
@@ -973,8 +973,9 @@ glyphs_fallback(CARD8 op,
region.extents.y2 - region.extents.y1,
dst->pDrawable->x, dst->pDrawable->y,
x, y,
- mask_format->depth, mask_format->format,
- mask_format->depth << 24 | mask_format->format,
+ mask_format->depth,
+ (long)mask_format->format,
+ (long)(mask_format->depth << 24 | mask_format->format),
NeedsComponent(mask_format->format)));
mask_image =
pixman_image_create_bits(mask_format->depth << 24 | mask_format->format,