[vulkan-headers, vulkan-hpp ,vulkan-memory-allocator] Update to the latestion version (#18976)

* 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>
2025-01-18 16:53:02 +08:00 · 2021-07-22 23:25:45 +02:00 · 2021-07-22 23:25:45 +02:00 · 64f20adbd6
commit 64f20adbd6
parent 7fac0dc144
14 changed files with 79 additions and 17 deletions
--- a/ports/ashes/fix-cast.patch
+++ b/ports/ashes/fix-cast.patch
@ -0,0 +1,39 @@
+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(
--- a/ports/ashes/portfile.cmake
+++ b/ports/ashes/portfile.cmake
@ -5,8 +5,10 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 vcpkg_from_github(
 	OUT_SOURCE_PATH SOURCE_PATH
 	REPO DragonJoker/Ashes
-	REF 8331722d80fbd10d0bad87bd0a010c71a01a81c1
-	SHA512 a14b2a46c033a5e539a73e875d7ea98af5585f30b45293243e5dde5dc00e1f293b1917d62eda427c69c852ad6e6437eb5a8dd5b2e1dedf3b8f2b5e2fc3c24152
+	REF 0f4e6d0ea308eb60ae32274acc9a4d345a4977ff
+	SHA512 0ce74780786d018e7a447c4e49d3cd83ad53b238a79fc484025e2034cd49a64253363cd592d2da367befa7cd5443b90eb1c5dae54b22756f7b4a0cdecb93c588
+    PATCHES 
+        fix-cast.patch
 )
 vcpkg_configure_cmake(
 	SOURCE_PATH ${SOURCE_PATH}
--- a/ports/ashes/vcpkg.json
+++ b/ports/ashes/vcpkg.json
@ -1,6 +1,6 @@
 {
  "name": "ashes",
-  "version-string": "2021-02-09",
+  "version-date": "2021-06-18",
  "description": "Drop-in replacement to Vulkan's shared library, allowing the use of OpenGL or Direct3D11 in addition to Vulkan.",
  "homepage": "https://github.com/DragonJoker/Ashes",
  "supports": "!osx & !linux & !ios & !android & !uwp & !x86 & !arm & !static",
--- a/ports/vulkan-headers/portfile.cmake
+++ b/ports/vulkan-headers/portfile.cmake
@ -2,13 +2,14 @@
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO KhronosGroup/Vulkan-Headers
-    REF v1.2.157
-    SHA512 ab0051251ba7491b7d5720c78a187c0e75fc3056a2ad9718cbade56ea94a9ce6ac6b6d7bd8c3e998669c7f6ff5de0ea4d1b1d05df0dab6cf943c33a32d66b832
+    REF v1.2.184
+    SHA512 95ee241ca82ba4373dc53aefec36839b6a08478434742bd8de6750d875a7a5fcb2225afae5f6f400a7b302af87da7e226b725be5435236694e816e141a3b24ef
    HEAD_REF master
 )

 # This must be vulkan as other vulkan packages expect it there.
 file(COPY "${SOURCE_PATH}/include/vulkan/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vulkan")
+file(COPY "${SOURCE_PATH}/include/vk_video/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vk_video")

 # Handle copyright
 file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
--- a/ports/vulkan-headers/vcpkg.json
+++ b/ports/vulkan-headers/vcpkg.json
@ -1,6 +1,6 @@
 {
  "name": "vulkan-headers",
-  "version-string": "1.2.157",
+  "version-semver": "1.2.184",
  "description": "Vulkan header files and API registry",
  "homepage": "https://github.com/KhronosGroup/Vulkan-Headers"
 }
--- a/ports/vulkan-hpp/CONTROL
+++ b/ports/vulkan-hpp/CONTROL
@ -1,4 +1,4 @@
 Source: vulkan-hpp
-Version: 2019-05-11-1
+Version: 1.2.184
 Description: Header only C++ bindings for the Vulkan C API
 Build-Depends: vulkan
--- a/ports/vulkan-hpp/portfile.cmake
+++ b/ports/vulkan-hpp/portfile.cmake
@ -3,8 +3,8 @@
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO KhronosGroup/Vulkan-Hpp
-    REF 5ce8ae7fd0d9c0543d02f33cfa8a66e6a43e2150
-    SHA512 dc58332f5075f0b4d001abd4e78664be099509b8cee525a211aa33599f2351bf5e200fef37dccc84895d8f7a056f075ae3cf404f9aac7281970ff903e4a67a96
+    REF v1.2.184
+    SHA512 564bb5fd3b89fc8078e3c4d99c719f4d62166d78891bc529d6d07add1843137ec8f62a92dbdcfa9ffa8a9677fba41da1b591a033c61b27c43c70c25be32c3205
    HEAD_REF master
 )

--- a/ports/vulkan-memory-allocator/CONTROL
+++ b/ports/vulkan-memory-allocator/CONTROL
@ -1,3 +1,3 @@
 Source: vulkan-memory-allocator
-Version: 2.3.0
+Version: 2021-07-07
 Description: Easy to integrate Vulkan memory allocation library from GPUOpen
--- a/ports/vulkan-memory-allocator/portfile.cmake
+++ b/ports/vulkan-memory-allocator/portfile.cmake
@ -1,12 +1,12 @@
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator
-    REF v2.3.0+vs2017
-    SHA512 57113c52dcccc4df79ebf36f091f1232f68ee45c48934a5b91c2d87b5599d8c176ca7a47e285ddf146ec0b3c83db5808c2e6c3f6e1b453e20a8525f73211bf8d
+    REF 55868965ae1fa956c07695d4642e1add8c9450f7
+    SHA512 433d8a961a1fa4c80894f014fdfbbcafeb94932a3eea2eced9c7109dcbf7350a60efb9fb1d8f3c621f2d72c118f47f82f8e9e6f4db75038fbad3a727b5896479
    HEAD_REF master
 )

-file(COPY "${SOURCE_PATH}/src/vk_mem_alloc.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+file(COPY "${SOURCE_PATH}/include/vk_mem_alloc.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")

 file(COPY ${CMAKE_CURRENT_LIST_DIR}/unofficial-vulkan-memory-allocator-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/unofficial-vulkan-memory-allocator)

--- a/versions/a-/ashes.json
+++ b/versions/a-/ashes.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "3d20e63c5d3a016d41571baefa723a23113c13c3",
+      "version-date": "2021-06-18",
+      "port-version": 0
+    },
    {
      "git-tree": "5e0e57612b419c8cdb33f26195213626c59e7efd",
      "version-string": "2021-02-09",
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -165,7 +165,7 @@
      "port-version": 1
    },
    "ashes": {
-      "baseline": "2021-02-09",
+      "baseline": "2021-06-18",
      "port-version": 0
    },
    "asio": {
@ -6605,15 +6605,15 @@
      "port-version": 0
    },
    "vulkan-headers": {
-      "baseline": "1.2.157",
+      "baseline": "1.2.184",
      "port-version": 0
    },
    "vulkan-hpp": {
-      "baseline": "2019-05-11-1",
+      "baseline": "1.2.184",
      "port-version": 0
    },
    "vulkan-memory-allocator": {
-      "baseline": "2.3.0",
+      "baseline": "2021-07-07",
      "port-version": 0
    },
    "vxl": {
--- a/versions/v-/vulkan-headers.json
+++ b/versions/v-/vulkan-headers.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "67ab6950d3e363975e70de04b73c39a35db721b3",
+      "version-semver": "1.2.184",
+      "port-version": 0
+    },
    {
      "git-tree": "2bfc0cee813eec4db22084402370b7e40556027e",
      "version-string": "1.2.157",
--- a/versions/v-/vulkan-hpp.json
+++ b/versions/v-/vulkan-hpp.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "f4ca1555372a398629a4bd1728b6870efb93d674",
+      "version-string": "1.2.184",
+      "port-version": 0
+    },
    {
      "git-tree": "2480b7c83826a22adba9e5fbad769ab547285818",
      "version-string": "2019-05-11-1",
--- a/versions/v-/vulkan-memory-allocator.json
+++ b/versions/v-/vulkan-memory-allocator.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "0b1560d8d5ccc9a903ed8159fccecd2bd29e2125",
+      "version-string": "2021-07-07",
+      "port-version": 0
+    },
    {
      "git-tree": "dd2f676035a767641141490caae2ac057ed59e83",
      "version-string": "2.3.0",