Mesa (master): aco: Fix warnings for bools in bitwise logic
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Dec 1 11:23:20 UTC 2020
Module: Mesa
Branch: master
Commit: 2c3fd34103c75df28568c6ee888021b17fc011be
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2c3fd34103c75df28568c6ee888021b17fc011be
Author: James Park <jpark37 at lagfreegames.com>
Date: Thu Nov 26 22:08:42 2020 -0800
aco: Fix warnings for bools in bitwise logic
Reviewed-by: Rhys Perry <pendingchaos02 at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7785>
---
src/amd/compiler/aco_optimizer.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/amd/compiler/aco_optimizer.cpp b/src/amd/compiler/aco_optimizer.cpp
index 3e9d79d6fd1..b780a8f1529 100644
--- a/src/amd/compiler/aco_optimizer.cpp
+++ b/src/amd/compiler/aco_optimizer.cpp
@@ -2032,8 +2032,8 @@ bool match_op3_for_vop3(opt_ctx &ctx, aco_opcode op1, aco_opcode op2,
return false;
if (inbetween_opsel)
- *inbetween_opsel = op1_vop3 ? op1_vop3->opsel & (1 << swap) : false;
- else if (op1_vop3 && op1_vop3->opsel & (1 << swap))
+ *inbetween_opsel = op1_vop3 ? op1_vop3->opsel & (1 << (unsigned)swap) : false;
+ else if (op1_vop3 && op1_vop3->opsel & (1 << (unsigned)swap))
return false;
*precise = op1_instr->definitions[0].isPrecise() ||
@@ -2047,7 +2047,7 @@ bool match_op3_for_vop3(opt_ctx &ctx, aco_opcode op1, aco_opcode op2,
operands[shuffle[0]] = op1_instr->operands[!swap];
neg[shuffle[0]] = op1_vop3 ? op1_vop3->neg[!swap] : false;
abs[shuffle[0]] = op1_vop3 ? op1_vop3->abs[!swap] : false;
- if (op1_vop3 && op1_vop3->opsel & (1 << !swap))
+ if (op1_vop3 && (op1_vop3->opsel & (1 << (unsigned)!swap)))
*opsel |= 1 << shuffle[0];
for (unsigned i = 0; i < 2; i++) {
More information about the mesa-commit
mailing list