Mesa (master): gallium/util: silence silence unused var warnings for non-debug build

Brian Paul brianp at kemper.freedesktop.org
Mon Jun 1 13:48:09 UTC 2015


Module: Mesa
Branch: master
Commit: 51d08d55f46655715cb4a4ef5d14fb7d051b989a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=51d08d55f46655715cb4a4ef5d14fb7d051b989a

Author: Brian Paul <brianp at vmware.com>
Date:   Fri May 29 16:02:44 2015 -0600

gallium/util: silence silence unused var warnings for non-debug build

Reviewed-by: Jose Fonseca <jfonseca at vmware.com>

---

 src/gallium/auxiliary/util/u_format_etc.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_format_etc.c b/src/gallium/auxiliary/util/u_format_etc.c
index f909b16..63e03ff 100644
--- a/src/gallium/auxiliary/util/u_format_etc.c
+++ b/src/gallium/auxiliary/util/u_format_etc.c
@@ -65,11 +65,10 @@ util_format_etc1_rgb8_pack_rgba_float(uint8_t *dst_row, unsigned dst_stride, con
 void
 util_format_etc1_rgb8_fetch_rgba_float(float *dst, const uint8_t *src, unsigned i, unsigned j)
 {
-   const unsigned bw = 4, bh = 4;
    struct etc1_block block;
    uint8_t tmp[3];
 
-   assert(i < bw && j < bh);
+   assert(i < 4 && j < 4); /* check i, j against 4x4 block size */
 
    etc1_parse_block(&block, src);
    etc1_fetch_texel(&block, i, j, tmp);




More information about the mesa-commit mailing list