yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Merge pull request #7618 from goldenx86/patch-4 

Increase boost requirement to 1.78.0
This commit is contained in:
bunnei 2021-12-28 16:25:37 -08:00 committed by GitHub
parent f67605e6aa c7235e67ef
commit 279c7bcc1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -229,7 +229,7 @@ elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR YUZU_USE_BUNDLED_BOOST)
include_directories(SYSTEM "${Boost_INCLUDE_DIRS}") include_directories(SYSTEM "${Boost_INCLUDE_DIRS}")
else() else()
message(STATUS "Boost 1.73.0 or newer not found, falling back to Conan") 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() endif()
# Attempt to locate any packages that are required and report the missing ones in CONAN_REQUIRED_LIBS # Attempt to locate any packages that are required and report the missing ones in CONAN_REQUIRED_LIBS

9
src/shader_recompiler/backend/spirv/emit_spirv.cpp
View File

@ -30,11 +30,20 @@ struct FuncTraits<ReturnType_ (*)(Args...)> {
using ArgType = std::tuple_element_t<I, std::tuple<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> template <auto func, typename... Args>
void SetDefinition(EmitContext& ctx, IR::Inst* inst, Args... args) { void SetDefinition(EmitContext& ctx, IR::Inst* inst, Args... args) {
inst->SetDefinition<Id>(func(ctx, std::forward<Args>(args)...)); inst->SetDefinition<Id>(func(ctx, std::forward<Args>(args)...));
} }
#ifdef _MSC_VER
#pragma warning(pop)
#endif
template <typename ArgType> template <typename ArgType>
ArgType Arg(EmitContext& ctx, const IR::Value& arg) { ArgType Arg(EmitContext& ctx, const IR::Value& arg) {
if constexpr (std::is_same_v<ArgType, Id>) { if constexpr (std::is_same_v<ArgType, Id>) {