The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-03-12 14:46:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make all fmt::formatter constructors constexpr

Browse Source
This commit is contained in:
Pokechu22 2022-01-12 17:28:17 -08:00
parent 78e43a4404
commit ac46b91673
9 changed files with 66 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Common/EnumFormatter.h
View File

@ -23,7 +23,7 @@
* template <> * template <>
* struct fmt::formatter<Foo> : EnumFormatter<Foo::C> * struct fmt::formatter<Foo> : EnumFormatter<Foo::C>
* { * {
* formatter() : EnumFormatter({"A", "B", "C"}) {} * constexpr formatter() : EnumFormatter({"A", "B", "C"}) {}
* }; * };
* *
* enum class Bar * enum class Bar
@ -39,7 +39,7 @@
* // using std::array here fails due to nullptr not being const char*, at least in MSVC * // using std::array here fails due to nullptr not being const char*, at least in MSVC
* // (but only when a field is used; directly in the constructor is OK) * // (but only when a field is used; directly in the constructor is OK)
* static constexpr array_type names = {"D", "E", nullptr, "F"}; * static constexpr array_type names = {"D", "E", nullptr, "F"};
* formatter() : EnumFormatter(names) {} * constexpr formatter() : EnumFormatter(names) {}
* }; * };
*/ */
template <auto last_member, typename = decltype(last_member)> template <auto last_member, typename = decltype(last_member)>

74
Source/Core/VideoCommon/BPMemory.h
View File

