mirror of https://github.com/AxioDL/metaforce.git
More GCC 9 fixes
This commit is contained in:
parent
ce14e1c2aa
commit
30802a447f
|
@ -642,7 +642,7 @@ enum LightID : u32 {
|
|||
MAX_LIGHT = 0x100,
|
||||
LIGHT_NULL = 0x000,
|
||||
};
|
||||
constexpr u8 MaxLights = std::bit_width<std::underlying_type_t<LightID>>(MAX_LIGHT) - 1;
|
||||
constexpr u8 MaxLights = 8;
|
||||
using LightMask = std::bitset<MaxLights>;
|
||||
|
||||
enum FogType {
|
||||
|
|
|
@ -143,7 +143,7 @@ struct TevSwap {
|
|||
GX::TevColorChan alpha = GX::CH_ALPHA;
|
||||
|
||||
bool operator==(const TevSwap& rhs) const { return memcmp(this, &rhs, sizeof(*this)) == 0; }
|
||||
explicit operator bool() const { return *this != TevSwap{}; }
|
||||
explicit operator bool() const { return !(*this == TevSwap{}); }
|
||||
};
|
||||
static_assert(std::has_unique_object_representations_v<TevSwap>);
|
||||
struct AlphaCompare {
|
||||
|
|
Loading…
Reference in New Issue