From d6bd3823528aa9daf77ce2776692ea0c988219ec Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Fri, 4 Nov 2022 19:26:45 +0800 Subject: [PATCH] intel: Fixes -Werror,-Wbitwise-instead-of-logical for clang-15 in brw_nir_lower_shader_calls.c error message: error: use of bitwise '|' with boolean operands [-Werror,-Wbitwise-instead-of-logical] Signed-off-by: Yonggang Luo Reviewed-by: Lionel Landwerlin Part-of: --- .../compiler/brw_nir_lower_shader_calls.c | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/intel/compiler/brw_nir_lower_shader_calls.c b/src/intel/compiler/brw_nir_lower_shader_calls.c index 5bcc1f1c7b2..9faccb6c415 100644 --- a/src/intel/compiler/brw_nir_lower_shader_calls.c +++ b/src/intel/compiler/brw_nir_lower_shader_calls.c @@ -286,16 +286,16 @@ lower_shader_call_instr(struct nir_builder *b, nir_instr *instr, void *data) bool brw_nir_lower_shader_calls(nir_shader *shader, struct brw_bs_prog_key *key) { - return - nir_shader_instructions_pass(shader, - lower_shader_trace_ray_instr, - nir_metadata_none, - key) | - nir_shader_instructions_pass(shader, - lower_shader_call_instr, - nir_metadata_block_index | - nir_metadata_dominance, - NULL); + bool a = nir_shader_instructions_pass(shader, + lower_shader_trace_ray_instr, + nir_metadata_none, + key); + bool b = nir_shader_instructions_pass(shader, + lower_shader_call_instr, + nir_metadata_block_index | + nir_metadata_dominance, + NULL); + return a || b; } /** Creates a trivial return shader