From 492a472b28b0a73c50a87427585cf95520588d5d Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Fri, 16 Feb 2018 19:09:13 -0800 Subject: [PATCH] genxml: Silence unused parameter warnings in generated pack code MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reduces my build from 1960 warnings to 1808 warnings by silencing 152 instances of things like In file included from ../../SOURCE/master/src/intel/genxml/genX_pack.h:32:0, from ../../SOURCE/master/src/intel/isl/isl_emit_depth_stencil.c:36: src/intel/genxml/gen4_pack.h: In function ‘__gen_uint’: src/intel/genxml/gen4_pack.h:58:49: warning: unused parameter ‘end’ [-Wunused-parameter] __gen_uint(uint64_t v, uint32_t start, uint32_t end) ^~~ src/intel/genxml/gen4_pack.h: In function ‘__gen_offset’: src/intel/genxml/gen4_pack.h:94:35: warning: unused parameter ‘start’ [-Wunused-parameter] __gen_offset(uint64_t v, uint32_t start, uint32_t end) ^~~~~ src/intel/genxml/gen4_pack.h:94:51: warning: unused parameter ‘end’ [-Wunused-parameter] __gen_offset(uint64_t v, uint32_t start, uint32_t end) ^~~ src/intel/genxml/gen4_pack.h: In function ‘__gen_ufixed’: src/intel/genxml/gen4_pack.h:133:48: warning: unused parameter ‘end’ [-Wunused-parameter] __gen_ufixed(float v, uint32_t start, uint32_t end, uint32_t fract_bits) ^~~ Signed-off-by: Ian Romanick Reviewed-by: Samuel Iglesias Gonsálvez --- src/intel/genxml/gen_pack_header.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/intel/genxml/gen_pack_header.py b/src/intel/genxml/gen_pack_header.py index e6cea8646ff..7dcada86fae 100644 --- a/src/intel/genxml/gen_pack_header.py +++ b/src/intel/genxml/gen_pack_header.py @@ -57,6 +57,12 @@ pack_header = """%(license)s #ifndef __gen_field_functions #define __gen_field_functions +#ifdef NDEBUG +#define NDEBUG_UNUSED __attribute__((unused)) +#else +#define NDEBUG_UNUSED +#endif + union __gen_value { float f; uint32_t dw; @@ -69,7 +75,7 @@ __gen_mbo(uint32_t start, uint32_t end) } static inline uint64_t -__gen_uint(uint64_t v, uint32_t start, uint32_t end) +__gen_uint(uint64_t v, uint32_t start, NDEBUG_UNUSED uint32_t end) { __gen_validate_value(v); @@ -105,7 +111,7 @@ __gen_sint(int64_t v, uint32_t start, uint32_t end) } static inline uint64_t -__gen_offset(uint64_t v, uint32_t start, uint32_t end) +__gen_offset(uint64_t v, NDEBUG_UNUSED uint32_t start, NDEBUG_UNUSED uint32_t end) { __gen_validate_value(v); #ifndef NDEBUG @@ -144,7 +150,7 @@ __gen_sfixed(float v, uint32_t start, uint32_t end, uint32_t fract_bits) } static inline uint64_t -__gen_ufixed(float v, uint32_t start, uint32_t end, uint32_t fract_bits) +__gen_ufixed(float v, uint32_t start, NDEBUG_UNUSED uint32_t end, uint32_t fract_bits) { __gen_validate_value(v); @@ -169,6 +175,8 @@ __gen_ufixed(float v, uint32_t start, uint32_t end, uint32_t fract_bits) #error #define __gen_combine_address before including this file #endif +#undef NDEBUG_UNUSED + #endif """ -- 2.30.2