diff options
Diffstat (limited to 'src/shader_recompiler')
21 files changed, 38 insertions, 38 deletions
diff --git a/src/shader_recompiler/backend/glasm/glasm_emit_context.h b/src/shader_recompiler/backend/glasm/glasm_emit_context.h index a81d64a9e..4b8951ddb 100644 --- a/src/shader_recompiler/backend/glasm/glasm_emit_context.h +++ b/src/shader_recompiler/backend/glasm/glasm_emit_context.h @@ -7,7 +7,7 @@ #include <utility> #include <vector> -#include <fmt/format.h> +#include <fmt/ranges.h> #include "shader_recompiler/backend/glasm/reg_alloc.h" #include "shader_recompiler/stage.h" diff --git a/src/shader_recompiler/backend/glasm/reg_alloc.cpp b/src/shader_recompiler/backend/glasm/reg_alloc.cpp index 781803e55..3919d6326 100644 --- a/src/shader_recompiler/backend/glasm/reg_alloc.cpp +++ b/src/shader_recompiler/backend/glasm/reg_alloc.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include <fmt/format.h> +#include <fmt/ranges.h> #include "shader_recompiler/backend/glasm/reg_alloc.h" #include "shader_recompiler/exception.h" diff --git a/src/shader_recompiler/backend/glasm/reg_alloc.h b/src/shader_recompiler/backend/glasm/reg_alloc.h index bd6e2d929..9cd009132 100644 --- a/src/shader_recompiler/backend/glasm/reg_alloc.h +++ b/src/shader_recompiler/backend/glasm/reg_alloc.h @@ -5,7 +5,7 @@ #include <bitset> -#include <fmt/format.h> +#include <fmt/ranges.h> #include "common/bit_cast.h" #include "common/bit_field.h" @@ -184,7 +184,7 @@ struct fmt::formatter<Shader::Backend::GLASM::Id> { return ctx.begin(); } template <typename FormatContext> - auto format(Shader::Backend::GLASM::Id id, FormatContext& ctx) { + auto format(Shader::Backend::GLASM::Id id, FormatContext& ctx) const { return Shader::Backend::GLASM::FormatTo<true>(ctx, id); } }; @@ -195,7 +195,7 @@ struct fmt::formatter<Shader::Backend::GLASM::Register> { return ctx.begin(); } template <typename FormatContext> - auto format(const Shader::Backend::GLASM::Register& value, FormatContext& ctx) { + auto format(const Shader::Backend::GLASM::Register& value, FormatContext& ctx) const { if (value.type != Shader::Backend::GLASM::Type::Register) { throw Shader::InvalidArgument("Register value type is not register"); } @@ -209,7 +209,7 @@ struct fmt::formatter<Shader::Backend::GLASM::ScalarRegister> { return ctx.begin(); } template <typename FormatContext> - auto format(const Shader::Backend::GLASM::ScalarRegister& value, FormatContext& ctx) { + auto format(const Shader::Backend::GLASM::ScalarRegister& value, FormatContext& ctx) const { if (value.type != Shader::Backend::GLASM::Type::Register) { throw Shader::InvalidArgument("Register value type is not register"); } @@ -223,7 +223,7 @@ struct fmt::formatter<Shader::Backend::GLASM::ScalarU32> { return ctx.begin(); } template <typename FormatContext> - auto format(const Shader::Backend::GLASM::ScalarU32& value, FormatContext& ctx) { + auto format(const Shader::Backend::GLASM::ScalarU32& value, FormatContext& ctx) const { switch (value.type) { case Shader::Backend::GLASM::Type::Void: break; @@ -244,7 +244,7 @@ struct fmt::formatter<Shader::Backend::GLASM::ScalarS32> { return ctx.begin(); } template <typename FormatContext> - auto format(const Shader::Backend::GLASM::ScalarS32& value, FormatContext& ctx) { + auto format(const Shader::Backend::GLASM::ScalarS32& value, FormatContext& ctx) const { switch (value.type) { case Shader::Backend::GLASM::Type::Void: break; @@ -265,7 +265,7 @@ struct fmt::formatter<Shader::Backend::GLASM::ScalarF32> { return ctx.begin(); } template <typename FormatContext> - auto format(const Shader::Backend::GLASM::ScalarF32& value, FormatContext& ctx) { + auto format(const Shader::Backend::GLASM::ScalarF32& value, FormatContext& ctx) const { switch (value.type) { case Shader::Backend::GLASM::Type::Void: break; @@ -286,7 +286,7 @@ struct fmt::formatter<Shader::Backend::GLASM::ScalarF64> { return ctx.begin(); } template <typename FormatContext> - auto format(const Shader::Backend::GLASM::ScalarF64& value, FormatContext& ctx) { + auto format(const Shader::Backend::GLASM::ScalarF64& value, FormatContext& ctx) const { switch (value.type) { case Shader::Backend::GLASM::Type::Void: break; diff --git a/src/shader_recompiler/backend/glsl/glsl_emit_context.h b/src/shader_recompiler/backend/glsl/glsl_emit_context.h index 7587f7bab..331c0588e 100644 --- a/src/shader_recompiler/backend/glsl/glsl_emit_context.h +++ b/src/shader_recompiler/backend/glsl/glsl_emit_context.h @@ -7,7 +7,7 @@ #include <utility> #include <vector> -#include <fmt/format.h> +#include <fmt/ranges.h> #include "shader_recompiler/backend/glsl/var_alloc.h" #include "shader_recompiler/stage.h" diff --git a/src/shader_recompiler/backend/glsl/var_alloc.cpp b/src/shader_recompiler/backend/glsl/var_alloc.cpp index 8b7da539a..ff6e2d5d5 100644 --- a/src/shader_recompiler/backend/glsl/var_alloc.cpp +++ b/src/shader_recompiler/backend/glsl/var_alloc.cpp @@ -4,7 +4,7 @@ #include <string> #include <string_view> -#include <fmt/format.h> +#include <fmt/ranges.h> #include "shader_recompiler/backend/glsl/var_alloc.h" #include "shader_recompiler/exception.h" diff --git a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp index a27f2f73a..388ddce2c 100644 --- a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp +++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp @@ -8,7 +8,7 @@ #include <boost/container/static_vector.hpp> -#include <fmt/format.h> +#include <fmt/ranges.h> #include "common/common_types.h" #include "common/div_ceil.h" diff --git a/src/shader_recompiler/frontend/ir/attribute.cpp b/src/shader_recompiler/frontend/ir/attribute.cpp index 1bf9db935..97f253602 100644 --- a/src/shader_recompiler/frontend/ir/attribute.cpp +++ b/src/shader_recompiler/frontend/ir/attribute.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include <fmt/format.h> +#include <fmt/ranges.h> #include "shader_recompiler/exception.h" #include "shader_recompiler/frontend/ir/attribute.h" diff --git a/src/shader_recompiler/frontend/ir/attribute.h b/src/shader_recompiler/frontend/ir/attribute.h index 5f039b6f6..7a0671380 100644 --- a/src/shader_recompiler/frontend/ir/attribute.h +++ b/src/shader_recompiler/frontend/ir/attribute.h @@ -3,7 +3,7 @@ #pragma once -#include <fmt/format.h> +#include <fmt/ranges.h> #include "common/common_types.h" @@ -250,7 +250,7 @@ struct fmt::formatter<Shader::IR::Attribute> { return ctx.begin(); } template <typename FormatContext> - auto format(const Shader::IR::Attribute& attribute, FormatContext& ctx) { + auto format(const Shader::IR::Attribute& attribute, FormatContext& ctx) const { return fmt::format_to(ctx.out(), "{}", Shader::IR::NameOf(attribute)); } }; diff --git a/src/shader_recompiler/frontend/ir/condition.cpp b/src/shader_recompiler/frontend/ir/condition.cpp index fb6b141d3..4db0c164f 100644 --- a/src/shader_recompiler/frontend/ir/condition.cpp +++ b/src/shader_recompiler/frontend/ir/condition.cpp @@ -3,7 +3,7 @@ #include <string> -#include <fmt/format.h> +#include <fmt/ranges.h> #include "shader_recompiler/frontend/ir/condition.h" diff --git a/src/shader_recompiler/frontend/ir/condition.h b/src/shader_recompiler/frontend/ir/condition.h index 1cad46b9b..89ac42dbe 100644 --- a/src/shader_recompiler/frontend/ir/condition.h +++ b/src/shader_recompiler/frontend/ir/condition.h @@ -5,7 +5,7 @@ #include <string> -#include <fmt/format.h> +#include <fmt/ranges.h> #include "common/common_types.h" #include "shader_recompiler/frontend/ir/flow_test.h" @@ -52,7 +52,7 @@ struct fmt::formatter<Shader::IR::Condition> { return ctx.begin(); } template <typename FormatContext> - auto format(const Shader::IR::Condition& cond, FormatContext& ctx) { + auto format(const Shader::IR::Condition& cond, FormatContext& ctx) const { return fmt::format_to(ctx.out(), "{}", Shader::IR::NameOf(cond)); } }; diff --git a/src/shader_recompiler/frontend/ir/flow_test.cpp b/src/shader_recompiler/frontend/ir/flow_test.cpp index a859efdde..c2dbe2690 100644 --- a/src/shader_recompiler/frontend/ir/flow_test.cpp +++ b/src/shader_recompiler/frontend/ir/flow_test.cpp @@ -3,7 +3,7 @@ #include <string> -#include <fmt/format.h> +#include <fmt/ranges.h> #include "shader_recompiler/frontend/ir/flow_test.h" diff --git a/src/shader_recompiler/frontend/ir/flow_test.h b/src/shader_recompiler/frontend/ir/flow_test.h index 88f7c9e82..014ae6b65 100644 --- a/src/shader_recompiler/frontend/ir/flow_test.h +++ b/src/shader_recompiler/frontend/ir/flow_test.h @@ -4,7 +4,7 @@ #pragma once #include <string> -#include <fmt/format.h> +#include <fmt/ranges.h> #include "common/common_types.h" @@ -55,7 +55,7 @@ struct fmt::formatter<Shader::IR::FlowTest> { return ctx.begin(); } template <typename FormatContext> - auto format(const Shader::IR::FlowTest& flow_test, FormatContext& ctx) { + auto format(const Shader::IR::FlowTest& flow_test, FormatContext& ctx) const { return fmt::format_to(ctx.out(), "{}", Shader::IR::NameOf(flow_test)); } }; diff --git a/src/shader_recompiler/frontend/ir/opcodes.h b/src/shader_recompiler/frontend/ir/opcodes.h index e300714f3..6caf12af4 100644 --- a/src/shader_recompiler/frontend/ir/opcodes.h +++ b/src/shader_recompiler/frontend/ir/opcodes.h @@ -6,7 +6,7 @@ #include <algorithm> #include <array> -#include <fmt/format.h> +#include <fmt/ranges.h> #include "common/polyfill_ranges.h" #include "shader_recompiler/frontend/ir/type.h" @@ -54,7 +54,7 @@ constexpr Type F64x2{Type::F64x2}; constexpr Type F64x3{Type::F64x3}; constexpr Type F64x4{Type::F64x4}; -constexpr OpcodeMeta META_TABLE[]{ +constexpr OpcodeMeta META_TABLE[] { #define OPCODE(name_token, type_token, ...) \ { \ .name{#name_token}, \ @@ -103,7 +103,7 @@ struct fmt::formatter<Shader::IR::Opcode> { return ctx.begin(); } template <typename FormatContext> - auto format(const Shader::IR::Opcode& op, FormatContext& ctx) { + auto format(const Shader::IR::Opcode& op, FormatContext& ctx) const { return fmt::format_to(ctx.out(), "{}", Shader::IR::NameOf(op)); } }; diff --git a/src/shader_recompiler/frontend/ir/pred.h b/src/shader_recompiler/frontend/ir/pred.h index a77c1e2a7..4c9e8b6bd 100644 --- a/src/shader_recompiler/frontend/ir/pred.h +++ b/src/shader_recompiler/frontend/ir/pred.h @@ -3,7 +3,7 @@ #pragma once -#include <fmt/format.h> +#include <fmt/ranges.h> namespace Shader::IR { @@ -33,7 +33,7 @@ struct fmt::formatter<Shader::IR::Pred> { return ctx.begin(); } template <typename FormatContext> - auto format(const Shader::IR::Pred& pred, FormatContext& ctx) { + auto format(const Shader::IR::Pred& pred, FormatContext& ctx) const { if (pred == Shader::IR::Pred::PT) { return fmt::format_to(ctx.out(), "PT"); } else { diff --git a/src/shader_recompiler/frontend/ir/program.cpp b/src/shader_recompiler/frontend/ir/program.cpp index bda56ff46..39ff92ce7 100644 --- a/src/shader_recompiler/frontend/ir/program.cpp +++ b/src/shader_recompiler/frontend/ir/program.cpp @@ -4,7 +4,7 @@ #include <map> #include <string> -#include <fmt/format.h> +#include <fmt/ranges.h> #include "shader_recompiler/frontend/ir/basic_block.h" #include "shader_recompiler/frontend/ir/program.h" diff --git a/src/shader_recompiler/frontend/ir/reg.h b/src/shader_recompiler/frontend/ir/reg.h index f7cb716a9..97c97420b 100644 --- a/src/shader_recompiler/frontend/ir/reg.h +++ b/src/shader_recompiler/frontend/ir/reg.h @@ -3,7 +3,7 @@ #pragma once -#include <fmt/format.h> +#include <fmt/ranges.h> #include "common/common_types.h" #include "shader_recompiler/exception.h" @@ -319,7 +319,7 @@ struct fmt::formatter<Shader::IR::Reg> { return ctx.begin(); } template <typename FormatContext> - auto format(const Shader::IR::Reg& reg, FormatContext& ctx) { + auto format(const Shader::IR::Reg& reg, FormatContext& ctx) const { if (reg == Shader::IR::Reg::RZ) { return fmt::format_to(ctx.out(), "RZ"); } else if (static_cast<int>(reg) >= 0 && static_cast<int>(reg) < 255) { diff --git a/src/shader_recompiler/frontend/ir/type.h b/src/shader_recompiler/frontend/ir/type.h index 04c8c4ddb..91fabdcf3 100644 --- a/src/shader_recompiler/frontend/ir/type.h +++ b/src/shader_recompiler/frontend/ir/type.h @@ -5,7 +5,7 @@ #include <string> -#include <fmt/format.h> +#include <fmt/ranges.h> #include "common/common_funcs.h" #include "shader_recompiler/exception.h" @@ -54,7 +54,7 @@ struct fmt::formatter<Shader::IR::Type> { return ctx.begin(); } template <typename FormatContext> - auto format(const Shader::IR::Type& type, FormatContext& ctx) { + auto format(const Shader::IR::Type& type, FormatContext& ctx) const { return fmt::format_to(ctx.out(), "{}", NameOf(type)); } }; diff --git a/src/shader_recompiler/frontend/maxwell/control_flow.cpp b/src/shader_recompiler/frontend/maxwell/control_flow.cpp index dce414cb4..a2ad56cc4 100644 --- a/src/shader_recompiler/frontend/maxwell/control_flow.cpp +++ b/src/shader_recompiler/frontend/maxwell/control_flow.cpp @@ -7,7 +7,7 @@ #include <string> #include <utility> -#include <fmt/format.h> +#include <fmt/ranges.h> #include "common/polyfill_ranges.h" #include "shader_recompiler/exception.h" diff --git a/src/shader_recompiler/frontend/maxwell/location.h b/src/shader_recompiler/frontend/maxwell/location.h index 0c0477e2d..3093c7a8e 100644 --- a/src/shader_recompiler/frontend/maxwell/location.h +++ b/src/shader_recompiler/frontend/maxwell/location.h @@ -3,7 +3,7 @@ #pragma once -#include <fmt/format.h> +#include <fmt/ranges.h> #include "common/common_types.h" #include "shader_recompiler/exception.h" @@ -102,7 +102,7 @@ struct fmt::formatter<Shader::Maxwell::Location> { return ctx.begin(); } template <typename FormatContext> - auto format(const Shader::Maxwell::Location& location, FormatContext& ctx) { + auto format(const Shader::Maxwell::Location& location, FormatContext& ctx) const { return fmt::format_to(ctx.out(), "{:04x}", location.Offset()); } }; diff --git a/src/shader_recompiler/frontend/maxwell/opcodes.h b/src/shader_recompiler/frontend/maxwell/opcodes.h index 72dd143c2..18ed4f6e1 100644 --- a/src/shader_recompiler/frontend/maxwell/opcodes.h +++ b/src/shader_recompiler/frontend/maxwell/opcodes.h @@ -3,7 +3,7 @@ #pragma once -#include <fmt/format.h> +#include <fmt/ranges.h> namespace Shader::Maxwell { @@ -23,7 +23,7 @@ struct fmt::formatter<Shader::Maxwell::Opcode> { return ctx.begin(); } template <typename FormatContext> - auto format(const Shader::Maxwell::Opcode& opcode, FormatContext& ctx) { + auto format(const Shader::Maxwell::Opcode& opcode, FormatContext& ctx) const { return fmt::format_to(ctx.out(), "{}", NameOf(opcode)); } }; diff --git a/src/shader_recompiler/frontend/maxwell/structured_control_flow.cpp b/src/shader_recompiler/frontend/maxwell/structured_control_flow.cpp index 80c90fe6a..3c18f4998 100644 --- a/src/shader_recompiler/frontend/maxwell/structured_control_flow.cpp +++ b/src/shader_recompiler/frontend/maxwell/structured_control_flow.cpp @@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include <fmt/format.h> +#include <fmt/ranges.h> #include <boost/intrusive/list.hpp> |