@ -122,7 +122,7 @@ enum class TevScale : u32
template <> template <>
struct fmt::formatter<TevScale> : EnumFormatter<TevScale::Divide2> struct fmt::formatter<TevScale> : EnumFormatter<TevScale::Divide2>
{ {
formatter() : EnumFormatter({"1", "2", "4", "0.5"}) {} constexpr formatter() : EnumFormatter({"1", "2", "4", "0.5"}) {}
}; };
// TEV combiner operator // TEV combiner operator
@ -134,7 +134,7 @@ enum class TevOp : u32
template <> template <>
struct fmt::formatter<TevOp> : EnumFormatter<TevOp::Sub> struct fmt::formatter<TevOp> : EnumFormatter<TevOp::Sub>
{ {
formatter() : EnumFormatter({"Add", "Subtract"}) {} constexpr formatter() : EnumFormatter({"Add", "Subtract"}) {}
}; };
enum class TevCompareMode : u32 enum class TevCompareMode : u32
@ -148,7 +148,7 @@ enum class TevCompareMode : u32
template <> template <>
struct fmt::formatter<TevCompareMode> : EnumFormatter<TevCompareMode::RGB8> struct fmt::formatter<TevCompareMode> : EnumFormatter<TevCompareMode::RGB8>
{ {
formatter() : EnumFormatter({"R8", "GR16", "BGR24", "RGB8 / A8"}) {} constexpr formatter() : EnumFormatter({"R8", "GR16", "BGR24", "RGB8 / A8"}) {}
}; };
enum class TevComparison : u32 enum class TevComparison : u32
@ -159,7 +159,7 @@ enum class TevComparison : u32
template <> template <>
struct fmt::formatter<TevComparison> : EnumFormatter<TevComparison::EQ> struct fmt::formatter<TevComparison> : EnumFormatter<TevComparison::EQ>
{ {
formatter() : EnumFormatter({"Greater than", "Equal to"}) {} constexpr formatter() : EnumFormatter({"Greater than", "Equal to"}) {}
}; };
// TEV color combiner input // TEV color combiner input
@ -189,7 +189,7 @@ struct fmt::formatter<TevColorArg> : EnumFormatter<TevColorArg::Zero>
"prev.rgb", "prev.aaa", "c0.rgb", "c0.aaa", "c1.rgb", "c1.aaa", "c2.rgb", "c2.aaa", "prev.rgb", "prev.aaa", "c0.rgb", "c0.aaa", "c1.rgb", "c1.aaa", "c2.rgb", "c2.aaa",
"tex.rgb", "tex.aaa", "ras.rgb", "ras.aaa", "ONE", "HALF", "konst.rgb", "ZERO", "tex.rgb", "tex.aaa", "ras.rgb", "ras.aaa", "ONE", "HALF", "konst.rgb", "ZERO",
}; };
formatter() : EnumFormatter(names) {} constexpr formatter() : EnumFormatter(names) {}
}; };
// TEV alpha combiner input // TEV alpha combiner input
@ -210,7 +210,7 @@ struct fmt::formatter<TevAlphaArg> : EnumFormatter<TevAlphaArg::Zero>
static constexpr array_type names = { static constexpr array_type names = {
"prev", "c0", "c1", "c2", "tex", "ras", "konst", "ZERO", "prev", "c0", "c1", "c2", "tex", "ras", "konst", "ZERO",
}; };
formatter() : EnumFormatter(names) {} constexpr formatter() : EnumFormatter(names) {}
}; };
// TEV output registers // TEV output registers
@ -224,7 +224,7 @@ enum class TevOutput : u32
template <> template <>
struct fmt::formatter<TevOutput> : EnumFormatter<TevOutput::Color2> struct fmt::formatter<TevOutput> : EnumFormatter<TevOutput::Color2>
{ {
formatter() : EnumFormatter({"prev", "c0", "c1", "c2"}) {} constexpr formatter() : EnumFormatter({"prev", "c0", "c1", "c2"}) {}
}; };
// Z-texture formats // Z-texture formats
@ -237,7 +237,7 @@ enum class ZTexFormat : u32
template <> template <>
struct fmt::formatter<ZTexFormat> : EnumFormatter<ZTexFormat::U24> struct fmt::formatter<ZTexFormat> : EnumFormatter<ZTexFormat::U24>
{ {
formatter() : EnumFormatter({"u8", "u16", "u24"}) {} constexpr formatter() : EnumFormatter({"u8", "u16", "u24"}) {}
}; };
// Z texture operator // Z texture operator
@ -250,7 +250,7 @@ enum class ZTexOp : u32
template <> template <>
struct fmt::formatter<ZTexOp> : EnumFormatter<ZTexOp::Replace> struct fmt::formatter<ZTexOp> : EnumFormatter<ZTexOp::Replace>
{ {
formatter() : EnumFormatter({"Disabled", "Add", "Replace"}) {} constexpr formatter() : EnumFormatter({"Disabled", "Add", "Replace"}) {}
}; };
// TEV bias value // TEV bias value
@ -264,7 +264,7 @@ enum class TevBias : u32
template <> template <>
struct fmt::formatter<TevBias> : EnumFormatter<TevBias::Compare> struct fmt::formatter<TevBias> : EnumFormatter<TevBias::Compare>
{ {
formatter() : EnumFormatter({"0", "+0.5", "-0.5", "compare"}) {} constexpr formatter() : EnumFormatter({"0", "+0.5", "-0.5", "compare"}) {}
}; };
// Indirect texture format // Indirect texture format
@ -278,7 +278,7 @@ enum class IndTexFormat : u32
template <> template <>
struct fmt::formatter<IndTexFormat> : EnumFormatter<IndTexFormat::ITF_3> struct fmt::formatter<IndTexFormat> : EnumFormatter<IndTexFormat::ITF_3>
{ {
formatter() : EnumFormatter({"ITF_8", "ITF_5", "ITF_4", "ITF_3"}) {} constexpr formatter() : EnumFormatter({"ITF_8", "ITF_5", "ITF_4", "ITF_3"}) {}
}; };
// Indirect texture bias // Indirect texture bias
@ -296,7 +296,7 @@ enum class IndTexBias : u32
template <> template <>
struct fmt::formatter<IndTexBias> : EnumFormatter<IndTexBias::STU> struct fmt::formatter<IndTexBias> : EnumFormatter<IndTexBias::STU>
{ {
formatter() : EnumFormatter({"None", "S", "T", "ST", "U", "SU", "TU", "STU"}) {} constexpr formatter() : EnumFormatter({"None", "S", "T", "ST", "U", "SU", "TU", "STU"}) {}
}; };
enum class IndMtxIndex : u32 enum class IndMtxIndex : u32
@ -309,7 +309,7 @@ enum class IndMtxIndex : u32
template <> template <>
struct fmt::formatter<IndMtxIndex> : EnumFormatter<IndMtxIndex::Matrix2> struct fmt::formatter<IndMtxIndex> : EnumFormatter<IndMtxIndex::Matrix2>
{ {
formatter() : EnumFormatter({"Off", "Matrix 0", "Matrix 1", "Matrix 2"}) {} constexpr formatter() : EnumFormatter({"Off", "Matrix 0", "Matrix 1", "Matrix 2"}) {}
}; };
enum class IndMtxId : u32 enum class IndMtxId : u32
@ -321,7 +321,7 @@ enum class IndMtxId : u32
template <> template <>
struct fmt::formatter<IndMtxId> : EnumFormatter<IndMtxId::T> struct fmt::formatter<IndMtxId> : EnumFormatter<IndMtxId::T>
{ {
formatter() : EnumFormatter({"Indirect", "S", "T"}) {} constexpr formatter() : EnumFormatter({"Indirect", "S", "T"}) {}
}; };
// Indirect texture bump alpha // Indirect texture bump alpha
@ -335,7 +335,7 @@ enum class IndTexBumpAlpha : u32
template <> template <>
struct fmt::formatter<IndTexBumpAlpha> : EnumFormatter<IndTexBumpAlpha::U> struct fmt::formatter<IndTexBumpAlpha> : EnumFormatter<IndTexBumpAlpha::U>
{ {
formatter() : EnumFormatter({"Off", "S", "T", "U"}) {} constexpr formatter() : EnumFormatter({"Off", "S", "T", "U"}) {}
}; };
// Indirect texture wrap value // Indirect texture wrap value
@ -352,7 +352,7 @@ enum class IndTexWrap : u32
template <> template <>
struct fmt::formatter<IndTexWrap> : EnumFormatter<IndTexWrap::ITW_0> struct fmt::formatter<IndTexWrap> : EnumFormatter<IndTexWrap::ITW_0>
{ {
formatter() : EnumFormatter({"Off", "256", "128", "64", "32", "16", "0"}) {} constexpr formatter() : EnumFormatter({"Off", "256", "128", "64", "32", "16", "0"}) {}
}; };
union IND_MTXA union IND_MTXA
@ -771,7 +771,7 @@ struct fmt::formatter<RasColorChan> : EnumFormatter<RasColorChan::Zero>
"Color chan 0", "Color chan 1", nullptr, nullptr, "Color chan 0", "Color chan 1", nullptr, nullptr,
nullptr, "Alpha bump", "Norm alpha bump", "Zero", nullptr, "Alpha bump", "Norm alpha bump", "Zero",
}; };
formatter() : EnumFormatter(names) {} constexpr formatter() : EnumFormatter(names) {}
}; };
union TwoTevStageOrders union TwoTevStageOrders
@ -880,7 +880,7 @@ enum class WrapMode : u32
template <> template <>
struct fmt::formatter<WrapMode> : EnumFormatter<WrapMode::Mirror> struct fmt::formatter<WrapMode> : EnumFormatter<WrapMode::Mirror>
{ {
formatter() : EnumFormatter({"Clamp", "Repeat", "Mirror"}) {} constexpr formatter() : EnumFormatter({"Clamp", "Repeat", "Mirror"}) {}
}; };
enum class MipMode : u32 enum class MipMode : u32
@ -892,7 +892,7 @@ enum class MipMode : u32
template <> template <>
struct fmt::formatter<MipMode> : EnumFormatter<MipMode::Linear> struct fmt::formatter<MipMode> : EnumFormatter<MipMode::Linear>
{ {
formatter() : EnumFormatter({"None", "Mip point", "Mip linear"}) {} constexpr formatter() : EnumFormatter({"None", "Mip point", "Mip linear"}) {}
}; };
enum class FilterMode : u32 enum class FilterMode : u32
@ -903,7 +903,7 @@ enum class FilterMode : u32
template <> template <>
struct fmt::formatter<FilterMode> : EnumFormatter<FilterMode::Linear> struct fmt::formatter<FilterMode> : EnumFormatter<FilterMode::Linear>
{ {
formatter() : EnumFormatter({"Near", "Linear"}) {} constexpr formatter() : EnumFormatter({"Near", "Linear"}) {}
}; };
enum class LODType : u32 enum class LODType : u32
@ -914,7 +914,7 @@ enum class LODType : u32
template <> template <>
struct fmt::formatter<LODType> : EnumFormatter<LODType::Diagonal> struct fmt::formatter<LODType> : EnumFormatter<LODType::Diagonal>
{ {
formatter() : EnumFormatter({"Edge LOD", "Diagonal LOD"}) {} constexpr formatter() : EnumFormatter({"Edge LOD", "Diagonal LOD"}) {}
}; };
enum class MaxAniso enum class MaxAniso
@ -926,7 +926,7 @@ enum class MaxAniso
template <> template <>
struct fmt::formatter<MaxAniso> : EnumFormatter<MaxAniso::Four> struct fmt::formatter<MaxAniso> : EnumFormatter<MaxAniso::Four>
{ {
formatter() : EnumFormatter({"1", "2", "4"}) {} constexpr formatter() : EnumFormatter({"1", "2", "4"}) {}
}; };
union TexMode0 union TexMode0
@ -1129,7 +1129,7 @@ struct fmt::formatter<CullMode> : EnumFormatter<CullMode::All>
"Front-facing primitives only", "Front-facing primitives only",
"All primitives", "All primitives",
}; };
formatter() : EnumFormatter(names) {} constexpr formatter() : EnumFormatter(names) {}
}; };
union GenMode union GenMode
@ -1180,7 +1180,7 @@ enum class AspectRatioAdjustment
template <> template <>
struct fmt::formatter<AspectRatioAdjustment> : EnumFormatter<AspectRatioAdjustment::Adjust> struct fmt::formatter<AspectRatioAdjustment> : EnumFormatter<AspectRatioAdjustment::Adjust>
{ {
formatter() : EnumFormatter({"Don't adjust", "Adjust"}) {} constexpr formatter() : EnumFormatter({"Don't adjust", "Adjust"}) {}
}; };
union LPSize union LPSize
@ -1247,7 +1247,7 @@ struct fmt::formatter<SrcBlendFactor> : EnumFormatter<SrcBlendFactor::InvDstAlph
{ {
static constexpr array_type names = {"0", "1", "dst_color", "1-dst_color", static constexpr array_type names = {"0", "1", "dst_color", "1-dst_color",
"src_alpha", "1-src_alpha", "dst_alpha", "1-dst_alpha"}; "src_alpha", "1-src_alpha", "dst_alpha", "1-dst_alpha"};
formatter() : EnumFormatter(names) {} constexpr formatter() : EnumFormatter(names) {}
}; };
enum class DstBlendFactor : u32 enum class DstBlendFactor : u32
@ -1266,7 +1266,7 @@ struct fmt::formatter<DstBlendFactor> : EnumFormatter<DstBlendFactor::InvDstAlph
{ {
static constexpr array_type names = {"0", "1", "src_color", "1-src_color", static constexpr array_type names = {"0", "1", "src_color", "1-src_color",
"src_alpha", "1-src_alpha", "dst_alpha", "1-dst_alpha"}; "src_alpha", "1-src_alpha", "dst_alpha", "1-dst_alpha"};
formatter() : EnumFormatter(names) {} constexpr formatter() : EnumFormatter(names) {}
}; };
enum class LogicOp : u32 enum class LogicOp : u32
@ -1309,7 +1309,7 @@ struct fmt::formatter<LogicOp> : EnumFormatter<LogicOp::Set>
"Nand (~(src & dst))", "Nand (~(src & dst))",
"Set (1)", "Set (1)",
}; };
formatter() : EnumFormatter(names) {} constexpr formatter() : EnumFormatter(names) {}
}; };
union BlendMode union BlendMode
@ -1381,7 +1381,7 @@ enum class FogProjection : u32
template <> template <>
struct fmt::formatter<FogProjection> : EnumFormatter<FogProjection::Orthographic> struct fmt::formatter<FogProjection> : EnumFormatter<FogProjection::Orthographic>
{ {
formatter() : EnumFormatter({"Perspective", "Orthographic"}) {} constexpr formatter() : EnumFormatter({"Perspective", "Orthographic"}) {}
}; };
enum class FogType : u32 enum class FogType : u32
@ -1406,7 +1406,7 @@ struct fmt::formatter<FogType> : EnumFormatter<FogType::BackwardsExpSq>
"Backwards exponential fog", "Backwards exponential fog",
"Backwards exponenential-sequared fog", "Backwards exponenential-sequared fog",
}; };
formatter() : EnumFormatter(names) {} constexpr formatter() : EnumFormatter(names) {}
}; };
union FogParam3 union FogParam3
@ -1529,7 +1529,7 @@ struct fmt::formatter<CompareMode> : EnumFormatter<CompareMode::Always>
{ {
static constexpr array_type names = {"Never", "Less", "Equal", "LEqual", static constexpr array_type names = {"Never", "Less", "Equal", "LEqual",
"Greater", "NEqual", "GEqual", "Always"}; "Greater", "NEqual", "GEqual", "Always"};
formatter() : EnumFormatter(names) {} constexpr formatter() : EnumFormatter(names) {}
}; };
union ZMode union ZMode
@ -1601,7 +1601,7 @@ enum class FieldMaskState : u32
template <> template <>
struct fmt::formatter<FieldMaskState> : EnumFormatter<FieldMaskState::Write> struct fmt::formatter<FieldMaskState> : EnumFormatter<FieldMaskState::Write>
{ {
formatter() : EnumFormatter({"Skipped", "Written"}) {} constexpr formatter() : EnumFormatter({"Skipped", "Written"}) {}
}; };
union FieldMask union FieldMask
@ -1639,7 +1639,7 @@ struct fmt::formatter<PixelFormat> : EnumFormatter<PixelFormat::YUV420>
{ {
static constexpr array_type names = {"RGB8_Z24", "RGBA6_Z24", "RGB565_Z16", "Z24", static constexpr array_type names = {"RGB8_Z24", "RGBA6_Z24", "RGB565_Z16", "Z24",
"Y8", "U8", "V8", "YUV420"}; "Y8", "U8", "V8", "YUV420"};
formatter() : EnumFormatter(names) {} constexpr formatter() : EnumFormatter(names) {}
}; };
enum class DepthFormat : u32 enum class DepthFormat : u32
@ -1662,7 +1662,7 @@ struct fmt::formatter<DepthFormat> : EnumFormatter<DepthFormat::ZINV_FAR>
"linear", "compressed (near)", "compressed (mid)", "compressed (far)", "linear", "compressed (near)", "compressed (mid)", "compressed (far)",
"inv linear", "compressed (inv near)", "compressed (inv mid)", "compressed (inv far)", "inv linear", "compressed (inv near)", "compressed (inv mid)", "compressed (inv far)",
}; };
formatter() : EnumFormatter(names) {} constexpr formatter() : EnumFormatter(names) {}
}; };
union PEControl union PEControl
@ -1733,7 +1733,7 @@ enum class TevRegType : u32
template <> template <>
struct fmt::formatter<TevRegType> : EnumFormatter<TevRegType::Constant> struct fmt::formatter<TevRegType> : EnumFormatter<TevRegType::Constant>
{ {
formatter() : EnumFormatter({"Color", "Constant"}) {} constexpr formatter() : EnumFormatter({"Color", "Constant"}) {}
}; };
struct TevReg struct TevReg
@ -1860,7 +1860,7 @@ struct fmt::formatter<KonstSel> : EnumFormatter<KonstSel::K3_A>
"Konst 2 Alpha", "Konst 2 Alpha",
"Konst 3 Alpha", "Konst 3 Alpha",
}; };
formatter() : EnumFormatter(names) {} constexpr formatter() : EnumFormatter(names) {}
}; };
union TevKSel union TevKSel
@ -1900,7 +1900,7 @@ enum class AlphaTestOp : u32
template <> template <>
struct fmt::formatter<AlphaTestOp> : EnumFormatter<AlphaTestOp::Xnor> struct fmt::formatter<AlphaTestOp> : EnumFormatter<AlphaTestOp::Xnor>
{ {
formatter() : EnumFormatter({"And", "Or", "Xor", "Xnor"}) {} constexpr formatter() : EnumFormatter({"And", "Or", "Xor", "Xnor"}) {}
}; };
enum class AlphaTestResult enum class AlphaTestResult
@ -1988,7 +1988,7 @@ struct fmt::formatter<FrameToField> : EnumFormatter<FrameToField::InterlacedOdd>
{ {
static constexpr array_type names = {"Progressive", nullptr, "Interlaced (even lines)", static constexpr array_type names = {"Progressive", nullptr, "Interlaced (even lines)",
"Interlaced (odd lines)"}; "Interlaced (odd lines)"};
formatter() : EnumFormatter(names) {} constexpr formatter() : EnumFormatter(names) {}
}; };
union UPE_Copy union UPE_Copy

