summaryrefslogtreecommitdiffstats
path: root/src/video_core/shader/control_flow.h
diff options
context:
space:
mode:
authorLC <mathew1800@gmail.com>2020-12-07 06:06:53 +0100
committerGitHub <noreply@github.com>2020-12-07 06:06:53 +0100
commit69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41 (patch)
tree9cc837fa8d085c5c483fd84239925870e44ba478 /src/video_core/shader/control_flow.h
parentMerge pull request #5155 from comex/xx-default (diff)
parentvideo_core: Resolve more variable shadowing scenarios pt.3 (diff)
downloadyuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.tar
yuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.tar.gz
yuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.tar.bz2
yuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.tar.lz
yuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.tar.xz
yuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.tar.zst
yuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.zip
Diffstat (limited to 'src/video_core/shader/control_flow.h')
-rw-r--r--src/video_core/shader/control_flow.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/video_core/shader/control_flow.h b/src/video_core/shader/control_flow.h
index 62a3510d8..37bf96492 100644
--- a/src/video_core/shader/control_flow.h
+++ b/src/video_core/shader/control_flow.h
@@ -42,10 +42,10 @@ struct Condition {
class SingleBranch {
public:
SingleBranch() = default;
- SingleBranch(Condition condition, s32 address, bool kill, bool is_sync, bool is_brk,
- bool ignore)
- : condition{condition}, address{address}, kill{kill}, is_sync{is_sync}, is_brk{is_brk},
- ignore{ignore} {}
+ explicit SingleBranch(Condition condition_, s32 address_, bool kill_, bool is_sync_,
+ bool is_brk_, bool ignore_)
+ : condition{condition_}, address{address_}, kill{kill_}, is_sync{is_sync_}, is_brk{is_brk_},
+ ignore{ignore_} {}
bool operator==(const SingleBranch& b) const {
return std::tie(condition, address, kill, is_sync, is_brk, ignore) ==
@@ -65,15 +65,15 @@ public:
};
struct CaseBranch {
- CaseBranch(u32 cmp_value, u32 address) : cmp_value{cmp_value}, address{address} {}
+ explicit CaseBranch(u32 cmp_value_, u32 address_) : cmp_value{cmp_value_}, address{address_} {}
u32 cmp_value;
u32 address;
};
class MultiBranch {
public:
- MultiBranch(u32 gpr, std::vector<CaseBranch>&& branches)
- : gpr{gpr}, branches{std::move(branches)} {}
+ explicit MultiBranch(u32 gpr_, std::vector<CaseBranch>&& branches_)
+ : gpr{gpr_}, branches{std::move(branches_)} {}
u32 gpr{};
std::vector<CaseBranch> branches{};