diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2014-05-28 12:51:18 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2014-05-28 13:34:53 +0100 |
| commit | 562c47fc21b9029ebff29b53d2be590df4329264 (patch) | |
| tree | b93c3f8d68f3141cb9e80e0f79948ba8a4d2e4dc /src/uxa | |
| parent | 6282fc9d0d3b2899be52ca4a43a3d9313e9049a6 (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/uxa')
| -rw-r--r-- | src/uxa/uxa-accel.c | 2 | ||||
| -rw-r--r-- | src/uxa/uxa-render.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/uxa/uxa-accel.c b/src/uxa/uxa-accel.c index cb465b86..757b2761 100644 --- a/src/uxa/uxa-accel.c +++ b/src/uxa/uxa-accel.c @@ -942,8 +942,8 @@ uxa_copy_plane(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, uxa_screen_t *uxa_screen = uxa_get_screen(screen); if (uxa_screen->info->flags & UXA_USE_GLAMOR) { + RegionPtr region = NULL; int ok = 0; - RegionPtr region; if (uxa_prepare_access(pDst, UXA_GLAMOR_ACCESS_RW)) { if (uxa_prepare_access(pSrc, UXA_GLAMOR_ACCESS_RO)) { diff --git a/src/uxa/uxa-render.c b/src/uxa/uxa-render.c index 992a008e..a138f161 100644 --- a/src/uxa/uxa-render.c +++ b/src/uxa/uxa-render.c @@ -926,7 +926,7 @@ uxa_acquire_source(ScreenPtr screen, INT16 * out_x, INT16 * out_y) { return uxa_acquire_picture (screen, pict, - PICT_a8r8g8b8, + PIXMAN_a8r8g8b8, x, y, width, height, out_x, out_y); @@ -940,7 +940,7 @@ uxa_acquire_mask(ScreenPtr screen, INT16 * out_x, INT16 * out_y) { return uxa_acquire_picture (screen, pict, - PICT_a8, + PIXMAN_a8, x, y, width, height, out_x, out_y); |