17
Source/Core/VideoCommon/CPMemory.h
View File

@ -84,7 +84,7 @@ struct fmt::formatter<CPArray> : EnumFormatter<CPArray::XF_D>
"Tex Coord 0", "Tex Coord 1", "Tex Coord 2", "Tex Coord 3", "Tex Coord 0", "Tex Coord 1", "Tex Coord 2", "Tex Coord 3",
"Tex Coord 4", "Tex Coord 5", "Tex Coord 6", "Tex Coord 7", "Tex Coord 4", "Tex Coord 5", "Tex Coord 6", "Tex Coord 7",
"XF A", "XF B", "XF C", "XF D"}; "XF A", "XF B", "XF C", "XF D"};
formatter() : EnumFormatter(names) {} constexpr formatter() : EnumFormatter(names) {}
}; };
// Intended for offsetting from Color0/TexCoord0 // Intended for offsetting from Color0/TexCoord0
constexpr CPArray operator+(CPArray array, u8 offset) constexpr CPArray operator+(CPArray array, u8 offset)
@ -107,7 +107,7 @@ enum class VertexComponentFormat
template <> template <>
struct fmt::formatter<VertexComponentFormat> : EnumFormatter<VertexComponentFormat::Index16> struct fmt::formatter<VertexComponentFormat> : EnumFormatter<VertexComponentFormat::Index16>
{ {
formatter() : EnumFormatter({"Not present", "Direct", "8-bit index", "16-bit index"}) {} constexpr formatter() : EnumFormatter({"Not present", "Direct", "8-bit index", "16-bit index"}) {}
}; };
constexpr bool IsIndexed(VertexComponentFormat format) constexpr bool IsIndexed(VertexComponentFormat format)
@ -126,7 +126,8 @@ enum class ComponentFormat
template <> template <>
struct fmt::formatter<ComponentFormat> : EnumFormatter<ComponentFormat::Float> struct fmt::formatter<ComponentFormat> : EnumFormatter<ComponentFormat::Float>
{ {
formatter() : EnumFormatter({"Unsigned Byte", "Byte", "Unsigned Short", "Short", "Float"}) {} static constexpr array_type names = {"Unsigned Byte", "Byte", "Unsigned Short", "Short", "Float"};
constexpr formatter() : EnumFormatter(names) {}
}; };
constexpr u32 GetElementSize(ComponentFormat format) constexpr u32 GetElementSize(ComponentFormat format)
@ -155,7 +156,7 @@ enum class CoordComponentCount
template <> template <>
struct fmt::formatter<CoordComponentCount> : EnumFormatter<CoordComponentCount::XYZ> struct fmt::formatter<CoordComponentCount> : EnumFormatter<CoordComponentCount::XYZ>
{ {
formatter() : EnumFormatter({"2 (x, y)", "3 (x, y, z)"}) {} constexpr formatter() : EnumFormatter({"2 (x, y)", "3 (x, y, z)"}) {}
}; };
enum class NormalComponentCount enum class NormalComponentCount
@ -166,7 +167,7 @@ enum class NormalComponentCount
template <> template <>
struct fmt::formatter<NormalComponentCount> : EnumFormatter<NormalComponentCount::NBT> struct fmt::formatter<NormalComponentCount> : EnumFormatter<NormalComponentCount::NBT>
{ {
formatter() : EnumFormatter({"1 (n)", "3 (n, b, t)"}) {} constexpr formatter() : EnumFormatter({"1 (n)", "3 (n, b, t)"}) {}
}; };
enum class ColorComponentCount enum class ColorComponentCount
@ -177,7 +178,7 @@ enum class ColorComponentCount
template <> template <>
struct fmt::formatter<ColorComponentCount> : EnumFormatter<ColorComponentCount::RGBA> struct fmt::formatter<ColorComponentCount> : EnumFormatter<ColorComponentCount::RGBA>
{ {
formatter() : EnumFormatter({"3 (r, g, b)", "4 (r, g, b, a)"}) {} constexpr formatter() : EnumFormatter({"3 (r, g, b)", "4 (r, g, b, a)"}) {}
}; };
enum class ColorFormat enum class ColorFormat
@ -196,7 +197,7 @@ struct fmt::formatter<ColorFormat> : EnumFormatter<ColorFormat::RGBA8888>
"RGB 16 bits 565", "RGB 24 bits 888", "RGB 32 bits 888x", "RGB 16 bits 565", "RGB 24 bits 888", "RGB 32 bits 888x",
"RGBA 16 bits 4444", "RGBA 24 bits 6666", "RGBA 32 bits 8888", "RGBA 16 bits 4444", "RGBA 24 bits 6666", "RGBA 32 bits 8888",
}; };
formatter() : EnumFormatter(names) {} constexpr formatter() : EnumFormatter(names) {}
}; };
enum class TexComponentCount enum class TexComponentCount
@ -207,7 +208,7 @@ enum class TexComponentCount
template <> template <>
struct fmt::formatter<TexComponentCount> : EnumFormatter<TexComponentCount::ST> struct fmt::formatter<TexComponentCount> : EnumFormatter<TexComponentCount::ST>
{ {
formatter() : EnumFormatter({"1 (s)", "2 (s, t)"}) {} constexpr formatter() : EnumFormatter({"1 (s)", "2 (s, t)"}) {}
}; };
struct TVtxDesc struct TVtxDesc

