ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Software/Tev: Fix member shadowing warnings

This commit is contained in:
Pokechu22 2023-02-02 14:52:06 -08:00
parent 8b98dd9be3
commit 2288ba28ae
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/VideoBackends/Software/Tev.h
View File

@ -13,7 +13,7 @@ class Tev
struct TevColor struct TevColor
{ {
constexpr TevColor() = default; 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 a = 0;
s16 b = 0; s16 b = 0;
@ -43,7 +43,10 @@ class Tev
struct TevColorRef 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& r;
const s16& g; const s16& g;
@ -60,15 +63,15 @@ class Tev
struct TevAlphaRef struct TevAlphaRef
{ {
constexpr explicit TevAlphaRef(const TevColor& color) : a(color.a) {} 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; const s16& a;
}; };
struct TevKonstRef struct TevKonstRef
{ {
constexpr explicit TevKonstRef(const s16& a, const s16& r, const s16& g, const s16& b) constexpr explicit TevKonstRef(const s16& a_, const s16& r_, const s16& g_, const s16& b_)
: a(a), r(r), g(g), b(b) : a(a_), r(r_), g(g_), b(b_)
{ {
} }