frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glamor: Silence warnings for non-debug builds. 

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Eric Anholt 2013-12-18 11:45:33 -08:00
parent 9af66851e2
commit 3c3a4eeaa1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
glamor/glamor_getspans.c
View File

@ -54,6 +54,7 @@ _glamor_get_spans(DrawablePtr drawable,
depth), depth),
readpixels_dst, 0, readpixels_dst, 0,
GLAMOR_ACCESS_RO); GLAMOR_ACCESS_RO);
(void)data;
assert(data == readpixels_dst); assert(data == readpixels_dst);
readpixels_dst += PixmapBytePad(widths[i], drawable->depth); readpixels_dst += PixmapBytePad(widths[i], drawable->depth);
} }

5
glamor/glamor_render.c
View File

@ -869,7 +869,7 @@ combine_pict_format(PictFormatShort * des, const PictFormatShort src,
const PictFormatShort mask, enum shader_in in_ca) const PictFormatShort mask, enum shader_in in_ca)
{ {
PictFormatShort new_vis; PictFormatShort new_vis;
int src_type, mask_type, src_bpp, mask_bpp; int src_type, mask_type, src_bpp;
int i; int i;
if (src == mask) { if (src == mask) {
@ -877,9 +877,8 @@ combine_pict_format(PictFormatShort * des, const PictFormatShort src,
return TRUE; return TRUE;
} }
src_bpp = PICT_FORMAT_BPP(src); src_bpp = PICT_FORMAT_BPP(src);
mask_bpp = PICT_FORMAT_BPP(mask);
assert(src_bpp == mask_bpp); assert(src_bpp == PICT_FORMAT_BPP(mask));
new_vis = PICT_FORMAT_VIS(src) | PICT_FORMAT_VIS(mask); new_vis = PICT_FORMAT_VIS(src) | PICT_FORMAT_VIS(mask);