2
Source/Core/VideoCommon/FramebufferManager.h
View File

@ -35,7 +35,7 @@ struct fmt::formatter<EFBReinterpretType> : EnumFormatter<EFBReinterpretType::RG
{ {
static constexpr array_type names = {"RGB8 to RGB565", "RGB8 to RGBA6", "RGBA6 to RGB8", static constexpr array_type names = {"RGB8 to RGB565", "RGB8 to RGBA6", "RGBA6 to RGB8",
"RGB6 to RGB565", "RGB565 to RGB8", "RGB565 to RGBA6"}; "RGB6 to RGB565", "RGB565 to RGB8", "RGB565 to RGBA6"};
formatter() : EnumFormatter(names) {} constexpr formatter() : EnumFormatter(names) {}
}; };
inline bool AddressRangesOverlap(u32 aLower, u32 aUpper, u32 bLower, u32 bUpper) inline bool AddressRangesOverlap(u32 aLower, u32 aUpper, u32 bLower, u32 bUpper)

2
Source/Core/VideoCommon/OpcodeDecoding.h
View File

@ -290,5 +290,5 @@ struct fmt::formatter<OpcodeDecoder::Primitive>
"GX_DRAW_TRIANGLE_FAN", "GX_DRAW_LINES", "GX_DRAW_TRIANGLE_FAN", "GX_DRAW_LINES",
"GX_DRAW_LINE_STRIP", "GX_DRAW_POINTS", "GX_DRAW_LINE_STRIP", "GX_DRAW_POINTS",
}; };
formatter() : EnumFormatter(names) {} constexpr formatter() : EnumFormatter(names) {}
}; };

