chaphidoesstuff/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

logging: adapt to changes in fmt 8.1

Browse source
This commit is contained in:
liushuyu 2022-01-08 01:48:53 -07:00
parent 26f4e92c1f
commit 42f653ab6f
No known key found for this signature in database
GPG key ID: 23D1CE4534419437
3 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/common/logging/log.h
View file

@ -6,11 +6,24 @@
#include <algorithm> #include <algorithm>
#include <string_view> #include <string_view>
#include <type_traits>
#include <fmt/core.h> #include <fmt/format.h>
#include "common/logging/types.h" #include "common/logging/types.h"
// adapted from https://github.com/fmtlib/fmt/issues/2704
// a generic formatter for enum classes (<= 32 bits)
#if FMT_VERSION >= 80100
template <typename T>
struct fmt::formatter<T, std::enable_if_t<std::is_enum_v<T>, char>> : formatter<u32> {
template <typename FormatContext>
auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) {
return fmt::formatter<u32>::format(static_cast<u32>(value), ctx);
}
};
#endif
namespace Common::Log { namespace Common::Log {
// trims up to and including the last of ../, ..\, src/, src\ in a string // trims up to and including the last of ../, ..\, src/, src\ in a string

8
src/shader_recompiler/backend/glasm/reg_alloc.h
View file

@ -235,7 +235,7 @@ struct fmt::formatter<Shader::Backend::GLASM::ScalarU32> {
case Shader::Backend::GLASM::Type::U64: case Shader::Backend::GLASM::Type::U64:
break; break;
} }
throw Shader::InvalidArgument("Invalid value type {}", value.type); throw Shader::InvalidArgument("Invalid value type {}", static_cast<u32>(value.type));
} }
}; };
@ -256,7 +256,7 @@ struct fmt::formatter<Shader::Backend::GLASM::ScalarS32> {
case Shader::Backend::GLASM::Type::U64: case Shader::Backend::GLASM::Type::U64:
break; break;
} }
throw Shader::InvalidArgument("Invalid value type {}", value.type); throw Shader::InvalidArgument("Invalid value type {}", static_cast<u32>(value.type));
} }
}; };
@ -277,7 +277,7 @@ struct fmt::formatter<Shader::Backend::GLASM::ScalarF32> {
case Shader::Backend::GLASM::Type::U64: case Shader::Backend::GLASM::Type::U64:
break; break;
} }
throw Shader::InvalidArgument("Invalid value type {}", value.type); throw Shader::InvalidArgument("Invalid value type {}", static_cast<u32>(value.type));
} }
}; };
@ -298,6 +298,6 @@ struct fmt::formatter<Shader::Backend::GLASM::ScalarF64> {
case Shader::Backend::GLASM::Type::U64: case Shader::Backend::GLASM::Type::U64:
return fmt::format_to(ctx.out(), "{}", Common::BitCast<f64>(value.imm_u64)); return fmt::format_to(ctx.out(), "{}", Common::BitCast<f64>(value.imm_u64));
} }
throw Shader::InvalidArgument("Invalid value type {}", value.type); throw Shader::InvalidArgument("Invalid value type {}", static_cast<u32>(value.type));
} }
}; };

4
src/shader_recompiler/frontend/ir/patch.cpp
View file

@ -13,14 +13,14 @@ bool IsGeneric(Patch patch) noexcept {
u32 GenericPatchIndex(Patch patch) { u32 GenericPatchIndex(Patch patch) {
if (!IsGeneric(patch)) { if (!IsGeneric(patch)) {
throw InvalidArgument("Patch {} is not generic", patch); throw InvalidArgument("Patch {} is not generic", static_cast<u64>(patch));
} }
return (static_cast<u32>(patch) - static_cast<u32>(Patch::Component0)) / 4; return (static_cast<u32>(patch) - static_cast<u32>(Patch::Component0)) / 4;
} }
u32 GenericPatchElement(Patch patch) { u32 GenericPatchElement(Patch patch) {
if (!IsGeneric(patch)) { if (!IsGeneric(patch)) {
throw InvalidArgument("Patch {} is not generic", patch); throw InvalidArgument("Patch {} is not generic", static_cast<u64>(patch));
} }
return (static_cast<u32>(patch) - static_cast<u32>(Patch::Component0)) % 4; return (static_cast<u32>(patch) - static_cast<u32>(Patch::Component0)) % 4;
} }