diff options
author | Rodrigo Locatti <reinuseslisp@airmail.cc> | 2020-12-08 01:55:51 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-08 01:55:51 +0100 |
commit | 3415890dd5c6539a7c7b6e02bf7ce5df4533133c (patch) | |
tree | d8293d5f1997e2b59d79d5bfcc629b736565ac13 /src/video_core/shader/control_flow.cpp | |
parent | Merge pull request #5163 from lioncash/concat (diff) | |
parent | video_core: Make use of ordered container contains() where applicable (diff) | |
download | yuzu-3415890dd5c6539a7c7b6e02bf7ce5df4533133c.tar yuzu-3415890dd5c6539a7c7b6e02bf7ce5df4533133c.tar.gz yuzu-3415890dd5c6539a7c7b6e02bf7ce5df4533133c.tar.bz2 yuzu-3415890dd5c6539a7c7b6e02bf7ce5df4533133c.tar.lz yuzu-3415890dd5c6539a7c7b6e02bf7ce5df4533133c.tar.xz yuzu-3415890dd5c6539a7c7b6e02bf7ce5df4533133c.tar.zst yuzu-3415890dd5c6539a7c7b6e02bf7ce5df4533133c.zip |
Diffstat (limited to 'src/video_core/shader/control_flow.cpp')
-rw-r--r-- | src/video_core/shader/control_flow.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/video_core/shader/control_flow.cpp b/src/video_core/shader/control_flow.cpp index 9120bf705..43d965f2f 100644 --- a/src/video_core/shader/control_flow.cpp +++ b/src/video_core/shader/control_flow.cpp @@ -257,7 +257,7 @@ std::pair<ParseResult, ParseInfo> ParseCode(CFGRebuildState& state, u32 address) single_branch.ignore = false; break; } - if (state.registered.count(offset) != 0) { + if (state.registered.contains(offset)) { single_branch.address = offset; single_branch.ignore = true; break; @@ -632,12 +632,12 @@ void DecompileShader(CFGRebuildState& state) { for (auto label : state.labels) { state.manager->DeclareLabel(label); } - for (auto& block : state.block_info) { - if (state.labels.count(block.start) != 0) { + for (const auto& block : state.block_info) { + if (state.labels.contains(block.start)) { state.manager->InsertLabel(block.start); } const bool ignore = BlockBranchIsIgnored(block.branch); - u32 end = ignore ? block.end + 1 : block.end; + const u32 end = ignore ? block.end + 1 : block.end; state.manager->InsertBlock(block.start, end); if (!ignore) { InsertBranch(*state.manager, block.branch); @@ -737,7 +737,7 @@ std::unique_ptr<ShaderCharacteristics> ScanFlow(const ProgramCode& program_code, auto back = result_out->blocks.begin(); auto next = std::next(back); while (next != result_out->blocks.end()) { - if (state.labels.count(next->start) == 0 && next->start == back->end + 1) { + if (!state.labels.contains(next->start) && next->start == back->end + 1) { back->end = next->end; next = result_out->blocks.erase(next); continue; |