octo
/
yuzu-mainline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2159 from lioncash/warn 

shader/track: Resolve variable shadowing warnings
This commit is contained in:
bunnei 2019-02-25 13:26:00 -05:00 committed by GitHub
parent c07987dfab c1b2e35625
commit 93c1630570
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/video_core/shader/track.cpp
View File

@ -20,9 +20,9 @@ std::pair<Node, s64> FindOperation(const NodeBlock& code, s64 cursor,
return {node, cursor}; return {node, cursor};
} }
if (const auto conditional = std::get_if<ConditionalNode>(node)) { if (const auto conditional = std::get_if<ConditionalNode>(node)) {
const auto& code = conditional->GetCode(); const auto& conditional_code = conditional->GetCode();
const auto [found, internal_cursor] = const auto [found, internal_cursor] = FindOperation(
FindOperation(code, static_cast<s64>(code.size() - 1), operation_code); conditional_code, static_cast<s64>(conditional_code.size() - 1), operation_code);
if (found) if (found)
return {found, cursor}; return {found, cursor};
} }
@ -58,8 +58,8 @@ Node ShaderIR::TrackCbuf(Node tracked, const NodeBlock& code, s64 cursor) {
return nullptr; return nullptr;
} }
if (const auto conditional = std::get_if<ConditionalNode>(tracked)) { if (const auto conditional = std::get_if<ConditionalNode>(tracked)) {
const auto& code = conditional->GetCode(); const auto& conditional_code = conditional->GetCode();
return TrackCbuf(tracked, code, static_cast<s64>(code.size())); return TrackCbuf(tracked, conditional_code, static_cast<s64>(conditional_code.size()));
} }
return nullptr; return nullptr;
} }