AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

More GCC 9 fixes

This commit is contained in:
Luke Street 2022-06-13 03:55:50 -04:00
parent ce14e1c2aa
commit 30802a447f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/Graphics/GX.hpp
View File

@ -642,7 +642,7 @@ enum LightID : u32 {
MAX_LIGHT = 0x100, MAX_LIGHT = 0x100,
LIGHT_NULL = 0x000, 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>; using LightMask = std::bitset<MaxLights>;
enum FogType { enum FogType {

2
aurora/lib/gfx/gx.hpp
View File

@ -143,7 +143,7 @@ struct TevSwap {
GX::TevColorChan alpha = GX::CH_ALPHA; GX::TevColorChan alpha = GX::CH_ALPHA;
bool operator==(const TevSwap& rhs) const { return memcmp(this, &rhs, sizeof(*this)) == 0; } 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>); static_assert(std::has_unique_object_representations_v<TevSwap>);
struct AlphaCompare { struct AlphaCompare {