logging/log.h: move enum class formatter to a separate file ...
... to common/logging/formatter.h
This commit is contained in:
parent
a1054a093c
commit
09f4f3f23b
|
@ -85,6 +85,7 @@ add_library(common STATIC
|
||||||
logging/backend.h
|
logging/backend.h
|
||||||
logging/filter.cpp
|
logging/filter.cpp
|
||||||
logging/filter.h
|
logging/filter.h
|
||||||
|
logging/formatter.h
|
||||||
logging/log.h
|
logging/log.h
|
||||||
logging/log_entry.h
|
logging/log_entry.h
|
||||||
logging/text_formatter.cpp
|
logging/text_formatter.cpp
|
||||||
|
|
|
@ -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
|
|
@ -6,26 +6,12 @@
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <string_view>
|
#include <string_view>
|
||||||
#include <type_traits>
|
|
||||||
|
|
||||||
#include <fmt/format.h>
|
#include <fmt/format.h>
|
||||||
|
|
||||||
|
#include "common/logging/formatter.h"
|
||||||
#include "common/logging/types.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 {
|
namespace Common::Log {
|
||||||
|
|
||||||
// trims up to and including the last of ../, ..\, src/, src\ in a string
|
// trims up to and including the last of ../, ..\, src/, src\ in a string
|
||||||
|
|
|
@ -235,7 +235,7 @@ struct fmt::formatter<Shader::Backend::GLASM::ScalarU32> {
|
||||||
case Shader::Backend::GLASM::Type::U64:
|
case Shader::Backend::GLASM::Type::U64:
|
||||||
break;
|
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:
|
case Shader::Backend::GLASM::Type::U64:
|
||||||
break;
|
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:
|
case Shader::Backend::GLASM::Type::U64:
|
||||||
break;
|
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:
|
case Shader::Backend::GLASM::Type::U64:
|
||||||
return fmt::format_to(ctx.out(), "{}", Common::BitCast<f64>(value.imm_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);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
#include <string_view>
|
#include <string_view>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
|
||||||
#include <fmt/format.h>
|
#include "common/logging/formatter.h"
|
||||||
|
|
||||||
namespace Shader {
|
namespace Shader {
|
||||||
|
|
||||||
|
|
|
@ -13,14 +13,14 @@ bool IsGeneric(Patch patch) noexcept {
|
||||||
|
|
||||||
u32 GenericPatchIndex(Patch patch) {
|
u32 GenericPatchIndex(Patch patch) {
|
||||||
if (!IsGeneric(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;
|
return (static_cast<u32>(patch) - static_cast<u32>(Patch::Component0)) / 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
u32 GenericPatchElement(Patch patch) {
|
u32 GenericPatchElement(Patch patch) {
|
||||||
if (!IsGeneric(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;
|
return (static_cast<u32>(patch) - static_cast<u32>(Patch::Component0)) % 4;
|
||||||
}
|
}
|
||||||
|
|
Reference in New Issue