summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Fonseca <[email protected]>2014-04-24 14:49:53 +0100
committerJosé Fonseca <[email protected]>2014-04-24 14:49:53 +0100
commit1527a545a4ebb825db02bba9c9e42a90c15326f6 (patch)
tree0ac5ccf948be21025dd9052523237d4633bef1b6
parent878877d3c46ddb7b2a67c289b3f432435b95114c (diff)
gallivm: Fix wrong operator in lp_exec_default.
Courtesy of MSVC static code analyser. Reviewed-by: Roland Scheidegger <[email protected]>
-rw-r--r--src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
index 8791168a48b..2b47fc28f9b 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
@@ -725,7 +725,7 @@ static void lp_exec_default(struct lp_exec_mask *mask,
* default (or could do switch analysis at switch start time instead).
*/
unsigned opcode = bld_base->instructions[bld_base->pc - 1].Instruction.Opcode;
- boolean ft_into = (opcode != TGSI_OPCODE_BRK ||
+ boolean ft_into = (opcode != TGSI_OPCODE_BRK &&
opcode != TGSI_OPCODE_SWITCH);
/*
* If it is not last statement and there was no fallthrough into it,