From 316312748806de2564e735db0c56539b02dcee1d Mon Sep 17 00:00:00 2001 From: lizzie Date: Wed, 20 May 2026 14:38:18 +0000 Subject: [PATCH] fix build errors 2026-05-20 --- .../renderer_vulkan/vk_rasterizer.cpp | 8 +++---- src/video_core/texture_cache/formatter.h | 21 +------------------ 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index 706ae62365..4b1b4720b7 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp @@ -145,7 +145,7 @@ VkRect2D GetScissorState(const Tegra::Engines::Maxwell3D::Regs& regs, size_t ind return scissor; } -DrawParams MakeDrawParams(const Tegra::Engines::DrawManager::State& draw_state, u32 num_instances, bool is_indexed) { +DrawParams MakeDrawParams(const Tegra::Engines::Maxwell3D::DrawManager::State& draw_state, u32 num_instances, bool is_indexed) { DrawParams params{ .base_instance = draw_state.base_instance, .num_instances = num_instances, @@ -1790,10 +1790,10 @@ void RasterizerVulkan::UpdateVertexInput(Tegra::Engines::Maxwell3D::Regs& regs) boost::container::static_vector bindings; boost::container::static_vector attributes; - const u32 max_attributes = u32(std::min(Tegra::Engines::Maxwell3D::NumVertexAttributes, device.GetMaxVertexInputAttributes())); - const u32 max_bindings = u32(std::min(Tegra::Engines::Maxwell3D::NumVertexArrays, device.GetMaxVertexInputBindings())); + const u32 max_attributes = u32(std::min(Tegra::Engines::Maxwell3D::Regs::NumVertexAttributes, device.GetMaxVertexInputAttributes())); + const u32 max_bindings = u32(std::min(Tegra::Engines::Maxwell3D::Regs::NumVertexArrays, device.GetMaxVertexInputBindings())); for (u32 index = 0; index < max_attributes; ++index) { - const Tegra::Engines::Maxwell3D::VertexAttribute attribute{regs.vertex_attrib_format[index]}; + const Tegra::Engines::Maxwell3D::Regs::VertexAttribute attribute{regs.vertex_attrib_format[index]}; const u32 binding{attribute.buffer}; if (attribute.constant || binding >= max_bindings) { continue; diff --git a/src/video_core/texture_cache/formatter.h b/src/video_core/texture_cache/formatter.h index 3b2559b12b..64c268c413 100644 --- a/src/video_core/texture_cache/formatter.h +++ b/src/video_core/texture_cache/formatter.h @@ -15,26 +15,6 @@ #if FMT_VERSION >= 120100 #include #else -template <> -struct fmt::formatter : fmt::formatter { - template - auto format(VideoCommon::ImageType type, FormatContext& ctx) const { - const string_view name = [type] { - using VideoCommon::ImageType; - switch (type) { - case ImageType::e1D: return "1D"; - case ImageType::e2D: return "2D"; - case ImageType::e3D: return "3D"; - case ImageType::Linear: return "Linear"; - case ImageType::Buffer: return "Buffer"; - } - return "Invalid"; - }(); - return formatter::format(name, ctx); - } -}; -#endif - template <> struct fmt::formatter : fmt::formatter { template @@ -78,6 +58,7 @@ struct fmt::formatter : fmt::formatter return formatter::format(name, ctx); } }; +#endif template <> struct fmt::formatter {