From 09f4f3f23b5181883c7423a171edd5ec6467df02 Mon Sep 17 00:00:00 2001
From: liushuyu <liushuyu011@gmail.com>
Date: Sat, 8 Jan 2022 21:42:11 -0700
Subject: 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 +---------------
src/shader_recompiler/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
(limited to 'src')
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 <type_traits>
+
+#include <fmt/format.h>
+
+// adapted from https://github.com/fmtlib/fmt/issues/2704
+// a generic formatter for enum classes
+#if FMT_VERSION >= 80100
+template <typename T>
+struct fmt::formatter<T, std::enable_if_t<std::is_enum_v<T>, char>>
+ : formatter<std::underlying_type_t<T>> {
+ template <typename FormatContext>
+ auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) {
+ return fmt::formatter<std::underlying_type_t<T>>::format(
+ static_cast<std::underlying_type_t<T>>(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 <algorithm>
#include <string_view>
-#include <type_traits>
#include <fmt/format.h>
+#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 <typename T>
-struct fmt::formatter<T, std::enable_if_t<std::is_enum_v<T>, char>>
- : formatter<std::underlying_type_t<T>> {
- template <typename FormatContext>
- auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) {
- return fmt::formatter<std::underlying_type_t<T>>::format(
- static_cast<std::underlying_type_t<T>>(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<Shader::Backend::GLASM::ScalarU32> {
case Shader::Backend::GLASM::Type::U64:
break;
}
- throw Shader::InvalidArgument("Invalid value type {}", static_cast<u32>(value.type));
+ throw Shader::InvalidArgument("Invalid value type {}", 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 {}", static_cast<u32>(value.type));
+ throw Shader::InvalidArgument("Invalid value type {}", 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 {}", static_cast<u32>(value.type));
+ throw Shader::InvalidArgument("Invalid value type {}", 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 {}", static_cast<u32>(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 <string_view>
#include <utility>
-#include <fmt/format.h>
+#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<u64>(patch));
+ throw InvalidArgument("Patch {} is not generic", 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", static_cast<u64>(patch));
+ throw InvalidArgument("Patch {} is not generic", patch);
}
return (static_cast<u32>(patch) - static_cast<u32>(Patch::Component0)) % 4;
}
--
cgit v1.2.3-70-g09d2