Merge pull request #13436 from JoshuaVandaele/clang-format-19

Update clang-format to version 19
This commit is contained in:
OatmealDome
2025-04-30 01:17:31 -04:00
committed by GitHub
48 changed files with 170 additions and 220 deletions

View File

@ -319,7 +319,7 @@ static inline u32 DecodePixel_RGB565(u16 val)
int r, g, b, a;
r = Convert5To8((val >> 11) & 0x1f);
g = Convert6To8((val >> 5) & 0x3f);
b = Convert5To8((val)&0x1f);
b = Convert5To8((val) & 0x1f);
a = 0xFF;
return r | (g << 8) | (b << 16) | (a << 24);
}
@ -331,7 +331,7 @@ static inline u32 DecodePixel_RGB5A3(u16 val)
{
r = Convert5To8((val >> 10) & 0x1f);
g = Convert5To8((val >> 5) & 0x1f);
b = Convert5To8((val)&0x1f);
b = Convert5To8((val) & 0x1f);
a = 0xFF;
}
else
@ -339,7 +339,7 @@ static inline u32 DecodePixel_RGB5A3(u16 val)
a = Convert3To8((val >> 12) & 0x7);
r = Convert4To8((val >> 8) & 0xf);
g = Convert4To8((val >> 4) & 0xf);
b = Convert4To8((val)&0xf);
b = Convert4To8((val) & 0xf);
}
return r | (g << 8) | (b << 16) | (a << 24);
}

View File

@ -31,7 +31,7 @@ static inline u32 DecodePixel_RGB565(u16 val)
int r, g, b, a;
r = Convert5To8((val >> 11) & 0x1f);
g = Convert6To8((val >> 5) & 0x3f);
b = Convert5To8((val)&0x1f);
b = Convert5To8((val) & 0x1f);
a = 0xFF;
return r | (g << 8) | (b << 16) | (a << 24);
}
@ -43,7 +43,7 @@ static inline u32 DecodePixel_RGB5A3(u16 val)
{
r = Convert5To8((val >> 10) & 0x1f);
g = Convert5To8((val >> 5) & 0x1f);
b = Convert5To8((val)&0x1f);
b = Convert5To8((val) & 0x1f);
a = 0xFF;
}
else
@ -51,7 +51,7 @@ static inline u32 DecodePixel_RGB5A3(u16 val)
a = Convert3To8((val >> 12) & 0x7);
r = Convert4To8((val >> 8) & 0xf);
g = Convert4To8((val >> 4) & 0xf);
b = Convert4To8((val)&0xf);
b = Convert4To8((val) & 0xf);
}
return r | (g << 8) | (b << 16) | (a << 24);
}

View File

@ -37,7 +37,7 @@ static inline u32 DecodePixel_RGB565(u16 val)
int r, g, b, a;
r = Convert5To8((val >> 11) & 0x1f);
g = Convert6To8((val >> 5) & 0x3f);
b = Convert5To8((val)&0x1f);
b = Convert5To8((val) & 0x1f);
a = 0xFF;
return r | (g << 8) | (b << 16) | (a << 24);
}
@ -49,7 +49,7 @@ static inline u32 DecodePixel_RGB5A3(u16 val)
{
r = Convert5To8((val >> 10) & 0x1f);
g = Convert5To8((val >> 5) & 0x1f);
b = Convert5To8((val)&0x1f);
b = Convert5To8((val) & 0x1f);
a = 0xFF;
}
else
@ -57,7 +57,7 @@ static inline u32 DecodePixel_RGB5A3(u16 val)
a = Convert3To8((val >> 12) & 0x7);
r = Convert4To8((val >> 8) & 0xf);
g = Convert4To8((val >> 4) & 0xf);
b = Convert4To8((val)&0xf);
b = Convert4To8((val) & 0xf);
}
return r | (g << 8) | (b << 16) | (a << 24);
}

View File

@ -73,9 +73,9 @@ public:
protected:
VertexLoaderBase(const TVtxDesc& vtx_desc, const VAT& vtx_attr)
: m_vertex_size{GetVertexSize(vtx_desc, vtx_attr)}, m_native_components{GetVertexComponents(
vtx_desc, vtx_attr)},
m_VtxAttr{vtx_attr}, m_VtxDesc{vtx_desc}
: m_vertex_size{GetVertexSize(vtx_desc, vtx_attr)},
m_native_components{GetVertexComponents(vtx_desc, vtx_attr)}, m_VtxAttr{vtx_attr},
m_VtxDesc{vtx_desc}
{
}

View File

@ -34,8 +34,7 @@ private:
using SizeTable = EnumMap<EnumMap<u32, ColorFormat::RGBA8888>, VertexComponentFormat::Index16>;
static constexpr SizeTable s_table_size = []() consteval
{
static constexpr SizeTable s_table_size = []() consteval {
SizeTable table{};
using VCF = VertexComponentFormat;
@ -45,6 +44,5 @@ private:
table[VCF::Index16] = {2u, 2u, 2u, 2u, 2u, 2u};
return table;
}
();
}();
};

View File

@ -31,8 +31,7 @@ private:
2>,
VertexComponentFormat::Index16>;
static constexpr SizeTable s_table_size = []() consteval
{
static constexpr SizeTable s_table_size = []() consteval {
SizeTable table{};
using VCF = VertexComponentFormat;
@ -145,6 +144,5 @@ private:
table[VCF::Index16][true][NCC::NTB][FMT::InvalidFloat7] = 6;
return table;
}
();
}();
};

View File

@ -30,8 +30,7 @@ private:
EnumMap<EnumMap<EnumMap<u32, CoordComponentCount::XYZ>, ComponentFormat::InvalidFloat7>,
VertexComponentFormat::Index16>;
static constexpr SizeTable s_table_size = []() consteval
{
static constexpr SizeTable s_table_size = []() consteval {
SizeTable table{};
using VCF = VertexComponentFormat;
@ -65,6 +64,5 @@ private:
table[VCF::Index16][FMT::InvalidFloat7] = {2, 2};
return table;
}
();
}();
};

View File

@ -33,8 +33,7 @@ private:
EnumMap<EnumMap<EnumMap<u32, TexComponentCount::ST>, ComponentFormat::InvalidFloat7>,
VertexComponentFormat::Index16>;
static constexpr SizeTable s_table_size = []() consteval
{
static constexpr SizeTable s_table_size = []() consteval {
SizeTable table{};
using VCF = VertexComponentFormat;
@ -68,6 +67,5 @@ private:
table[VCF::Index16][FMT::InvalidFloat7] = {2, 2};
return table;
}
();
}();
};