diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-07-29 23:54:31 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-07-29 23:54:31 +0100 |
| commit | c507f621c932393a8b87912f71a86e29a8c1c190 (patch) | |
| tree | a521bdf197f2d392d0e877c609b65d8fae0a2595 | |
| parent | cf7d36455fc43e88697f4fb8fd865f3259ba0d1a (diff) | |
| download | xorg-driver-xf86-video-intel-c507f621c932393a8b87912f71a86e29a8c1c190.tar.gz | |
sna: Suppress a few harmless warnings
Mostly of the only used in debugging path variety.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/sna_blt.c | 3 | ||||
| -rw-r--r-- | src/sna/sna_damage.c | 4 | ||||
| -rw-r--r-- | src/sna/sna_render.c | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/sna/sna_blt.c b/src/sna/sna_blt.c index b4ef083f..af4a92ad 100644 --- a/src/sna/sna_blt.c +++ b/src/sna/sna_blt.c @@ -1721,6 +1721,7 @@ blt_put_composite(struct sna *sna, data, pitch, src_x, src_y, &box, 1); assert(ok); + (void)ok; } } @@ -1757,6 +1758,7 @@ fastcall static void blt_put_composite_box(struct sna *sna, op->u.blt.sx, op->u.blt.sy, box, 1); assert(ok); + (void)ok; } } @@ -1794,6 +1796,7 @@ static void blt_put_composite_boxes(struct sna *sna, op->u.blt.sx, op->u.blt.sy, box, n); assert(ok); + (void)ok; } } diff --git a/src/sna/sna_damage.c b/src/sna/sna_damage.c index 8bfe8f95..8d5b4d63 100644 --- a/src/sna/sna_damage.c +++ b/src/sna/sna_damage.c @@ -1342,13 +1342,13 @@ bool _sna_damage_contains_box__no_reduce(const struct sna_damage *damage, const BoxRec *box) { int n, count; - BoxPtr b; + const BoxRec *b; assert(damage && damage->mode != DAMAGE_ALL); if (!box_contains(&damage->extents, box)) return false; - n = pixman_region_contains_rectangle(&damage->region, (BoxPtr)box); + n = pixman_region_contains_rectangle((pixman_region16_t *)&damage->region, (BoxPtr)box); if (!damage->dirty) return n == PIXMAN_REGION_IN; diff --git a/src/sna/sna_render.c b/src/sna/sna_render.c index ebb1d303..1bf11ea6 100644 --- a/src/sna/sna_render.c +++ b/src/sna/sna_render.c @@ -1486,7 +1486,7 @@ sna_render_picture_approximate_gradient(struct sna *sna, return -1; } - channel->is_opaque = sna_gradient_is_opaque(picture->pSourcePict); + channel->is_opaque = sna_gradient_is_opaque((PictGradient*)picture->pSourcePict); channel->pict_format = channel->is_opaque ? PIXMAN_x8r8g8b8 : PIXMAN_a8r8g8b8; DBG(("%s: gradient is opaque? %d, selecting format %08x\n", @@ -2077,6 +2077,7 @@ sna_render_composite_redirect_done(struct sna *sna, op->dst.pixmap->drawable.bitsPerPixel, &t->box, 1); assert(ok); + (void)ok; } if (t->damage) { DBG(("%s: combining damage (all? %d), offset=(%d, %d)\n", |