From 42f653ab6fc8ab07ba0db4ffb4d2b0267115a588 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Sat, 8 Jan 2022 01:48:53 -0700 Subject: [PATCH 1/4] logging: adapt to changes in fmt 8.1 --- src/common/logging/log.h | 15 ++++++++++++++- src/shader_recompiler/backend/glasm/reg_alloc.h | 8 ++++---- 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 c186d55ef6..b6a14972f4 100644 --- a/src/common/logging/log.h +++ b/src/common/logging/log.h @@ -6,11 +6,24 @@ #include #include +#include -#include +#include #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 +struct fmt::formatter, char>> : formatter { + template + auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) { + return fmt::formatter::format(static_cast(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 82aec66c64..812d3cdbcc 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 { case Shader::Backend::GLASM::Type::U64: break; } - throw Shader::InvalidArgument("Invalid value type {}", value.type); + throw Shader::InvalidArgument("Invalid value type {}", static_cast(value.type)); } }; @@ -256,7 +256,7 @@ struct fmt::formatter { case Shader::Backend::GLASM::Type::U64: break; } - throw Shader::InvalidArgument("Invalid value type {}", value.type); + throw Shader::InvalidArgument("Invalid value type {}", static_cast(value.type)); } }; @@ -277,7 +277,7 @@ struct fmt::formatter { case Shader::Backend::GLASM::Type::U64: break; } - throw Shader::InvalidArgument("Invalid value type {}", value.type); + throw Shader::InvalidArgument("Invalid value type {}", static_cast(value.type)); } }; @@ -298,6 +298,6 @@ struct fmt::formatter { case Shader::Backend::GLASM::Type::U64: return fmt::format_to(ctx.out(), "{}", Common::BitCast(value.imm_u64)); } - throw Shader::InvalidArgument("Invalid value type {}", value.type); + throw Shader::InvalidArgument("Invalid value type {}", static_cast(value.type)); } }; diff --git a/src/shader_recompiler/frontend/ir/patch.cpp b/src/shader_recompiler/frontend/ir/patch.cpp index 4c956a970b..d8730284ed 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(patch)); } return (static_cast(patch) - static_cast(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(patch)); } return (static_cast(patch) - static_cast(Patch::Component0)) % 4; } From 099dd0c0d299d0f3541221928814e9001a69623a Mon Sep 17 00:00:00 2001 From: liushuyu Date: Sat, 8 Jan 2022 16:02:49 -0700 Subject: [PATCH 2/4] logging/log: use `underlying_type` instead of hardcoding types --- src/common/logging/log.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/common/logging/log.h b/src/common/logging/log.h index b6a14972f4..096a441b83 100644 --- a/src/common/logging/log.h +++ b/src/common/logging/log.h @@ -16,10 +16,12 @@ // a generic formatter for enum classes (<= 32 bits) #if FMT_VERSION >= 80100 template -struct fmt::formatter, char>> : formatter { +struct fmt::formatter, char>> + : formatter> { template auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) { - return fmt::formatter::format(static_cast(value), ctx); + return fmt::formatter>::format( + static_cast>(value), ctx); } }; #endif From a1054a093cf32f171bde662655560447b433e3bd Mon Sep 17 00:00:00 2001 From: liushuyu Date: Sat, 8 Jan 2022 16:03:18 -0700 Subject: [PATCH 3/4] cmake: upgrade Conan package fmt to 8.1.1 ... ... requirements for fmt stays at ^8.0.1 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 707d514c37..47bd282fb6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -169,7 +169,7 @@ macro(yuzu_find_packages) set(REQUIRED_LIBS # Cmake Pkg Prefix Version Conan Pkg "Catch2 2.13.7 catch2/2.13.7" - "fmt 8.0.1 fmt/8.0.1" + "fmt 8.0.1 fmt/8.1.1" "lz4 1.8 lz4/1.9.2" "nlohmann_json 3.8 nlohmann_json/3.8.0" "ZLIB 1.2 zlib/1.2.11" From 09f4f3f23b5181883c7423a171edd5ec6467df02 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Sat, 8 Jan 2022 21:42:11 -0700 Subject: [PATCH 4/4] logging/log.h: move enum class formatter to a separate file ... ... to common/logging/formatter.h --- src/common/CMakeLists.txt | 1 + src/common/logging/formatter.h | 23 +++++++++++++++++++ src/common/logging/log.h | 16 +------------ .../backend/glasm/reg_alloc.h | 8 +++---- src/shader_recompiler/exception.h | 2 +- src/shader_recompiler/frontend/ir/patch.cpp | 4 ++-- 6 files changed, 32 insertions(+), 22 deletions(-) create mode 100644 src/common/logging/formatter.h diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 790193b003..adf70eb8ba 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -85,6 +85,7 @@ add_library(common STATIC logging/backend.h logging/filter.cpp logging/filter.h + logging/formatter.h logging/log.h logging/log_entry.h logging/text_formatter.cpp diff --git a/src/common/logging/formatter.h b/src/common/logging/formatter.h new file mode 100644 index 0000000000..552cde75a7 --- /dev/null +++ b/src/common/logging/formatter.h @@ -0,0 +1,23 @@ +// Copyright 2022 yuzu Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#pragma once + +#include + +#include + +// adapted from https://github.com/fmtlib/fmt/issues/2704 +// a generic formatter for enum classes +#if FMT_VERSION >= 80100 +template +struct fmt::formatter, char>> + : formatter> { + template + auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) { + return fmt::formatter>::format( + static_cast>(value), ctx); + } +}; +#endif diff --git a/src/common/logging/log.h b/src/common/logging/log.h index 096a441b83..0c80d01eee 100644 --- a/src/common/logging/log.h +++ b/src/common/logging/log.h @@ -6,26 +6,12 @@ #include #include -#include #include +#include "common/logging/formatter.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 -struct fmt::formatter, char>> - : formatter> { - template - auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) { - return fmt::formatter>::format( - static_cast>(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 812d3cdbcc..82aec66c64 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 { case Shader::Backend::GLASM::Type::U64: break; } - throw Shader::InvalidArgument("Invalid value type {}", static_cast(value.type)); + throw Shader::InvalidArgument("Invalid value type {}", value.type); } }; @@ -256,7 +256,7 @@ struct fmt::formatter { case Shader::Backend::GLASM::Type::U64: break; } - throw Shader::InvalidArgument("Invalid value type {}", static_cast(value.type)); + throw Shader::InvalidArgument("Invalid value type {}", value.type); } }; @@ -277,7 +277,7 @@ struct fmt::formatter { case Shader::Backend::GLASM::Type::U64: break; } - throw Shader::InvalidArgument("Invalid value type {}", static_cast(value.type)); + throw Shader::InvalidArgument("Invalid value type {}", value.type); } }; @@ -298,6 +298,6 @@ struct fmt::formatter { case Shader::Backend::GLASM::Type::U64: return fmt::format_to(ctx.out(), "{}", Common::BitCast(value.imm_u64)); } - throw Shader::InvalidArgument("Invalid value type {}", static_cast(value.type)); + throw Shader::InvalidArgument("Invalid value type {}", value.type); } }; diff --git a/src/shader_recompiler/exception.h b/src/shader_recompiler/exception.h index 277be85412..d98b6029b1 100644 --- a/src/shader_recompiler/exception.h +++ b/src/shader_recompiler/exception.h @@ -9,7 +9,7 @@ #include #include -#include +#include "common/logging/formatter.h" namespace Shader { diff --git a/src/shader_recompiler/frontend/ir/patch.cpp b/src/shader_recompiler/frontend/ir/patch.cpp index d8730284ed..4c956a970b 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", static_cast(patch)); + throw InvalidArgument("Patch {} is not generic", patch); } return (static_cast(patch) - static_cast(Patch::Component0)) / 4; } u32 GenericPatchElement(Patch patch) { if (!IsGeneric(patch)) { - throw InvalidArgument("Patch {} is not generic", static_cast(patch)); + throw InvalidArgument("Patch {} is not generic", patch); } return (static_cast(patch) - static_cast(Patch::Component0)) % 4; }