mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-05 14:09:01 +08:00
64f20adbd6
* Updated vulkan-headers, vulkan-hpp and vulkan-memory-allocator to new versions. * Updated the port ashes to fix compilation errors with the new Vulkan headers. Added vk_video/ to the list of copied header files in the port vulkan-headers. * Apply suggestions from code review regarding version strings Update version strings in ports/ashes/vcpkg.json and ports/vulkan-headers/vcpkg.json. Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Updated versioning information of modified ports. * Update version strings after changes in vcpkg.json files. Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
40 lines
2.0 KiB
Diff
40 lines
2.0 KiB
Diff
diff --git a/source/ashes/renderer/D3D11Renderer/ash_direct3d11.cpp b/source/ashes/renderer/D3D11Renderer/ash_direct3d11.cpp
|
|
index fb9a195a..3a97e126 100644
|
|
--- a/source/ashes/renderer/D3D11Renderer/ash_direct3d11.cpp
|
|
+++ b/source/ashes/renderer/D3D11Renderer/ash_direct3d11.cpp
|
|
@@ -1688,7 +1688,7 @@ namespace ashes::d3d11
|
|
VkPeerMemoryFeatureFlags * pPeerMemoryFeatures )
|
|
{
|
|
reportUnsupported( device, "vkGetDeviceGroupPeerMemoryFeatures" );
|
|
- *pPeerMemoryFeatures = VK_NULL_HANDLE;
|
|
+ *pPeerMemoryFeatures = static_cast<VkPeerMemoryFeatureFlags>(0);
|
|
}
|
|
|
|
void VKAPI_CALL vkCmdSetDeviceMask(
|
|
diff --git a/source/ashes/renderer/GlRenderer/ash_opengl.cpp b/source/ashes/renderer/GlRenderer/ash_opengl.cpp
|
|
index 45a17148..eec2419f 100644
|
|
--- a/source/ashes/renderer/GlRenderer/ash_opengl.cpp
|
|
+++ b/source/ashes/renderer/GlRenderer/ash_opengl.cpp
|
|
@@ -1700,7 +1700,7 @@ namespace ashes::gl
|
|
VkPeerMemoryFeatureFlags* pPeerMemoryFeatures )
|
|
{
|
|
reportUnsupported( device, "vkGetDeviceGroupPeerMemoryFeatures" );
|
|
- *pPeerMemoryFeatures = VK_NULL_HANDLE;
|
|
+ *pPeerMemoryFeatures = static_cast<VkPeerMemoryFeatureFlags>(0);
|
|
}
|
|
|
|
void VKAPI_CALL vkCmdSetDeviceMask(
|
|
diff --git a/source/ashes/renderer/TestRenderer/ash_test.cpp b/source/ashes/renderer/TestRenderer/ash_test.cpp
|
|
index 741dd75c..b34647b8 100644
|
|
--- a/source/ashes/renderer/TestRenderer/ash_test.cpp
|
|
+++ b/source/ashes/renderer/TestRenderer/ash_test.cpp
|
|
@@ -1735,7 +1735,7 @@ namespace ashes::test
|
|
VkPeerMemoryFeatureFlags* pPeerMemoryFeatures )
|
|
{
|
|
reportUnsupported( device, "vkGetDeviceGroupPeerMemoryFeatures" );
|
|
- *pPeerMemoryFeatures = VK_NULL_HANDLE;
|
|
+ *pPeerMemoryFeatures = static_cast<VkPeerMemoryFeatureFlags>(0);
|
|
}
|
|
|
|
void VKAPI_CALL vkCmdSetDeviceMask(
|