diff options
author | Eric Anholt <eric@anholt.net> | 2013-12-18 11:45:33 -0800 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2014-01-27 09:30:47 -0800 |
commit | 3c3a4eeaa1f24b7534b332739158a2a36987ea6b (patch) | |
tree | 20857d8b5fb78d3417a9d13f1007f5f8f839de80 /glamor/glamor_render.c | |
parent | 9af66851e2770bcd8408a0e5ddf8bb8ea816feaa (diff) |
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>
Diffstat (limited to 'glamor/glamor_render.c')
-rw-r--r-- | glamor/glamor_render.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c index 52bcf43de..4a3a97ccd 100644 --- a/glamor/glamor_render.c +++ b/glamor/glamor_render.c @@ -869,7 +869,7 @@ combine_pict_format(PictFormatShort * des, const PictFormatShort src, const PictFormatShort mask, enum shader_in in_ca) { PictFormatShort new_vis; - int src_type, mask_type, src_bpp, mask_bpp; + int src_type, mask_type, src_bpp; int i; if (src == mask) { @@ -877,9 +877,8 @@ combine_pict_format(PictFormatShort * des, const PictFormatShort src, return TRUE; } 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); |