6
Source/Core/VideoCommon/TextureDecoder.h
View File

@ -41,7 +41,7 @@ struct fmt::formatter<TextureFormat> : EnumFormatter<TextureFormat::CMPR>
static constexpr array_type names = {"I4", "I8", "IA4", "IA8", "RGB565", static constexpr array_type names = {"I4", "I8", "IA4", "IA8", "RGB565",
"RGB5A3", "RGBA8", nullptr, "C4", "C8", "RGB5A3", "RGBA8", nullptr, "C4", "C8",
"C14X2", nullptr, nullptr, nullptr, "CMPR"}; "C14X2", nullptr, nullptr, nullptr, "CMPR"};
formatter() : EnumFormatter(names) {} constexpr formatter() : EnumFormatter(names) {}
}; };
static inline bool IsColorIndexed(TextureFormat format) static inline bool IsColorIndexed(TextureFormat format)
@ -103,7 +103,7 @@ struct fmt::formatter<EFBCopyFormat> : EnumFormatter<EFBCopyFormat::GB8>
"R8/I8/Z8H", "G8/Z8M", "B8/Z8L", "RG8/Z16R (Note: G and R are reversed)", "R8/I8/Z8H", "G8/Z8M", "B8/Z8L", "RG8/Z16R (Note: G and R are reversed)",
"GB8/Z16L", "GB8/Z16L",
}; };
formatter() : EnumFormatter(names) {} constexpr formatter() : EnumFormatter(names) {}
}; };
enum class TLUTFormat enum class TLUTFormat
@ -116,7 +116,7 @@ enum class TLUTFormat
template <> template <>
struct fmt::formatter<TLUTFormat> : EnumFormatter<TLUTFormat::RGB5A3> struct fmt::formatter<TLUTFormat> : EnumFormatter<TLUTFormat::RGB5A3>
{ {
formatter() : EnumFormatter({"IA8", "RGB565", "RGB5A3"}) {} constexpr formatter() : EnumFormatter({"IA8", "RGB565", "RGB5A3"}) {}
}; };
static inline bool IsValidTLUTFormat(TLUTFormat tlutfmt) static inline bool IsValidTLUTFormat(TLUTFormat tlutfmt)

