diff options
author | Lioncash <mathew1800@gmail.com> | 2020-12-07 22:30:36 +0100 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2020-12-07 22:30:39 +0100 |
commit | 09fa1d6a739b18f6a8f3d83065ff9aebd6e4bc8d (patch) | |
tree | 3ea0bbe356d45a250b1b5300773bc2c419a39c19 /src/video_core/shader | |
parent | Merge pull request #5149 from comex/xx-map-interval (diff) | |
download | yuzu-09fa1d6a739b18f6a8f3d83065ff9aebd6e4bc8d.tar yuzu-09fa1d6a739b18f6a8f3d83065ff9aebd6e4bc8d.tar.gz yuzu-09fa1d6a739b18f6a8f3d83065ff9aebd6e4bc8d.tar.bz2 yuzu-09fa1d6a739b18f6a8f3d83065ff9aebd6e4bc8d.tar.lz yuzu-09fa1d6a739b18f6a8f3d83065ff9aebd6e4bc8d.tar.xz yuzu-09fa1d6a739b18f6a8f3d83065ff9aebd6e4bc8d.tar.zst yuzu-09fa1d6a739b18f6a8f3d83065ff9aebd6e4bc8d.zip |
Diffstat (limited to 'src/video_core/shader')
-rw-r--r-- | src/video_core/shader/control_flow.cpp | 10 | ||||
-rw-r--r-- | src/video_core/shader/decode.cpp | 4 |
2 files changed, 7 insertions, 7 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; diff --git a/src/video_core/shader/decode.cpp b/src/video_core/shader/decode.cpp index c8f4da6df..ab14c1aa3 100644 --- a/src/video_core/shader/decode.cpp +++ b/src/video_core/shader/decode.cpp @@ -153,8 +153,8 @@ void ShaderIR::Decode() { const auto& blocks = shader_info.blocks; NodeBlock current_block; u32 current_label = static_cast<u32>(exit_branch); - for (auto& block : blocks) { - if (shader_info.labels.count(block.start) != 0) { + for (const auto& block : blocks) { + if (shader_info.labels.contains(block.start)) { insert_block(current_block, current_label); current_block.clear(); current_label = block.start; |