summaryrefslogtreecommitdiff
path: root/src/sna/sna_render.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2014-05-28 12:51:18 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2014-05-28 13:34:53 +0100
commit562c47fc21b9029ebff29b53d2be590df4329264 (patch)
treeb93c3f8d68f3141cb9e80e0f79948ba8a4d2e4dc /src/sna/sna_render.c
parent6282fc9d0d3b2899be52ca4a43a3d9313e9049a6 (diff)
Silence CLang (almost)
Fix up all the warnings about implicit enum conversions. The container_of() macro remains defunct. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/sna_render.c')
-rw-r--r--src/sna/sna_render.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/sna/sna_render.c b/src/sna/sna_render.c
index fd73b090..cbec168c 100644
--- a/src/sna/sna_render.c
+++ b/src/sna/sna_render.c
@@ -1668,7 +1668,8 @@ do_fixup:
dst = pixman_image_create_bits(channel->pict_format,
w, h, ptr, channel->bo->pitch);
else
- dst = pixman_image_create_bits(picture->format, w, h, NULL, 0);
+ dst = pixman_image_create_bits((pixman_format_code_t)picture->format,
+ w, h, NULL, 0);
if (!dst) {
kgem_bo_destroy(&sna->kgem, channel->bo);
return 0;
@@ -1855,7 +1856,7 @@ sna_render_picture_convert(struct sna *sna,
if (!sna_pixmap_move_to_cpu(pixmap, MOVE_READ))
return 0;
- src = pixman_image_create_bits(picture->format,
+ src = pixman_image_create_bits((pixman_format_code_t)picture->format,
pixmap->drawable.width,
pixmap->drawable.height,
pixmap->devPrivate.ptr,