summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodrigo Locatti <reinuseslisp@airmail.cc>2020-04-16 06:22:40 +0200
committerGitHub <noreply@github.com>2020-04-16 06:22:40 +0200
commit612966399bcf07490a12d58c05bc30d4f93f7310 (patch)
tree626808c33746444ce2f32e76a95cfa141c914dd7
parentMerge pull request #3683 from lioncash/docs (diff)
parentcontrol_flow: Make use of std::move in TryInspectAddress() (diff)
downloadyuzu-612966399bcf07490a12d58c05bc30d4f93f7310.tar
yuzu-612966399bcf07490a12d58c05bc30d4f93f7310.tar.gz
yuzu-612966399bcf07490a12d58c05bc30d4f93f7310.tar.bz2
yuzu-612966399bcf07490a12d58c05bc30d4f93f7310.tar.lz
yuzu-612966399bcf07490a12d58c05bc30d4f93f7310.tar.xz
yuzu-612966399bcf07490a12d58c05bc30d4f93f7310.tar.zst
yuzu-612966399bcf07490a12d58c05bc30d4f93f7310.zip
-rw-r--r--src/video_core/shader/control_flow.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/shader/control_flow.cpp b/src/video_core/shader/control_flow.cpp
index 2e2711350..6d313963a 100644
--- a/src/video_core/shader/control_flow.cpp
+++ b/src/video_core/shader/control_flow.cpp
@@ -484,17 +484,17 @@ bool TryInspectAddress(CFGRebuildState& state) {
}
case BlockCollision::Inside: {
// This case is the tricky one:
- // We need to Split the block in 2 sepparate blocks
+ // We need to split the block into 2 separate blocks
const u32 end = state.block_info[block_index].end;
BlockInfo& new_block = CreateBlockInfo(state, address, end);
BlockInfo& current_block = state.block_info[block_index];
current_block.end = address - 1;
- new_block.branch = current_block.branch;
+ new_block.branch = std::move(current_block.branch);
BlockBranchInfo forward_branch = MakeBranchInfo<SingleBranch>();
const auto branch = std::get_if<SingleBranch>(forward_branch.get());
branch->address = address;
branch->ignore = true;
- current_block.branch = forward_branch;
+ current_block.branch = std::move(forward_branch);
return true;
}
default: