summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Lioncash2020-06-19 21:57:41 -0400
committerGravatar Lioncash2020-06-19 21:57:44 -0400
commit811bff009eca0d0fa2ddb1455fc73fdaec4474da (patch)
tree100af5edbd4d8a4f270f7a84bb7faaa5bed11b42 /src
parentbuffer_cache: Eliminate local variable shadowing (diff)
downloadyuzu-811bff009eca0d0fa2ddb1455fc73fdaec4474da.tar.gz
yuzu-811bff009eca0d0fa2ddb1455fc73fdaec4474da.tar.xz
yuzu-811bff009eca0d0fa2ddb1455fc73fdaec4474da.zip
macro_jit_x64: Eliminate variable shadowing in Compile_ProcessResult()
We can reduce the capture scope so that it's not possible for both "reg" variables to clash with one another. While we're at it, we can prevent unnecessary copies while we're at it.
Diffstat (limited to '')
-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 bee34a7c0..9eface47e 100644
--- a/src/video_core/macro/macro_jit_x64.cpp
+++ b/src/video_core/macro/macro_jit_x64.cpp
@@ -546,7 +546,7 @@ Xbyak::Reg32 MacroJITx64Impl::Compile_GetRegister(u32 index, Xbyak::Reg32 dst) {
546} 546}
547 547
548void MacroJITx64Impl::Compile_ProcessResult(Macro::ResultOperation operation, u32 reg) { 548void MacroJITx64Impl::Compile_ProcessResult(Macro::ResultOperation operation, u32 reg) {
549 auto SetRegister = [=](u32 reg, Xbyak::Reg32 result) { 549 const auto SetRegister = [this](u32 reg, const Xbyak::Reg32& result) {
550 // Register 0 is supposed to always return 0. NOP is implemented as a store to the zero 550 // Register 0 is supposed to always return 0. NOP is implemented as a store to the zero
551 // register. 551 // register.
552 if (reg == 0) { 552 if (reg == 0) {
@@ -554,7 +554,7 @@ void MacroJITx64Impl::Compile_ProcessResult(Macro::ResultOperation operation, u3
554 } 554 }
555 mov(dword[STATE + offsetof(JITState, registers) + reg * sizeof(u32)], result); 555 mov(dword[STATE + offsetof(JITState, registers) + reg * sizeof(u32)], result);
556 }; 556 };
557 auto SetMethodAddress = [=](Xbyak::Reg32 reg) { mov(METHOD_ADDRESS, reg); }; 557 const auto SetMethodAddress = [this](const Xbyak::Reg32& reg) { mov(METHOD_ADDRESS, reg); };
558 558
559 switch (operation) { 559 switch (operation) {
560 case Macro::ResultOperation::IgnoreAndFetch: 560 case Macro::ResultOperation::IgnoreAndFetch: