diff options
| author | Rodrigo Locatti <reinuseslisp@airmail.cc> | 2019-10-24 00:45:23 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-24 00:45:23 -0300 |
| commit | 5328d570df4da03a59261917d9e2ee93988665cd (patch) | |
| tree | af762d898b3b02c9f1cdd88a8e2743afc29090d5 /src/video_core/shader/decode/arithmetic_integer.cpp | |
| parent | 012d7f52337bae999abcc4943b45b8fe5ab5f7a3 (diff) | |
| parent | 1f5401c89c922a0ff5f6da131675fcdb5c73c5a5 (diff) | |
Merge pull request #3024 from lioncash/shadow
video_core/shader: Resolve instances of variable shadowing
Diffstat (limited to 'src/video_core/shader/decode/arithmetic_integer.cpp')
| -rw-r--r-- | src/video_core/shader/decode/arithmetic_integer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/shader/decode/arithmetic_integer.cpp b/src/video_core/shader/decode/arithmetic_integer.cpp index b73f6536e..a33d242e9 100644 --- a/src/video_core/shader/decode/arithmetic_integer.cpp +++ b/src/video_core/shader/decode/arithmetic_integer.cpp @@ -144,7 +144,7 @@ u32 ShaderIR::DecodeArithmeticInteger(NodeBlock& bb, u32 pc) { case OpCode::Id::ICMP_IMM: { const Node zero = Immediate(0); - const auto [op_b, test] = [&]() -> std::pair<Node, Node> { + const auto [op_rhs, test] = [&]() -> std::pair<Node, Node> { switch (opcode->get().GetId()) { case OpCode::Id::ICMP_CR: return {GetConstBuffer(instr.cbuf34.index, instr.cbuf34.offset), @@ -161,10 +161,10 @@ u32 ShaderIR::DecodeArithmeticInteger(NodeBlock& bb, u32 pc) { return {zero, zero}; } }(); - const Node op_a = GetRegister(instr.gpr8); + const Node op_lhs = GetRegister(instr.gpr8); const Node comparison = GetPredicateComparisonInteger(instr.icmp.cond, instr.icmp.is_signed != 0, test, zero); - SetRegister(bb, instr.gpr0, Operation(OperationCode::Select, comparison, op_a, op_b)); + SetRegister(bb, instr.gpr0, Operation(OperationCode::Select, comparison, op_lhs, op_rhs)); break; } case OpCode::Id::LOP_C: |