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

Make all custom fmt::formatter's format functions const 

fmt 8.0.0 requires this.
This commit is contained in:
Pokechu22 2022-01-12 17:16:29 -08:00
parent cc592ab814
commit 78e43a4404
11 changed files with 63 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Common/BitField.h
View File

@ -193,7 +193,7 @@ struct fmt::formatter<BitField<position, bits, T, S>>
fmt::formatter<T> m_formatter; fmt::formatter<T> m_formatter;
constexpr auto parse(format_parse_context& ctx) { return m_formatter.parse(ctx); } constexpr auto parse(format_parse_context& ctx) { return m_formatter.parse(ctx); }
template <typename FormatContext> template <typename FormatContext>
auto format(const BitField<position, bits, T, S>& bitfield, FormatContext& ctx) auto format(const BitField<position, bits, T, S>& bitfield, FormatContext& ctx) const
{ {
return m_formatter.format(bitfield.Value(), ctx); return m_formatter.format(bitfield.Value(), ctx);
} }
@ -479,7 +479,7 @@ struct fmt::formatter<BitFieldArrayRef<position, bits, size, T, S>>
fmt::formatter<T> m_formatter; fmt::formatter<T> m_formatter;
constexpr auto parse(format_parse_context& ctx) { return m_formatter.parse(ctx); } constexpr auto parse(format_parse_context& ctx) { return m_formatter.parse(ctx); }
template <typename FormatContext> template <typename FormatContext>
auto format(const BitFieldArrayRef<position, bits, size, T, S>& ref, FormatContext& ctx) auto format(const BitFieldArrayRef<position, bits, size, T, S>& ref, FormatContext& ctx) const
{ {
return m_formatter.format(ref.Value(), ctx); return m_formatter.format(ref.Value(), ctx);
} }
@ -491,7 +491,8 @@ struct fmt::formatter<BitFieldArrayConstRef<position, bits, size, T, S>>
fmt::formatter<T> m_formatter; fmt::formatter<T> m_formatter;
constexpr auto parse(format_parse_context& ctx) { return m_formatter.parse(ctx); } constexpr auto parse(format_parse_context& ctx) { return m_formatter.parse(ctx); }
template <typename FormatContext> template <typename FormatContext>
auto format(const BitFieldArrayConstRef<position, bits, size, T, S>& ref, FormatContext& ctx) auto format(const BitFieldArrayConstRef<position, bits, size, T, S>& ref,
FormatContext& ctx) const
{ {
return m_formatter.format(ref.Value(), ctx); return m_formatter.format(ref.Value(), ctx);
} }

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

