diff options
| -rw-r--r-- | src/common/logging/log.h | 15 | ||||
| -rw-r--r-- | src/shader_recompiler/backend/glasm/reg_alloc.h | 8 | ||||
| -rw-r--r-- | src/shader_recompiler/frontend/ir/patch.cpp | 4 |
3 files changed, 20 insertions, 7 deletions
diff --git a/src/common/logging/log.h b/src/common/logging/log.h index c186d55ef..b6a14972f 100644 --- a/src/common/logging/log.h +++ b/src/common/logging/log.h @@ -6,11 +6,24 @@ #include <algorithm> #include <string_view> +#include <type_traits> -#include <fmt/core.h> +#include <fmt/format.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 { // trims up to and including the last of ../, ..\, src/, src\ in a string diff --git a/src/shader_recompiler/backend/glasm/reg_alloc.h b/src/shader_recompiler/backend/glasm/reg_alloc.h index 82aec66c6..812d3cdbc 100644 --- a/src/shader_recompiler/backend/glasm/reg_alloc.h +++ b/src/shader_recompiler/backend/glasm/reg_alloc.h @@ -235,7 +235,7 @@ struct fmt::formatter<Shader::Backend::GLASM::ScalarU32> { case Shader::Backend::GLASM::Type::U64: 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: 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: 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: 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)); } }; diff --git a/src/shader_recompiler/frontend/ir/patch.cpp b/src/shader_recompiler/frontend/ir/patch.cpp index 4c956a970..d8730284e 100644 --- a/src/shader_recompiler/frontend/ir/patch.cpp +++ b/src/shader_recompiler/frontend/ir/patch.cpp @@ -13,14 +13,14 @@ bool IsGeneric(Patch patch) noexcept { u32 GenericPatchIndex(Patch 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; } u32 GenericPatchElement(Patch 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; } |