20
Source/Core/VideoCommon/XFMemory.h
View File

@ -26,7 +26,7 @@ enum class TexSize : u32
template <> template <>
struct fmt::formatter<TexSize> : EnumFormatter<TexSize::STQ> struct fmt::formatter<TexSize> : EnumFormatter<TexSize::STQ>
{ {
formatter() : EnumFormatter({"ST (2x4 matrix)", "STQ (3x4 matrix)"}) {} constexpr formatter() : EnumFormatter({"ST (2x4 matrix)", "STQ (3x4 matrix)"}) {}
}; };
// Input form // Input form
@ -38,7 +38,7 @@ enum class TexInputForm : u32
template <> template <>
struct fmt::formatter<TexInputForm> : EnumFormatter<TexInputForm::ABC1> struct fmt::formatter<TexInputForm> : EnumFormatter<TexInputForm::ABC1>
{ {
formatter() : EnumFormatter({"AB11", "ABC1"}) {} constexpr formatter() : EnumFormatter({"AB11", "ABC1"}) {}
}; };
enum class NormalCount : u32 enum class NormalCount : u32
@ -50,7 +50,7 @@ enum class NormalCount : u32
template <> template <>
struct fmt::formatter<NormalCount> : EnumFormatter<NormalCount::NormalsBinormals> struct fmt::formatter<NormalCount> : EnumFormatter<NormalCount::NormalsBinormals>
{ {
formatter() : EnumFormatter({"None", "Normals only", "Normals and binormals"}) {} constexpr formatter() : EnumFormatter({"None", "Normals only", "Normals and binormals"}) {}
}; };
// Texture generation type // Texture generation type
@ -70,7 +70,7 @@ struct fmt::formatter<TexGenType> : EnumFormatter<TexGenType::Color1>
"Color channel 0", "Color channel 0",
"Color channel 1", "Color channel 1",
}; };
formatter() : EnumFormatter(names) {} constexpr formatter() : EnumFormatter(names) {}
}; };
// Source row // Source row
@ -108,7 +108,7 @@ struct fmt::formatter<SourceRow> : EnumFormatter<SourceRow::Tex7>
"Tex 6", "Tex 6",
"Tex 7", "Tex 7",
}; };
formatter() : EnumFormatter(names) {} constexpr formatter() : EnumFormatter(names) {}
}; };
enum class MatSource : u32 enum class MatSource : u32
@ -119,7 +119,7 @@ enum class MatSource : u32
template <> template <>
struct fmt::formatter<MatSource> : EnumFormatter<MatSource::Vertex> struct fmt::formatter<MatSource> : EnumFormatter<MatSource::Vertex>
{ {
formatter() : EnumFormatter({"Material color register", "Vertex color"}) {} constexpr formatter() : EnumFormatter({"Material color register", "Vertex color"}) {}
}; };
enum class AmbSource : u32 enum class AmbSource : u32
@ -130,7 +130,7 @@ enum class AmbSource : u32
template <> template <>
struct fmt::formatter<AmbSource> : EnumFormatter<AmbSource::Vertex> struct fmt::formatter<AmbSource> : EnumFormatter<AmbSource::Vertex>
{ {
formatter() : EnumFormatter({"Ambient color register", "Vertex color"}) {} constexpr formatter() : EnumFormatter({"Ambient color register", "Vertex color"}) {}
}; };
// Light diffuse attenuation function // Light diffuse attenuation function
@ -143,7 +143,7 @@ enum class DiffuseFunc : u32
template <> template <>
struct fmt::formatter<DiffuseFunc> : EnumFormatter<DiffuseFunc::Clamp> struct fmt::formatter<DiffuseFunc> : EnumFormatter<DiffuseFunc::Clamp>
{ {
formatter() : EnumFormatter({"None", "Sign", "Clamp"}) {} constexpr formatter() : EnumFormatter({"None", "Sign", "Clamp"}) {}
}; };
// Light attenuation function // Light attenuation function
@ -163,7 +163,7 @@ struct fmt::formatter<AttenuationFunc> : EnumFormatter<AttenuationFunc::Spot>
"Directional light attenuation", "Directional light attenuation",
"Spot light attenuation", "Spot light attenuation",
}; };
formatter() : EnumFormatter(names) {} constexpr formatter() : EnumFormatter(names) {}
}; };
// Projection type // Projection type
@ -175,7 +175,7 @@ enum class ProjectionType : u32
template <> template <>
struct fmt::formatter<ProjectionType> : EnumFormatter<ProjectionType::Orthographic> struct fmt::formatter<ProjectionType> : EnumFormatter<ProjectionType::Orthographic>
{ {
formatter() : EnumFormatter({"Perspective", "Orthographic"}) {} constexpr formatter() : EnumFormatter({"Perspective", "Orthographic"}) {}
}; };
// Registers and register ranges // Registers and register ranges

