From cc33621e3b83e9bb0d89f8c6fd4e79700fe89c27 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Wed, 10 Oct 2018 13:38:12 -0700 Subject: [PATCH] r600/sb: Fix constant-logical-operand warning. sb/sb_bc_parser.cpp:620:27: warning: use of logical '&&' with constant operand [-Wconstant-logical-operand] if (cf->bc.op_ptr->flags && FF_GDS) ^ ~~~~~~ sb/sb_bc_parser.cpp:620:27: note: use '&' for a bitwise operation if (cf->bc.op_ptr->flags && FF_GDS) ^~ & sb/sb_bc_parser.cpp:620:27: note: remove constant to silence this warning if (cf->bc.op_ptr->flags && FF_GDS) ~^~~~~~~~~ Fixes: da977ad90747 ("r600/sb: start adding GDS support") Signed-off-by: Vinson Lee Reviewed-by: Dave Airlie --- src/gallium/drivers/r600/sb/sb_bc_parser.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/r600/sb/sb_bc_parser.cpp b/src/gallium/drivers/r600/sb/sb_bc_parser.cpp index eafc1cb8ec4..90e6df745a7 100644 --- a/src/gallium/drivers/r600/sb/sb_bc_parser.cpp +++ b/src/gallium/drivers/r600/sb/sb_bc_parser.cpp @@ -617,7 +617,7 @@ int bc_parser::decode_fetch_clause(cf_node* cf) { int r; unsigned i = cf->bc.addr << 1, cnt = cf->bc.count + 1; - if (cf->bc.op_ptr->flags && FF_GDS) + if (cf->bc.op_ptr->flags & FF_GDS) cf->subtype = NST_GDS_CLAUSE; else cf->subtype = NST_TEX_CLAUSE;