summaryrefslogtreecommitdiff
path: root/src/shader_recompiler/frontend
diff options
context:
space:
mode:
authorZephyron <zephyron@citron-emu.orgq>2025-02-16 13:38:05 +1000
committerZephyron <zephyron@citron-emu.orgq>2025-02-16 13:38:05 +1000
commit7730d14b4a267c9579636a18af73d4252385e15f (patch)
treee7deef63da5ae4605a1c5098d26253953b73d067 /src/shader_recompiler/frontend
parent677b8f476a94ec1b42d9ba1b0eeb17a3a5859133 (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')
-rw-r--r--src/shader_recompiler/frontend/ir/attribute.cpp2
-rw-r--r--src/shader_recompiler/frontend/ir/attribute.h4
-rw-r--r--src/shader_recompiler/frontend/ir/condition.cpp2
-rw-r--r--src/shader_recompiler/frontend/ir/condition.h4
-rw-r--r--src/shader_recompiler/frontend/ir/flow_test.cpp2
-rw-r--r--src/shader_recompiler/frontend/ir/flow_test.h4
-rw-r--r--src/shader_recompiler/frontend/ir/opcodes.h6
-rw-r--r--src/shader_recompiler/frontend/ir/pred.h4
-rw-r--r--src/shader_recompiler/frontend/ir/program.cpp2
-rw-r--r--src/shader_recompiler/frontend/ir/reg.h4
-rw-r--r--src/shader_recompiler/frontend/ir/type.h4
-rw-r--r--src/shader_recompiler/frontend/maxwell/control_flow.cpp2
-rw-r--r--src/shader_recompiler/frontend/maxwell/location.h4
-rw-r--r--src/shader_recompiler/frontend/maxwell/opcodes.h4
-rw-r--r--src/shader_recompiler/frontend/maxwell/structured_control_flow.cpp2
15 files changed, 25 insertions, 25 deletions
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>