2
Source/UnitTests/Common/BitFieldTest.cpp
View File

@ -201,7 +201,7 @@ TEST(BitField, Alignment)
template <> template <>
struct fmt::formatter<TestEnum> : EnumFormatter<TestEnum::D> struct fmt::formatter<TestEnum> : EnumFormatter<TestEnum::D>
{ {
formatter() : EnumFormatter({"A", "B", "C", "D"}) {} constexpr formatter() : EnumFormatter({"A", "B", "C", "D"}) {}
}; };
// Test behavior of using BitFields with fmt // Test behavior of using BitFields with fmt

4
Source/UnitTests/Common/EnumFormatterTest.cpp
View File

@ -16,7 +16,7 @@ enum class Enum1 : u32
template <> template <>
struct fmt::formatter<Enum1> : EnumFormatter<Enum1::C> struct fmt::formatter<Enum1> : EnumFormatter<Enum1::C>
{ {
formatter() : EnumFormatter({"A", "B", "C"}) {} constexpr formatter() : EnumFormatter({"A", "B", "C"}) {}
}; };
enum class Enum2 : s32 enum class Enum2 : s32
@ -30,7 +30,7 @@ template <>
struct fmt::formatter<Enum2> : EnumFormatter<Enum2::F> struct fmt::formatter<Enum2> : EnumFormatter<Enum2::F>
{ {
static constexpr array_type names = {"D", "E", nullptr, "F"}; static constexpr array_type names = {"D", "E", nullptr, "F"};
formatter() : EnumFormatter(names) {} constexpr formatter() : EnumFormatter(names) {}
}; };
TEST(EnumUtil, Enum1) TEST(EnumUtil, Enum1)