mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 12:19:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12875 from luiscondesdi/updatevkheaders

Browse source 
Vulkan: Update Vulkan headers, VulkanMemoryAllocator
This commit is contained in:
Admiral H. Curtiss 2024-06-22 19:53:10 +02:00 • committed by GitHub
commit d49304a629
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
34 changed files with 10 additions and 220775 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/Core/VideoBackends/Vulkan/CMakeLists.txt
View file

@ -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
)

3
Source/Core/VideoBackends/Vulkan/VulkanLoader.h
View file

@ -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

2
Source/VSProps/Base.Dolphin.props
View file

@ -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-->