diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2024-06-22 19:53:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-22 19:53:10 +0200 |
| commit | d49304a629bc28e04a41c33f7b392040fefbc254 (patch) | |
| tree | cae655bed9ee9871cb16e44a9c7245c80012bcef /Source | |
| parent | b789cd498e955ff64f8b4094acc732089f548122 (diff) | |
| parent | 3f64031cbb2d8d0dad474acfc89faa54cf8678ea (diff) | |
Merge pull request #12875 from luiscondesdi/updatevkheaders
Vulkan: Update Vulkan headers, VulkanMemoryAllocator
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/VideoBackends/Vulkan/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/Vulkan/VulkanLoader.h | 3 | ||||
| -rw-r--r-- | Source/VSProps/Base.Dolphin.props | 2 |
3 files changed, 5 insertions, 2 deletions
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 diff --git a/Source/VSProps/Base.Dolphin.props b/Source/VSProps/Base.Dolphin.props index 33da70013e..d3ef409c9e 100644 --- a/Source/VSProps/Base.Dolphin.props +++ b/Source/VSProps/Base.Dolphin.props @@ -14,7 +14,7 @@ <AdditionalIncludeDirectories>$(ExternalsDir)OpenAL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ExternalsDir)expr\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ExternalsDir)rangeset\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <AdditionalIncludeDirectories>$(ExternalsDir)Vulkan\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(ExternalsDir)Vulkan-Headers\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ExternalsDir)VulkanMemoryAllocator\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ExternalsDir)WIL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <!--WIL doesn't have it's own vcxproj/exports, and no externals reference WIL, so this is fine to define only for Dolphin--> |