From 09f4f3f23b5181883c7423a171edd5ec6467df02 Mon Sep 17 00:00:00 2001 From: liushuyu 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/shader_recompiler/backend/glasm/reg_alloc.h | 8 ++++---- src/shader_recompiler/exception.h | 2 +- src/shader_recompiler/frontend/ir/patch.cpp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/shader_recompiler') diff --git a/src/shader_recompiler/backend/glasm/reg_alloc.h b/src/shader_recompiler/backend/glasm/reg_alloc.h index 812d3cdbc..82aec66c6 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 277be8541..d98b6029b 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 d8730284e..4c956a970 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; } -- cgit v1.2.3