Compare commits

..

No commits in common. "6fe26173dcb1e294560d58c099a60e1d249bb5fb" and "e45eb0da9a3851ed7a66d3b36548cf3a26cfd38e" have entirely different histories.

3 changed files with 6 additions and 11 deletions

View File

@ -3,10 +3,7 @@
set(BUILD_SHARED_LIBS OFF)
set(BUILD_TESTING OFF)
set_directory_properties(PROPERTIES
EXCLUDE_FROM_ALL ON
SYSTEM ON
)
set_property(DIRECTORY PROPERTY EXCLUDE_FROM_ALL ON)
if (MSVC)
# Silence "deprecation" warnings
@ -19,7 +16,7 @@ if (NOT TARGET Boost::headers)
set(Boost_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/externals/ext-boost" CACHE STRING "")
set(Boost_NO_SYSTEM_PATHS ON CACHE BOOL "")
add_library(boost INTERFACE)
target_include_directories(boost INTERFACE ${Boost_INCLUDE_DIR})
target_include_directories(boost SYSTEM INTERFACE ${Boost_INCLUDE_DIR})
add_library(Boost::headers ALIAS boost)
endif()
@ -80,7 +77,7 @@ endif()
# RenderDoc
if (NOT TARGET RenderDoc::API)
add_library(renderdoc INTERFACE)
target_include_directories(renderdoc INTERFACE ./renderdoc)
target_include_directories(renderdoc SYSTEM INTERFACE ./renderdoc)
add_library(RenderDoc::API ALIAS renderdoc)
endif()
@ -193,4 +190,4 @@ add_subdirectory(discord-rpc/)
target_include_directories(discord-rpc INTERFACE discord-rpc/include)
# GCN Headers
add_subdirectory(gcn)
add_subdirectory(gcn)

View File

@ -29,4 +29,4 @@ extern void assert_fail_debug_msg(const char* msg);
constexpr ImVec2(float _v) : x(_v), y(_v) {}
#define IM_VEC4_CLASS_EXTRA \
constexpr ImVec4(float _v) : x(_v), y(_v), z(_v), w(_v) {}
constexpr ImVec4(float _v) : x(_v), y(_v), z(_v), w(_v) {}

View File

@ -265,9 +265,7 @@ bool Instance::CreateDevice() {
// These extensions are promoted by Vulkan 1.3, but for greater compatibility we use Vulkan 1.2
// with extensions.
if (Config ::vkValidationEnabled() || Config::isRdocEnabled()) {
tooling_info = add_extension(VK_EXT_TOOLING_INFO_EXTENSION_NAME);
}
tooling_info = add_extension(VK_EXT_TOOLING_INFO_EXTENSION_NAME);
const bool maintenance4 = add_extension(VK_KHR_MAINTENANCE_4_EXTENSION_NAME);
add_extension(VK_KHR_FORMAT_FEATURE_FLAGS_2_EXTENSION_NAME);
add_extension(VK_KHR_DYNAMIC_RENDERING_EXTENSION_NAME);