diff options
author | liushuyu <liushuyu011@gmail.com> | 2022-01-09 05:42:11 +0100 |
---|---|---|
committer | liushuyu <liushuyu011@gmail.com> | 2022-01-10 01:35:33 +0100 |
commit | 09f4f3f23b5181883c7423a171edd5ec6467df02 (patch) | |
tree | 62b940e8d5532affe487ed43bd97cd2992fe07f6 /src/shader_recompiler | |
parent | cmake: upgrade Conan package fmt to 8.1.1 ... (diff) | |
download | yuzu-09f4f3f23b5181883c7423a171edd5ec6467df02.tar yuzu-09f4f3f23b5181883c7423a171edd5ec6467df02.tar.gz yuzu-09f4f3f23b5181883c7423a171edd5ec6467df02.tar.bz2 yuzu-09f4f3f23b5181883c7423a171edd5ec6467df02.tar.lz yuzu-09f4f3f23b5181883c7423a171edd5ec6467df02.tar.xz yuzu-09f4f3f23b5181883c7423a171edd5ec6467df02.tar.zst yuzu-09f4f3f23b5181883c7423a171edd5ec6467df02.zip |
Diffstat (limited to '')
-rw-r--r-- | src/shader_recompiler/backend/glasm/reg_alloc.h | 8 | ||||
-rw-r--r-- | src/shader_recompiler/exception.h | 2 | ||||
-rw-r--r-- | src/shader_recompiler/frontend/ir/patch.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
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<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 277be8541..d98b6029b 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 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<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; } |