diff options
| author | LC <mathew1800@gmail.com> | 2020-12-07 00:06:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-07 00:06:53 -0500 |
| commit | 69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41 (patch) | |
| tree | 9cc837fa8d085c5c483fd84239925870e44ba478 /src/video_core/shader/expr.h | |
| parent | 5933667cb83b690d029b9d5b646dc93f1ef4fda8 (diff) | |
| parent | f95602f15207851b849c57e2a2dd313a087b2493 (diff) | |
Merge pull request #5136 from lioncash/video-shadow3
video_core: Resolve more variable shadowing scenarios pt.3
Diffstat (limited to 'src/video_core/shader/expr.h')
| -rw-r--r-- | src/video_core/shader/expr.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/shader/expr.h b/src/video_core/shader/expr.h index 4e8264367..cda284c72 100644 --- a/src/video_core/shader/expr.h +++ b/src/video_core/shader/expr.h @@ -76,7 +76,7 @@ public: class ExprPredicate final { public: - explicit ExprPredicate(u32 predicate) : predicate{predicate} {} + explicit ExprPredicate(u32 predicate_) : predicate{predicate_} {} bool operator==(const ExprPredicate& b) const { return predicate == b.predicate; @@ -91,7 +91,7 @@ public: class ExprCondCode final { public: - explicit ExprCondCode(ConditionCode cc) : cc{cc} {} + explicit ExprCondCode(ConditionCode condition_code) : cc{condition_code} {} bool operator==(const ExprCondCode& b) const { return cc == b.cc; @@ -121,7 +121,7 @@ public: class ExprGprEqual final { public: - ExprGprEqual(u32 gpr, u32 value) : gpr{gpr}, value{value} {} + explicit ExprGprEqual(u32 gpr_, u32 value_) : gpr{gpr_}, value{value_} {} bool operator==(const ExprGprEqual& b) const { return gpr == b.gpr && value == b.value; |
