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/video_core | |
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/video_core')
6 files changed, 11 insertions, 11 deletions
diff --git a/src/video_core/renderer_vulkan/pipeline_statistics.cpp b/src/video_core/renderer_vulkan/pipeline_statistics.cpp index fcd160a32..545971bd8 100644 --- a/src/video_core/renderer_vulkan/pipeline_statistics.cpp +++ b/src/video_core/renderer_vulkan/pipeline_statistics.cpp @@ -3,7 +3,7 @@ #include <string_view> -#include <fmt/format.h> +#include <fmt/ranges.h> #include "common/common_types.h" #include "common/logging/log.h" diff --git a/src/video_core/renderer_vulkan/renderer_vulkan.cpp b/src/video_core/renderer_vulkan/renderer_vulkan.cpp index c553f5b3d..96fb8fba6 100644 --- a/src/video_core/renderer_vulkan/renderer_vulkan.cpp +++ b/src/video_core/renderer_vulkan/renderer_vulkan.cpp @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include <fmt/format.h> +#include <fmt/ranges.h> #include "common/logging/log.h" #include "common/polyfill_ranges.h" diff --git a/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp b/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp index 03a0b7280..72d5ec35f 100644 --- a/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp +++ b/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp @@ -5,7 +5,7 @@ #include <utility> #include <vector> -#include <fmt/format.h> +#include <fmt/ranges.h> #include "common/alignment.h" #include "common/assert.h" diff --git a/src/video_core/texture_cache/formatter.h b/src/video_core/texture_cache/formatter.h index cabbfcb2d..fab4bc979 100644 --- a/src/video_core/texture_cache/formatter.h +++ b/src/video_core/texture_cache/formatter.h @@ -5,7 +5,7 @@ #include <string> -#include <fmt/format.h> +#include <fmt/ranges.h> #include "video_core/surface.h" #include "video_core/texture_cache/types.h" @@ -13,7 +13,7 @@ template <> struct fmt::formatter<VideoCore::Surface::PixelFormat> : fmt::formatter<fmt::string_view> { template <typename FormatContext> - auto format(VideoCore::Surface::PixelFormat format, FormatContext& ctx) { + auto format(VideoCore::Surface::PixelFormat format, FormatContext& ctx) const { using VideoCore::Surface::PixelFormat; const string_view name = [format] { switch (format) { @@ -227,14 +227,14 @@ struct fmt::formatter<VideoCore::Surface::PixelFormat> : fmt::formatter<fmt::str } return "Invalid"; }(); - return formatter<string_view>::format(name, ctx); + return fmt::formatter<string_view>::format(name, ctx); } }; template <> struct fmt::formatter<VideoCommon::ImageType> : fmt::formatter<fmt::string_view> { template <typename FormatContext> - auto format(VideoCommon::ImageType type, FormatContext& ctx) { + auto format(VideoCommon::ImageType type, FormatContext& ctx) const { const string_view name = [type] { using VideoCommon::ImageType; switch (type) { @@ -251,7 +251,7 @@ struct fmt::formatter<VideoCommon::ImageType> : fmt::formatter<fmt::string_view> } return "Invalid"; }(); - return formatter<string_view>::format(name, ctx); + return fmt::formatter<string_view>::format(name, ctx); } }; @@ -262,7 +262,7 @@ struct fmt::formatter<VideoCommon::Extent3D> { } template <typename FormatContext> - auto format(const VideoCommon::Extent3D& extent, FormatContext& ctx) { + auto format(const VideoCommon::Extent3D& extent, FormatContext& ctx) const { return fmt::format_to(ctx.out(), "{{{}, {}, {}}}", extent.width, extent.height, extent.depth); } diff --git a/src/video_core/texture_cache/image_info.cpp b/src/video_core/texture_cache/image_info.cpp index 9444becce..135dd64de 100644 --- a/src/video_core/texture_cache/image_info.cpp +++ b/src/video_core/texture_cache/image_info.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include <fmt/format.h> +#include <fmt/ranges.h> #include "common/assert.h" #include "common/settings.h" diff --git a/src/video_core/vulkan_common/nsight_aftermath_tracker.cpp b/src/video_core/vulkan_common/nsight_aftermath_tracker.cpp index 60f62fb6f..aacc561b5 100644 --- a/src/video_core/vulkan_common/nsight_aftermath_tracker.cpp +++ b/src/video_core/vulkan_common/nsight_aftermath_tracker.cpp @@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include <fmt/format.h> +#include <fmt/ranges.h> #include "common/common_types.h" #include "common/fs/file.h" |