diff options
| author | Scott Mansell <phiren@gmail.com> | 2023-02-10 21:21:15 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-10 21:21:15 +1300 |
| commit | dad7a32a35d0d28946c16e740692d014a858d2ea (patch) | |
| tree | 1422619a72cdcdf51e1d1e60509859f664d2d762 /Source/Core/VideoBackends/Software | |
| parent | a88e5ef3907e79ed20ab67e4df45c36e6ab2b909 (diff) | |
| parent | 3024ca2146cfdae2e7fb231e8d180dfc81e1a74e (diff) | |
Merge pull request #11534 from Pokechu22/warning-fixes-feb-2023
Resolve various compiler warnings
Diffstat (limited to 'Source/Core/VideoBackends/Software')
| -rw-r--r-- | Source/Core/VideoBackends/Software/Tev.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Source/Core/VideoBackends/Software/Tev.h b/Source/Core/VideoBackends/Software/Tev.h index c4e5e1f45f..28ec84600e 100644 --- a/Source/Core/VideoBackends/Software/Tev.h +++ b/Source/Core/VideoBackends/Software/Tev.h @@ -13,7 +13,7 @@ class Tev struct TevColor { constexpr TevColor() = default; - constexpr explicit TevColor(s16 a, s16 b, s16 g, s16 r) : a(a), b(b), g(g), r(r) {} + constexpr explicit TevColor(s16 a_, s16 b_, s16 g_, s16 r_) : a(a_), b(b_), g(g_), r(r_) {} s16 a = 0; s16 b = 0; @@ -43,7 +43,10 @@ class Tev struct TevColorRef { - constexpr explicit TevColorRef(const s16& r, const s16& g, const s16& b) : r(r), g(g), b(b) {} + constexpr explicit TevColorRef(const s16& r_, const s16& g_, const s16& b_) + : r(r_), g(g_), b(b_) + { + } const s16& r; const s16& g; @@ -60,15 +63,15 @@ class Tev struct TevAlphaRef { constexpr explicit TevAlphaRef(const TevColor& color) : a(color.a) {} - constexpr explicit TevAlphaRef(const s16& a) : a(a) {} + constexpr explicit TevAlphaRef(const s16& a_) : a(a_) {} const s16& a; }; struct TevKonstRef { - constexpr explicit TevKonstRef(const s16& a, const s16& r, const s16& g, const s16& b) - : a(a), r(r), g(g), b(b) + constexpr explicit TevKonstRef(const s16& a_, const s16& r_, const s16& g_, const s16& b_) + : a(a_), r(r_), g(g_), b(b_) { } |
