summaryrefslogtreecommitdiff
path: root/src/video_core/macro
diff options
context:
space:
mode:
authorGravatar bunnei2020-06-21 22:38:04 -0400
committerGravatar GitHub2020-06-21 22:38:04 -0400
commit14a1181a97e096de6ac8fb4f4b80f01e092aae9d (patch)
tree798af67b758500927791cbbb148f60e32de6bc90 /src/video_core/macro
parentMerge pull request #4126 from lioncash/noexcept (diff)
parentmemory_manager: Eliminate variable shadowing (diff)
downloadyuzu-14a1181a97e096de6ac8fb4f4b80f01e092aae9d.tar.gz
yuzu-14a1181a97e096de6ac8fb4f4b80f01e092aae9d.tar.xz
yuzu-14a1181a97e096de6ac8fb4f4b80f01e092aae9d.zip
Merge pull request #4122 from lioncash/hide
video_core: Eliminate some variable shadowing
Diffstat (limited to 'src/video_core/macro')
-rw-r--r--src/video_core/macro/macro_jit_x64.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/macro/macro_jit_x64.cpp b/src/video_core/macro/macro_jit_x64.cpp
index 389b58989..30abb66e5 100644
--- a/src/video_core/macro/macro_jit_x64.cpp
+++ b/src/video_core/macro/macro_jit_x64.cpp
@@ -553,7 +553,7 @@ Xbyak::Reg32 MacroJITx64Impl::Compile_GetRegister(u32 index, Xbyak::Reg32 dst) {
553} 553}
554 554
555void MacroJITx64Impl::Compile_ProcessResult(Macro::ResultOperation operation, u32 reg) { 555void MacroJITx64Impl::Compile_ProcessResult(Macro::ResultOperation operation, u32 reg) {
556 auto SetRegister = [=](u32 reg, Xbyak::Reg32 result) { 556 const auto SetRegister = [this](u32 reg, const Xbyak::Reg32& result) {
557 // Register 0 is supposed to always return 0. NOP is implemented as a store to the zero 557 // Register 0 is supposed to always return 0. NOP is implemented as a store to the zero
558 // register. 558 // register.
559 if (reg == 0) { 559 if (reg == 0) {
@@ -561,7 +561,7 @@ void MacroJITx64Impl::Compile_ProcessResult(Macro::ResultOperation operation, u3
561 } 561 }
562 mov(dword[STATE + offsetof(JITState, registers) + reg * sizeof(u32)], result); 562 mov(dword[STATE + offsetof(JITState, registers) + reg * sizeof(u32)], result);
563 }; 563 };
564 auto SetMethodAddress = [=](Xbyak::Reg32 reg) { mov(METHOD_ADDRESS, reg); }; 564 const auto SetMethodAddress = [this](const Xbyak::Reg32& reg) { mov(METHOD_ADDRESS, reg); };
565 565
566 switch (operation) { 566 switch (operation) {
567 case Macro::ResultOperation::IgnoreAndFetch: 567 case Macro::ResultOperation::IgnoreAndFetch: