From: Ian Romanick Date: Mon, 12 Feb 2018 19:16:55 +0000 (-0800) Subject: i965: Silence warnings about mixing enum and non-enum in conditional X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a55dae6ea2cdf37d0ddd06d5f3b34ac1faf3848c;p=mesa.git i965: Silence warnings about mixing enum and non-enum in conditional Reduces my build from 6451 warnings to 6301 warnings by silencing 150 instances of ../../SOURCE/master/src/intel/compiler/brw_inst.h: In function ‘brw_reg_type brw_inst_src1_type(const gen_device_info*, const brw_inst*)’: ../../SOURCE/master/src/intel/compiler/brw_inst.h:802:55: warning: enumeral and non-enumeral type in conditional expression [-Wextra] unsigned file = __builtin_strcmp("dst", #reg) == 0 ? \ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~ BRW_GENERAL_REGISTER_FILE : \ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ brw_inst_##reg##_reg_file(devinfo, inst); \ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../../SOURCE/master/src/intel/compiler/brw_inst.h:811:1: note: in expansion of macro ‘REG_TYPE’ REG_TYPE(src1) ^~~~~~~~ Signed-off-by: Ian Romanick Reviewed-by: Samuel Iglesias Gonsálvez --- diff --git a/src/intel/compiler/brw_inst.h b/src/intel/compiler/brw_inst.h index 0f5e4ac988a..a67225ca6b9 100644 --- a/src/intel/compiler/brw_inst.h +++ b/src/intel/compiler/brw_inst.h @@ -800,7 +800,7 @@ brw_inst_##reg##_type(const struct gen_device_info *devinfo, \ const brw_inst *inst) \ { \ unsigned file = __builtin_strcmp("dst", #reg) == 0 ? \ - BRW_GENERAL_REGISTER_FILE : \ + (unsigned) BRW_GENERAL_REGISTER_FILE : \ brw_inst_##reg##_reg_file(devinfo, inst); \ unsigned hw_type = brw_inst_##reg##_reg_hw_type(devinfo, inst); \ return brw_hw_type_to_reg_type(devinfo, (enum brw_reg_file)file, hw_type); \