diff options
| author | Christoph Neuhauser <c.a.neuhauser@gmail.com> | 2021-07-22 23:25:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-22 14:25:45 -0700 |
| commit | 64f20adbd65eb6ede1ab4b31426c7c4b519d1728 (patch) | |
| tree | 8fa84ec5a6dd29736edf90919534944d66da96d1 /ports/ashes | |
| parent | 7fac0dc1440b79ac9afffaa2af45578518d5750e (diff) | |
| download | vcpkg-64f20adbd65eb6ede1ab4b31426c7c4b519d1728.tar.gz vcpkg-64f20adbd65eb6ede1ab4b31426c7c4b519d1728.zip | |
[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>
Diffstat (limited to 'ports/ashes')
| -rw-r--r-- | ports/ashes/fix-cast.patch | 39 | ||||
| -rw-r--r-- | ports/ashes/portfile.cmake | 6 | ||||
| -rw-r--r-- | ports/ashes/vcpkg.json | 2 |
3 files changed, 44 insertions, 3 deletions
diff --git a/ports/ashes/fix-cast.patch b/ports/ashes/fix-cast.patch new file mode 100644 index 000000000..27db3d2eb --- /dev/null +++ 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(
diff --git a/ports/ashes/portfile.cmake b/ports/ashes/portfile.cmake index d862a635f..ef2fcf40f 100644 --- 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}
diff --git a/ports/ashes/vcpkg.json b/ports/ashes/vcpkg.json index 8f13d5e38..cc2567786 100644 --- 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", |