diff options
| author | LC <mathew1800@gmail.com> | 2020-12-07 06:06:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-07 06:06:53 +0100 |
| commit | 69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41 (patch) | |
| tree | 9cc837fa8d085c5c483fd84239925870e44ba478 /src/video_core/shader/decode/arithmetic_integer.cpp | |
| parent | Merge pull request #5155 from comex/xx-default (diff) | |
| parent | video_core: Resolve more variable shadowing scenarios pt.3 (diff) | |
| download | yuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.tar yuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.tar.gz yuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.tar.bz2 yuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.tar.lz yuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.tar.xz yuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.tar.zst yuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.zip | |
Diffstat (limited to 'src/video_core/shader/decode/arithmetic_integer.cpp')
| -rw-r--r-- | src/video_core/shader/decode/arithmetic_integer.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/video_core/shader/decode/arithmetic_integer.cpp b/src/video_core/shader/decode/arithmetic_integer.cpp index 73155966f..f32c3134b 100644 --- a/src/video_core/shader/decode/arithmetic_integer.cpp +++ b/src/video_core/shader/decode/arithmetic_integer.cpp @@ -258,7 +258,7 @@ u32 ShaderIR::DecodeArithmeticInteger(NodeBlock& bb, u32 pc) { case OpCode::Id::LEA_IMM: case OpCode::Id::LEA_RZ: case OpCode::Id::LEA_HI: { - auto [op_a, op_b, op_c] = [&]() -> std::tuple<Node, Node, Node> { + auto [op_a_, op_b_, op_c_] = [&]() -> std::tuple<Node, Node, Node> { switch (opcode->get().GetId()) { case OpCode::Id::LEA_R2: { return {GetRegister(instr.gpr20), GetRegister(instr.gpr39), @@ -294,8 +294,9 @@ u32 ShaderIR::DecodeArithmeticInteger(NodeBlock& bb, u32 pc) { UNIMPLEMENTED_IF_MSG(instr.lea.pred48 != static_cast<u64>(Pred::UnusedIndex), "Unhandled LEA Predicate"); - Node value = Operation(OperationCode::ILogicalShiftLeft, std::move(op_a), std::move(op_c)); - value = Operation(OperationCode::IAdd, std::move(op_b), std::move(value)); + Node value = + Operation(OperationCode::ILogicalShiftLeft, std::move(op_a_), std::move(op_c_)); + value = Operation(OperationCode::IAdd, std::move(op_b_), std::move(value)); SetRegister(bb, instr.gpr0, std::move(value)); break; |