diff options
author | Zephyron <zephyron@citron-emu.orgq> | 2025-02-16 13:38:05 +1000 |
---|---|---|
committer | Zephyron <zephyron@citron-emu.orgq> | 2025-02-16 13:38:05 +1000 |
commit | 7730d14b4a267c9579636a18af73d4252385e15f (patch) | |
tree | e7deef63da5ae4605a1c5098d26253953b73d067 /src/shader_recompiler/frontend/maxwell | |
parent | 677b8f476a94ec1b42d9ba1b0eeb17a3a5859133 (diff) |
build: upgrade fmt and SDL2
Update fmt library to version 11.0.2 and make necessary adjustments:
- Replace fmt/format.h includes with fmt/ranges.h
- Add const qualifiers to formatter::format functions
- Update CMake to require fmt version 11
Additional dependency updates:
- Update SDL2 bundled version from 2.28.2 to 2.32.0
- Update catch2 to version 3.8.0
- Update vcpkg baseline to c82f74667287d3dc386bce81e44964370c91a289
Diffstat (limited to 'src/shader_recompiler/frontend/maxwell')
4 files changed, 6 insertions, 6 deletions
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> |