@ -62,7 +62,7 @@ public:
} }
template <typename FormatContext> template <typename FormatContext>
auto format(const T& e, FormatContext& ctx) auto format(const T& e, FormatContext& ctx) const
{ {
const auto value_s = static_cast<std::underlying_type_t<T>>(e); // Possibly signed const auto value_s = static_cast<std::underlying_type_t<T>>(e); // Possibly signed
const auto value_u = static_cast<std::make_unsigned_t<T>>(value_s); // Always unsigned const auto value_u = static_cast<std::make_unsigned_t<T>>(value_s); // Always unsigned

2
Source/Core/Common/HRWrap.h
View File

@ -25,7 +25,7 @@ struct fmt::formatter<Common::HRWrap>
{ {
constexpr auto parse(fmt::format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(fmt::format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const Common::HRWrap& hr, FormatContext& ctx) auto format(const Common::HRWrap& hr, FormatContext& ctx) const
{ {
return fmt::format_to(ctx.out(), "{} ({:#010x})", Common::GetHResultMessage(hr.m_hr), return fmt::format_to(ctx.out(), "{} ({:#010x})", Common::GetHResultMessage(hr.m_hr),
static_cast<u32>(hr.m_hr)); static_cast<u32>(hr.m_hr));

2
Source/Core/VideoBackends/D3D/D3DBase.h
View File

@ -57,7 +57,7 @@ struct fmt::formatter<DX11::DX11HRWrap>
{ {
constexpr auto parse(fmt::format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(fmt::format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const DX11::DX11HRWrap& hr, FormatContext& ctx) auto format(const DX11::DX11HRWrap& hr, FormatContext& ctx) const
{ {
if (hr.m_hr == DXGI_ERROR_DEVICE_REMOVED && DX11::D3D::device != nullptr) if (hr.m_hr == DXGI_ERROR_DEVICE_REMOVED && DX11::D3D::device != nullptr)
{ {

2
Source/Core/VideoBackends/D3D12/DX12Context.h
View File

@ -205,7 +205,7 @@ struct fmt::formatter<DX12::DX12HRWrap>
{ {
constexpr auto parse(fmt::format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(fmt::format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const DX12::DX12HRWrap& hr, FormatContext& ctx) auto format(const DX12::DX12HRWrap& hr, FormatContext& ctx) const
{ {
if (hr.m_hr == DXGI_ERROR_DEVICE_REMOVED && DX12::g_dx_context != nullptr && if (hr.m_hr == DXGI_ERROR_DEVICE_REMOVED && DX12::g_dx_context != nullptr &&
DX12::g_dx_context->GetDevice() != nullptr) DX12::g_dx_context->GetDevice() != nullptr)

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

@ -367,7 +367,7 @@ struct fmt::formatter<IND_MTXA>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const IND_MTXA& col, FormatContext& ctx) auto format(const IND_MTXA& col, FormatContext& ctx) const
{ {
return format_to(ctx.out(), return format_to(ctx.out(),
"Row 0 (ma): {} ({})\n" "Row 0 (ma): {} ({})\n"
@ -389,7 +389,7 @@ struct fmt::formatter<IND_MTXB>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const IND_MTXB& col, FormatContext& ctx) auto format(const IND_MTXB& col, FormatContext& ctx) const
{ {
return format_to(ctx.out(), return format_to(ctx.out(),
"Row 0 (mc): {} ({})\n" "Row 0 (mc): {} ({})\n"
@ -414,7 +414,7 @@ struct fmt::formatter<IND_MTXC>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const IND_MTXC& col, FormatContext& ctx) auto format(const IND_MTXC& col, FormatContext& ctx) const
{ {
return format_to(ctx.out(), return format_to(ctx.out(),
"Row 0 (me): {} ({})\n" "Row 0 (me): {} ({})\n"
@ -489,7 +489,7 @@ struct fmt::formatter<TevStageCombiner::ColorCombiner>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const TevStageCombiner::ColorCombiner& cc, FormatContext& ctx) auto format(const TevStageCombiner::ColorCombiner& cc, FormatContext& ctx) const
{ {
auto out = ctx.out(); auto out = ctx.out();
if (cc.bias != TevBias::Compare) if (cc.bias != TevBias::Compare)
@ -598,7 +598,7 @@ struct fmt::formatter<TevStageCombiner::AlphaCombiner>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const TevStageCombiner::AlphaCombiner& ac, FormatContext& ctx) auto format(const TevStageCombiner::AlphaCombiner& ac, FormatContext& ctx) const
{ {
auto out = ctx.out(); auto out = ctx.out();
if (ac.bias != TevBias::Compare) if (ac.bias != TevBias::Compare)
@ -737,7 +737,7 @@ struct fmt::formatter<TevStageIndirect>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const TevStageIndirect& tevind, FormatContext& ctx) auto format(const TevStageIndirect& tevind, FormatContext& ctx) const
{ {
return format_to(ctx.out(), return format_to(ctx.out(),
"Indirect tex stage ID: {}\n" "Indirect tex stage ID: {}\n"
@ -797,7 +797,7 @@ struct fmt::formatter<TwoTevStageOrders>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const TwoTevStageOrders& stages, FormatContext& ctx) auto format(const TwoTevStageOrders& stages, FormatContext& ctx) const
{ {
return format_to(ctx.out(), return format_to(ctx.out(),
"Stage 0 texmap: {}\nStage 0 tex coord: {}\n" "Stage 0 texmap: {}\nStage 0 tex coord: {}\n"
@ -823,7 +823,7 @@ struct fmt::formatter<TEXSCALE>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const TEXSCALE& scale, FormatContext& ctx) auto format(const TEXSCALE& scale, FormatContext& ctx) const
{ {
return format_to(ctx.out(), return format_to(ctx.out(),
"Even stage S scale: {} ({})\n" "Even stage S scale: {} ({})\n"
@ -855,7 +855,7 @@ struct fmt::formatter<RAS1_IREF>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const RAS1_IREF& indref, FormatContext& ctx) auto format(const RAS1_IREF& indref, FormatContext& ctx) const
{ {
// The field names here are suspicious, since there is no bi3 or bc2 // The field names here are suspicious, since there is no bi3 or bc2
return format_to(ctx.out(), return format_to(ctx.out(),
@ -947,7 +947,7 @@ struct fmt::formatter<TexMode0>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const TexMode0& mode, FormatContext& ctx) auto format(const TexMode0& mode, FormatContext& ctx) const
{ {
return format_to(ctx.out(), return format_to(ctx.out(),
"Wrap S: {}\n" "Wrap S: {}\n"
@ -976,7 +976,7 @@ struct fmt::formatter<TexMode1>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const TexMode1& mode, FormatContext& ctx) auto format(const TexMode1& mode, FormatContext& ctx) const
{ {
return format_to(ctx.out(), "Min LOD: {} ({})\nMax LOD: {} ({})", mode.min_lod, return format_to(ctx.out(), "Min LOD: {} ({})\nMax LOD: {} ({})", mode.min_lod,
mode.min_lod / 16.f, mode.max_lod, mode.max_lod / 16.f); mode.min_lod / 16.f, mode.max_lod, mode.max_lod / 16.f);
@ -995,7 +995,7 @@ struct fmt::formatter<TexImage0>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const TexImage0& teximg, FormatContext& ctx) auto format(const TexImage0& teximg, FormatContext& ctx) const
{ {
return format_to(ctx.out(), return format_to(ctx.out(),
"Width: {}\n" "Width: {}\n"
@ -1020,7 +1020,7 @@ struct fmt::formatter<TexImage1>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const TexImage1& teximg, FormatContext& ctx) auto format(const TexImage1& teximg, FormatContext& ctx) const
{ {
return format_to(ctx.out(), return format_to(ctx.out(),
"Even TMEM Offset: {:x}\n" "Even TMEM Offset: {:x}\n"
@ -1044,7 +1044,7 @@ struct fmt::formatter<TexImage2>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const TexImage2& teximg, FormatContext& ctx) auto format(const TexImage2& teximg, FormatContext& ctx) const
{ {
return format_to(ctx.out(), return format_to(ctx.out(),
"Odd TMEM Offset: {:x}\n" "Odd TMEM Offset: {:x}\n"
@ -1064,7 +1064,7 @@ struct fmt::formatter<TexImage3>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const TexImage3& teximg, FormatContext& ctx) auto format(const TexImage3& teximg, FormatContext& ctx) const
{ {
return format_to(ctx.out(), "Source address (32 byte aligned): 0x{:06X}", return format_to(ctx.out(), "Source address (32 byte aligned): 0x{:06X}",
teximg.image_base << 5); teximg.image_base << 5);
@ -1082,7 +1082,7 @@ struct fmt::formatter<TexTLUT>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const TexTLUT& tlut, FormatContext& ctx) auto format(const TexTLUT& tlut, FormatContext& ctx) const
{ {
return format_to(ctx.out(), "Address: {:08x}\nFormat: {}", tlut.tmem_offset << 9, return format_to(ctx.out(), "Address: {:08x}\nFormat: {}", tlut.tmem_offset << 9,
tlut.tlut_format); tlut.tlut_format);
@ -1106,7 +1106,7 @@ struct fmt::formatter<ZTex2>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const ZTex2& ztex2, FormatContext& ctx) auto format(const ZTex2& ztex2, FormatContext& ctx) const
{ {
return format_to(ctx.out(), "Type: {}\nOperation: {}", ztex2.type, ztex2.op); return format_to(ctx.out(), "Type: {}\nOperation: {}", ztex2.type, ztex2.op);
} }
@ -1153,7 +1153,7 @@ struct fmt::formatter<GenMode>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const GenMode& mode, FormatContext& ctx) auto format(const GenMode& mode, FormatContext& ctx) const
{ {
return format_to(ctx.out(), return format_to(ctx.out(),
"Num tex gens: {}\n" "Num tex gens: {}\n"
@ -1198,7 +1198,7 @@ struct fmt::formatter<LPSize>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const LPSize& lp, FormatContext& ctx) auto format(const LPSize& lp, FormatContext& ctx) const
{ {
return format_to(ctx.out(), return format_to(ctx.out(),
"Line size: {} ({:.3} pixels)\n" "Line size: {} ({:.3} pixels)\n"
@ -1333,7 +1333,7 @@ struct fmt::formatter<BlendMode>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const BlendMode& mode, FormatContext& ctx) auto format(const BlendMode& mode, FormatContext& ctx) const
{ {
static constexpr std::array<const char*, 2> no_yes = {"No", "Yes"}; static constexpr std::array<const char*, 2> no_yes = {"No", "Yes"};
return format_to(ctx.out(), return format_to(ctx.out(),
@ -1366,7 +1366,7 @@ struct fmt::formatter<FogParam0>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const FogParam0& param, FormatContext& ctx) auto format(const FogParam0& param, FormatContext& ctx) const
{ {
return format_to(ctx.out(), "A value: {}\nMantissa: {}\nExponent: {}\nSign: {}", return format_to(ctx.out(), "A value: {}\nMantissa: {}\nExponent: {}\nSign: {}",
param.FloatValue(), param.mant, param.exp, param.sign ? '-' : '+'); param.FloatValue(), param.mant, param.exp, param.sign ? '-' : '+');
@ -1425,7 +1425,7 @@ struct fmt::formatter<FogParam3>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const FogParam3& param, FormatContext& ctx) auto format(const FogParam3& param, FormatContext& ctx) const
{ {
return format_to(ctx.out(), return format_to(ctx.out(),
"C value: {}\nMantissa: {}\nExponent: {}\nSign: {}\nProjection: {}\nFsel: {}", "C value: {}\nMantissa: {}\nExponent: {}\nSign: {}\nProjection: {}\nFsel: {}",
@ -1460,7 +1460,7 @@ struct fmt::formatter<FogRangeParams::RangeBase>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const FogRangeParams::RangeBase& range, FormatContext& ctx) auto format(const FogRangeParams::RangeBase& range, FormatContext& ctx) const
{ {
return format_to(ctx.out(), "Center: {}\nEnabled: {}", range.Center, return format_to(ctx.out(), "Center: {}\nEnabled: {}", range.Center,
range.Enabled ? "Yes" : "No"); range.Enabled ? "Yes" : "No");
@ -1471,7 +1471,7 @@ struct fmt::formatter<FogRangeKElement>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const FogRangeKElement& range, FormatContext& ctx) auto format(const FogRangeKElement& range, FormatContext& ctx) const
{ {
return format_to(ctx.out(), "High: {}\nLow: {}", range.HI, range.LO); return format_to(ctx.out(), "High: {}\nLow: {}", range.HI, range.LO);
} }
@ -1507,7 +1507,7 @@ struct fmt::formatter<FogParams::FogColor>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const FogParams::FogColor& color, FormatContext& ctx) auto format(const FogParams::FogColor& color, FormatContext& ctx) const
{ {
return format_to(ctx.out(), "Red: {}\nGreen: {}\nBlue: {}", color.r, color.g, color.b); return format_to(ctx.out(), "Red: {}\nGreen: {}\nBlue: {}", color.r, color.g, color.b);
} }
@ -1545,7 +1545,7 @@ struct fmt::formatter<ZMode>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const ZMode& mode, FormatContext& ctx) auto format(const ZMode& mode, FormatContext& ctx) const
{ {
return format_to(ctx.out(), return format_to(ctx.out(),
"Enable test: {}\n" "Enable test: {}\n"
@ -1566,7 +1566,7 @@ struct fmt::formatter<ConstantAlpha>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const ConstantAlpha& c, FormatContext& ctx) auto format(const ConstantAlpha& c, FormatContext& ctx) const
{ {
return format_to(ctx.out(), return format_to(ctx.out(),
"Enable: {}\n" "Enable: {}\n"
@ -1586,7 +1586,7 @@ struct fmt::formatter<FieldMode>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const FieldMode& mode, FormatContext& ctx) auto format(const FieldMode& mode, FormatContext& ctx) const
{ {
return format_to(ctx.out(), "Adjust vertex tex LOD computation to account for interlacing: {}", return format_to(ctx.out(), "Adjust vertex tex LOD computation to account for interlacing: {}",
mode.texLOD); mode.texLOD);
@ -1616,7 +1616,7 @@ struct fmt::formatter<FieldMask>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const FieldMask& mask, FormatContext& ctx) auto format(const FieldMask& mask, FormatContext& ctx) const
{ {
return format_to(ctx.out(), "Odd field: {}\nEven field: {}", mask.odd, mask.even); return format_to(ctx.out(), "Odd field: {}\nEven field: {}", mask.odd, mask.even);
} }
@ -1678,7 +1678,7 @@ struct fmt::formatter<PEControl>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const PEControl& config, FormatContext& ctx) auto format(const PEControl& config, FormatContext& ctx) const
{ {
return format_to(ctx.out(), return format_to(ctx.out(),
"EFB pixel format: {}\n" "EFB pixel format: {}\n"
@ -1705,7 +1705,7 @@ struct fmt::formatter<TCInfo>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const TCInfo& info, FormatContext& ctx) auto format(const TCInfo& info, FormatContext& ctx) const
{ {
return format_to(ctx.out(), return format_to(ctx.out(),
"Scale: {}\n" "Scale: {}\n"
@ -1764,7 +1764,7 @@ struct fmt::formatter<TevReg::RA>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const TevReg::RA& ra, FormatContext& ctx) auto format(const TevReg::RA& ra, FormatContext& ctx) const
{ {
return format_to(ctx.out(), "Type: {}\nAlpha: {:03x}\nRed: {:03x}", ra.type, ra.alpha, ra.red); return format_to(ctx.out(), "Type: {}\nAlpha: {:03x}\nRed: {:03x}", ra.type, ra.alpha, ra.red);
} }
@ -1774,7 +1774,7 @@ struct fmt::formatter<TevReg::BG>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const TevReg::BG& bg, FormatContext& ctx) auto format(const TevReg::BG& bg, FormatContext& ctx) const
{ {
return format_to(ctx.out(), "Type: {}\nGreen: {:03x}\nBlue: {:03x}", bg.type, bg.green, return format_to(ctx.out(), "Type: {}\nGreen: {:03x}\nBlue: {:03x}", bg.type, bg.green,
bg.blue); bg.blue);
@ -1785,7 +1785,7 @@ struct fmt::formatter<TevReg>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const TevReg& reg, FormatContext& ctx) auto format(const TevReg& reg, FormatContext& ctx) const
{ {
return format_to(ctx.out(), "{}\n{}", reg.ra, reg.bg); return format_to(ctx.out(), "{}\n{}", reg.ra, reg.bg);
} }
@ -1881,7 +1881,7 @@ struct fmt::formatter<TevKSel>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const TevKSel& ksel, FormatContext& ctx) auto format(const TevKSel& ksel, FormatContext& ctx) const
{ {
return format_to(ctx.out(), return format_to(ctx.out(),
"Swap 1: {}\nSwap 2: {}\nColor sel 0: {}\nAlpha sel 0: {}\n" "Swap 1: {}\nSwap 2: {}\nColor sel 0: {}\nAlpha sel 0: {}\n"
@ -1967,7 +1967,7 @@ struct fmt::formatter<AlphaTest>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const AlphaTest& test, FormatContext& ctx) auto format(const AlphaTest& test, FormatContext& ctx) const
{ {
return format_to(ctx.out(), return format_to(ctx.out(),
"Test 1: {} (ref: 0x{:02x})\n" "Test 1: {} (ref: 0x{:02x})\n"
@ -2022,7 +2022,7 @@ struct fmt::formatter<UPE_Copy>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const UPE_Copy& copy, FormatContext& ctx) auto format(const UPE_Copy& copy, FormatContext& ctx) const
{ {
static constexpr std::array<const char*, 2> no_yes = {"No", "Yes"}; static constexpr std::array<const char*, 2> no_yes = {"No", "Yes"};
std::string_view clamp; std::string_view clamp;
@ -2111,7 +2111,7 @@ struct fmt::formatter<BPU_PreloadTileInfo>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const BPU_PreloadTileInfo& info, FormatContext& ctx) auto format(const BPU_PreloadTileInfo& info, FormatContext& ctx) const
{ {
return format_to(ctx.out(), "Type: {}\nCount: {}", info.type, info.count); return format_to(ctx.out(), "Type: {}\nCount: {}", info.type, info.count);
} }

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

@ -258,7 +258,7 @@ struct fmt::formatter<TVtxDesc::Low>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const TVtxDesc::Low& desc, FormatContext& ctx) auto format(const TVtxDesc::Low& desc, FormatContext& ctx) const
{ {
static constexpr std::array<const char*, 2> present = {"Not present", "Present"}; static constexpr std::array<const char*, 2> present = {"Not present", "Present"};
@ -287,7 +287,7 @@ struct fmt::formatter<TVtxDesc::High>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const TVtxDesc::High& desc, FormatContext& ctx) auto format(const TVtxDesc::High& desc, FormatContext& ctx) const
{ {
return format_to(ctx.out(), return format_to(ctx.out(),
"Texture Coord 0: {}\n" "Texture Coord 0: {}\n"
@ -307,7 +307,7 @@ struct fmt::formatter<TVtxDesc>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const TVtxDesc& desc, FormatContext& ctx) auto format(const TVtxDesc& desc, FormatContext& ctx) const
{ {
return format_to(ctx.out(), "{}\n{}", desc.low, desc.high); return format_to(ctx.out(), "{}\n{}", desc.low, desc.high);
} }
@ -342,7 +342,7 @@ struct fmt::formatter<UVAT_group0>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const UVAT_group0& g0, FormatContext& ctx) auto format(const UVAT_group0& g0, FormatContext& ctx) const
{ {
static constexpr std::array<const char*, 2> byte_dequant = { static constexpr std::array<const char*, 2> byte_dequant = {
"shift does not apply to u8/s8 components", "shift applies to u8/s8 components"}; "shift does not apply to u8/s8 components", "shift applies to u8/s8 components"};
@ -398,7 +398,7 @@ struct fmt::formatter<UVAT_group1>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const UVAT_group1& g1, FormatContext& ctx) auto format(const UVAT_group1& g1, FormatContext& ctx) const
{ {
return format_to(ctx.out(), return format_to(ctx.out(),
"Texture coord 1 elements: {}\n" "Texture coord 1 elements: {}\n"
@ -444,7 +444,7 @@ struct fmt::formatter<UVAT_group2>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const UVAT_group2& g2, FormatContext& ctx) auto format(const UVAT_group2& g2, FormatContext& ctx) const
{ {
return format_to(ctx.out(), return format_to(ctx.out(),
"Texture coord 4 shift: {} ({})\n" "Texture coord 4 shift: {} ({})\n"
@ -578,7 +578,7 @@ struct fmt::formatter<VAT>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const VAT& vat, FormatContext& ctx) auto format(const VAT& vat, FormatContext& ctx) const
{ {
return format_to(ctx.out(), "{}\n{}\n{}", vat.g0, vat.g1, vat.g2); return format_to(ctx.out(), "{}\n{}\n{}", vat.g0, vat.g1, vat.g2);
} }
@ -599,7 +599,7 @@ struct fmt::formatter<TMatrixIndexA>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const TMatrixIndexA& m, FormatContext& ctx) auto format(const TMatrixIndexA& m, FormatContext& ctx) const
{ {
return format_to(ctx.out(), "PosNormal: {}\nTex0: {}\nTex1: {}\nTex2: {}\nTex3: {}", return format_to(ctx.out(), "PosNormal: {}\nTex0: {}\nTex1: {}\nTex2: {}\nTex3: {}",
m.PosNormalMtxIdx, m.Tex0MtxIdx, m.Tex1MtxIdx, m.Tex2MtxIdx, m.Tex3MtxIdx); m.PosNormalMtxIdx, m.Tex0MtxIdx, m.Tex1MtxIdx, m.Tex2MtxIdx, m.Tex3MtxIdx);
@ -619,7 +619,7 @@ struct fmt::formatter<TMatrixIndexB>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const TMatrixIndexB& m, FormatContext& ctx) auto format(const TMatrixIndexB& m, FormatContext& ctx) const
{ {
return format_to(ctx.out(), "Tex4: {}\nTex5: {}\nTex6: {}\nTex7: {}", m.Tex4MtxIdx, return format_to(ctx.out(), "Tex4: {}\nTex5: {}\nTex6: {}\nTex7: {}", m.Tex4MtxIdx,
m.Tex5MtxIdx, m.Tex6MtxIdx, m.Tex7MtxIdx); m.Tex5MtxIdx, m.Tex6MtxIdx, m.Tex7MtxIdx);

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

@ -36,7 +36,7 @@ struct fmt::formatter<geometry_shader_uid_data>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const geometry_shader_uid_data& uid, FormatContext& ctx) auto format(const geometry_shader_uid_data& uid, FormatContext& ctx) const
{ {
return format_to(ctx.out(), "passthrough: {}, {} tex gens, primitive type {}", return format_to(ctx.out(), "passthrough: {}, {} tex gens, primitive type {}",
uid.IsPassthrough(), uid.numTexGens, uid.primitive_type); uid.IsPassthrough(), uid.numTexGens, uid.primitive_type);

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

@ -77,7 +77,7 @@ struct fmt::formatter<EFBCopyParams>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const EFBCopyParams& uid, FormatContext& ctx) auto format(const EFBCopyParams& uid, FormatContext& ctx) const
{ {
std::string copy_format; std::string copy_format;
if (uid.copy_format == EFBCopyFormat::XFB) if (uid.copy_format == EFBCopyFormat::XFB)

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

@ -44,7 +44,7 @@ struct fmt::formatter<TextureConversionShaderGen::UidData>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const TextureConversionShaderGen::UidData& uid, FormatContext& ctx) auto format(const TextureConversionShaderGen::UidData& uid, FormatContext& ctx) const
{ {
std::string dst_format; std::string dst_format;
if (uid.dst_format == EFBCopyFormat::XFB) if (uid.dst_format == EFBCopyFormat::XFB)

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

@ -254,7 +254,7 @@ struct fmt::formatter<LitChannel>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const LitChannel& chan, FormatContext& ctx) auto format(const LitChannel& chan, FormatContext& ctx) const
{ {
return format_to(ctx.out(), return format_to(ctx.out(),
"Material source: {0}\nEnable lighting: {1}\nLight mask: {2:x} ({2:08b})\n" "Material source: {0}\nEnable lighting: {1}\nLight mask: {2:x} ({2:08b})\n"
@ -276,7 +276,7 @@ struct fmt::formatter<ClipDisable>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const ClipDisable& cd, FormatContext& ctx) auto format(const ClipDisable& cd, FormatContext& ctx) const
{ {
return format_to(ctx.out(), return format_to(ctx.out(),
"Disable clipping detection: {}\n" "Disable clipping detection: {}\n"
@ -300,7 +300,7 @@ struct fmt::formatter<INVTXSPEC>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const INVTXSPEC& spec, FormatContext& ctx) auto format(const INVTXSPEC& spec, FormatContext& ctx) const
{ {
return format_to(ctx.out(), "Num colors: {}\nNum normals: {}\nNum textures: {}", spec.numcolors, return format_to(ctx.out(), "Num colors: {}\nNum normals: {}\nNum textures: {}", spec.numcolors,
spec.numnormals, spec.numtextures); spec.numnormals, spec.numtextures);
@ -324,7 +324,7 @@ struct fmt::formatter<TexMtxInfo>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const TexMtxInfo& i, FormatContext& ctx) auto format(const TexMtxInfo& i, FormatContext& ctx) const
{ {
return format_to(ctx.out(), return format_to(ctx.out(),
"Projection: {}\nInput form: {}\nTex gen type: {}\n" "Projection: {}\nInput form: {}\nTex gen type: {}\n"
@ -347,7 +347,7 @@ struct fmt::formatter<PostMtxInfo>
{ {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext> template <typename FormatContext>
auto format(const PostMtxInfo& i, FormatContext& ctx) auto format(const PostMtxInfo& i, FormatContext& ctx) const
{ {
return format_to(ctx.out(), "Index: {}\nNormalize before send operation: {}", i.index, return format_to(ctx.out(), "Index: {}\nNormalize before send operation: {}", i.index,
i.normalize ? "Yes" : "No"); i.normalize ? "Yes" : "No");