summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-12-29 01:25:37 +0100
committerGitHub <noreply@github.com>2021-12-29 01:25:37 +0100
commit279c7bcc1af09933a02ee38c888847df1419f44d (patch)
tree181ec0ba649135014e50dd9b51388636d0997935
parentMerge pull request #7622 from ameerj/vk-rescale-invalid-ptr (diff)
parentEmpty spaces (diff)
downloadyuzu-279c7bcc1af09933a02ee38c888847df1419f44d.tar
yuzu-279c7bcc1af09933a02ee38c888847df1419f44d.tar.gz
yuzu-279c7bcc1af09933a02ee38c888847df1419f44d.tar.bz2
yuzu-279c7bcc1af09933a02ee38c888847df1419f44d.tar.lz
yuzu-279c7bcc1af09933a02ee38c888847df1419f44d.tar.xz
yuzu-279c7bcc1af09933a02ee38c888847df1419f44d.tar.zst
yuzu-279c7bcc1af09933a02ee38c888847df1419f44d.zip
Diffstat (limited to '')
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/shader_recompiler/backend/spirv/emit_spirv.cpp9
2 files changed, 10 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1ad55c9c..d44d67562 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -229,7 +229,7 @@ elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR YUZU_USE_BUNDLED_BOOST)
include_directories(SYSTEM "${Boost_INCLUDE_DIRS}")
else()
message(STATUS "Boost 1.73.0 or newer not found, falling back to Conan")
- list(APPEND CONAN_REQUIRED_LIBS "boost/1.73.0")
+ list(APPEND CONAN_REQUIRED_LIBS "boost/1.78.0")
endif()
# Attempt to locate any packages that are required and report the missing ones in CONAN_REQUIRED_LIBS
diff --git a/src/shader_recompiler/backend/spirv/emit_spirv.cpp b/src/shader_recompiler/backend/spirv/emit_spirv.cpp
index 6ce7ed12a..50918317f 100644
--- a/src/shader_recompiler/backend/spirv/emit_spirv.cpp
+++ b/src/shader_recompiler/backend/spirv/emit_spirv.cpp
@@ -30,11 +30,20 @@ struct FuncTraits<ReturnType_ (*)(Args...)> {
using ArgType = std::tuple_element_t<I, std::tuple<Args...>>;
};
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4702) // Ignore unreachable code warning
+#endif
+
template <auto func, typename... Args>
void SetDefinition(EmitContext& ctx, IR::Inst* inst, Args... args) {
inst->SetDefinition<Id>(func(ctx, std::forward<Args>(args)...));
}
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
template <typename ArgType>
ArgType Arg(EmitContext& ctx, const IR::Value& arg) {
if constexpr (std::is_same_v<ArgType, Id>) {