From 3f64031cbb2d8d0dad474acfc89faa54cf8678ea Mon Sep 17 00:00:00 2001 From: Luis Condes Diaz Date: Wed, 19 Jun 2024 08:18:29 +0200 Subject: Migrate Vulkan-Headers to submodule and update to v1.3.288 --- Source/Core/VideoBackends/Vulkan/CMakeLists.txt | 2 +- Source/Core/VideoBackends/Vulkan/VulkanLoader.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'Source/Core') diff --git a/Source/Core/VideoBackends/Vulkan/CMakeLists.txt b/Source/Core/VideoBackends/Vulkan/CMakeLists.txt index ec9e1b51cb..a41c5af172 100644 --- a/Source/Core/VideoBackends/Vulkan/CMakeLists.txt +++ b/Source/Core/VideoBackends/Vulkan/CMakeLists.txt @@ -58,7 +58,7 @@ endif() # Only include the Vulkan headers when building the Vulkan backend target_include_directories(videovulkan PRIVATE - ${CMAKE_SOURCE_DIR}/Externals/Vulkan/Include + ${CMAKE_SOURCE_DIR}/Externals/Vulkan-Headers/include ${CMAKE_SOURCE_DIR}/Externals/VulkanMemoryAllocator/include ${CMAKE_SOURCE_DIR}/Externals/libadrenotools/include ) diff --git a/Source/Core/VideoBackends/Vulkan/VulkanLoader.h b/Source/Core/VideoBackends/Vulkan/VulkanLoader.h index d1a426d952..e4c8f9e8a6 100644 --- a/Source/Core/VideoBackends/Vulkan/VulkanLoader.h +++ b/Source/Core/VideoBackends/Vulkan/VulkanLoader.h @@ -46,18 +46,21 @@ #ifdef _MSVC_LANG #pragma warning(push, 4) #pragma warning(disable : 4189) // local variable is initialized but not referenced +#pragma warning(disable : 4505) // function with internal linkage is not referenced #endif // #ifdef _MSVC_LANG #ifdef __clang__ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wunused-variable" +#pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wnullability-completeness" #endif // #ifdef __clang__ #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-variable" +#pragma GCC diagnostic ignored "-Wunused-function" #endif // #ifdef __GNUC__ #define VMA_VULKAN_VERSION 1001000 -- cgit v1.2.3