[PATCH 12/15] glamor: Silence warnings for non-debug builds.

[Eric Anholt]

Signed-off-by: Eric Anholt <eric at anholt.net>
---
 glamor/glamor_getspans.c | 1 +
 glamor/glamor_render.c   | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/glamor/glamor_getspans.c b/glamor/glamor_getspans.c
index afb76f6..ff58725 100644
--- a/glamor/glamor_getspans.c
+++ b/glamor/glamor_getspans.c
@@ -54,6 +54,7 @@ _glamor_get_spans(DrawablePtr drawable,
                                                                   depth),
                                                  readpixels_dst, 0,
                                                  GLAMOR_ACCESS_RO);
+        (void)data;
         assert(data == readpixels_dst);
         readpixels_dst += PixmapBytePad(widths[i], drawable->depth);
     }
diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c
index 52bcf43..4a3a97c 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);
 
-- 
1.8.5.1