diff --git a/ports/lunarg-vulkantools/0001-apidump-Add-missing-calling-convention-attributes.patch b/ports/lunarg-vulkantools/0001-apidump-Add-missing-calling-convention-attributes.patch new file mode 100644 index 0000000000..5a4db0d9ce --- /dev/null +++ b/ports/lunarg-vulkantools/0001-apidump-Add-missing-calling-convention-attributes.patch @@ -0,0 +1,52 @@ +From 0c662b624f8514f1e987885600ca0a1a3a700352 Mon Sep 17 00:00:00 2001 +From: Charles Giessen +Date: Tue, 21 Jul 2026 15:40:25 -0500 +Subject: [PATCH] apidump: Add missing calling convention attributes + +And moves extern "C" to be consistent between the declaration and the +definition. +--- + layersvt/api_dump.h | 4 ++-- + layersvt/api_dump_handwritten_dispatch.cpp | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/layersvt/api_dump.h b/layersvt/api_dump.h +index d0b78e594..d061f754b 100644 +--- a/layersvt/api_dump.h ++++ b/layersvt/api_dump.h +@@ -94,8 +94,8 @@ + + extern "C" { + // Forward declarations for dispatch +-PFN_vkVoidFunction layer_vkGetInstanceProcAddr(VkInstance instance, const char* pName); +-PFN_vkVoidFunction layer_vkGetDeviceProcAddr(VkDevice device, const char* pName); ++VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL layer_vkGetInstanceProcAddr(VkInstance instance, const char* pName); ++VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL layer_vkGetDeviceProcAddr(VkDevice device, const char* pName); + } + + #define MAX_STRING_LENGTH 1024 +diff --git a/layersvt/api_dump_handwritten_dispatch.cpp b/layersvt/api_dump_handwritten_dispatch.cpp +index 070dd599d..f2175401e 100644 +--- a/layersvt/api_dump_handwritten_dispatch.cpp ++++ b/layersvt/api_dump_handwritten_dispatch.cpp +@@ -27,6 +27,8 @@ + + #include "generated/api_dump_dispatch.h" + ++extern "C" { ++ + VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL layer_vkGetInstanceProcAddr(VkInstance instance, const char* pName) { + PFN_vkVoidFunction instance_func = nullptr; + switch (ApiDumpInstance::current().settings().format()) { +@@ -84,8 +86,6 @@ VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL layer_vkGetDeviceProcAddr(VkDevice devi + return device_dispatch_table(device)->GetDeviceProcAddr(device, pName); + } + +-extern "C" { +- + EXPORT_FUNCTION VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vkGetInstanceProcAddr(VkInstance instance, const char* funcName) { + return layer_vkGetInstanceProcAddr(instance, funcName); + } +-- +2.53.0.windows.3 + diff --git a/ports/lunarg-vulkantools/portfile.cmake b/ports/lunarg-vulkantools/portfile.cmake index 686835bf70..d57b783daa 100644 --- a/ports/lunarg-vulkantools/portfile.cmake +++ b/ports/lunarg-vulkantools/portfile.cmake @@ -7,11 +7,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO LunarG/VulkanTools REF "vulkan-sdk-${VERSION}" - SHA512 f9724dacf5a9be1241f7414cf6eb7159bc75779650441a68c20f29b7bfbb3472418bf7611ae034f16ff80708e30c1ce62b088af429c408d57273a3b3628a57ed + SHA512 b8d1a20a64fe36ddacc2c68298e7a73bbac2030439eaab7de228b6df480348fee5a0a1d72708d5b70aee7c58700b76a41f78b781ef5c9c74a7d59f6675f53e83 HEAD_REF main PATCHES disable-qtdeploy.patch static-linkage.patch + # Backport of https://github.com/LunarG/VulkanTools/pull/2707 + 0001-apidump-Add-missing-calling-convention-attributes.patch ) x_vcpkg_get_python_packages(PYTHON_VERSION "3" PACKAGES jsonschema OUT_PYTHON_VAR PYTHON3) diff --git a/ports/lunarg-vulkantools/vcpkg.json b/ports/lunarg-vulkantools/vcpkg.json index 1d39da816f..1cf2535145 100644 --- a/ports/lunarg-vulkantools/vcpkg.json +++ b/ports/lunarg-vulkantools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "lunarg-vulkantools", - "version": "1.4.350.1", + "version": "1.4.357.0", "description": "Tools to aid in Vulkan development", "homepage": "https://github.com/LunarG/VulkanTools", "license": null, diff --git a/ports/spirv-cross/portfile.cmake b/ports/spirv-cross/portfile.cmake index 5c9617d833..2ba824a102 100644 --- a/ports/spirv-cross/portfile.cmake +++ b/ports/spirv-cross/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/SPIRV-Cross REF vulkan-sdk-${VERSION} - SHA512 431cb5ea51aee2d04195cc54674343e84245ec92ca249d17599f7e16d111f2f5650cb7eb6c53c93d33c8ac7d1832ce31bfe20561e12ed00b3b2ede5944e2c890 + SHA512 b02d43382fec30ff4f594794d153918eb1fd9b3329603fbffab0249e29c60c1364d2607317d7a2c6c2c0a61871d669166c4395bace288595ef4e472badaebfd2 HEAD_REF master ) diff --git a/ports/spirv-cross/vcpkg.json b/ports/spirv-cross/vcpkg.json index 11957a4992..e82f33535b 100644 --- a/ports/spirv-cross/vcpkg.json +++ b/ports/spirv-cross/vcpkg.json @@ -1,6 +1,6 @@ { "name": "spirv-cross", - "version": "1.4.350.1", + "version": "1.4.357.0", "description": "SPIRV-Cross is a practical tool and library for performing reflection on SPIR-V and disassembling SPIR-V back to high level languages.", "homepage": "https://github.com/KhronosGroup/SPIRV-Cross", "dependencies": [ diff --git a/ports/spirv-headers/portfile.cmake b/ports/spirv-headers/portfile.cmake index 0130a0c6be..779e6ee8da 100644 --- a/ports/spirv-headers/portfile.cmake +++ b/ports/spirv-headers/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/SPIRV-Headers REF "vulkan-sdk-${VERSION}" - SHA512 789fb10aa0c3a08934a6067dab1da09e93880e7c75575bf6054dc51df35416feb5daff73c7a3faf1681a2b33275315e44ef3665617fe75cdd18b991a8b7e9991 + SHA512 54ef13eb8375dd3f1b4f30814c83fa5c994f4a73a446ceb6741d244fcffa1571b9d61fedc9c68974f65240adae14ec9b91a04575c78ab1c97442e28439ac71b5 HEAD_REF master ) diff --git a/ports/spirv-headers/vcpkg.json b/ports/spirv-headers/vcpkg.json index 582c4af172..257f3bad62 100644 --- a/ports/spirv-headers/vcpkg.json +++ b/ports/spirv-headers/vcpkg.json @@ -1,6 +1,6 @@ { "name": "spirv-headers", - "version": "1.4.350.1", + "version": "1.4.357.0", "description": "Machine-readable files for the SPIR-V Registry", "homepage": "https://github.com/KhronosGroup/SPIRV-Headers", "dependencies": [ diff --git a/ports/spirv-reflect/portfile.cmake b/ports/spirv-reflect/portfile.cmake index c88ac153b1..1502340bf2 100644 --- a/ports/spirv-reflect/portfile.cmake +++ b/ports/spirv-reflect/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/SPIRV-Reflect REF "vulkan-sdk-${VERSION}" - SHA512 d48fd41e3d431bb22742ed507e465424f606957d7decd791ca240e8129ecdf817fc41954586953de1ff3a0a76c89a6166a74f689b98bb71d32f0277da0cd4cc9 + SHA512 89b8a0363df801aaeac7e01a1af66ef6806c7ef5600a920306ffd3c11f1a089ad01de8bb5a1b186bb9f0c082d5580e8c7fcea185b57e38f18f079f1ccb3940bb HEAD_REF main PATCHES export-targets.patch diff --git a/ports/spirv-reflect/vcpkg.json b/ports/spirv-reflect/vcpkg.json index 995203785e..67e7e0a507 100644 --- a/ports/spirv-reflect/vcpkg.json +++ b/ports/spirv-reflect/vcpkg.json @@ -1,6 +1,6 @@ { "name": "spirv-reflect", - "version": "1.4.350.1", + "version": "1.4.357.0", "description": "SPIRV-Reflect is a lightweight library that provides a C/C++ reflection API for SPIR-V shader bytecode in Vulkan applications.", "homepage": "https://github.com/KhronosGroup/SPIRV-Reflect", "license": "Apache-2.0", diff --git a/ports/spirv-tools/portfile.cmake b/ports/spirv-tools/portfile.cmake index 881c64a1c5..ebb69c09fc 100644 --- a/ports/spirv-tools/portfile.cmake +++ b/ports/spirv-tools/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/SPIRV-Tools REF "vulkan-sdk-${VERSION}" - SHA512 97732eccca2292e80c1c2ca3d1a24fdd89ec342a4c312cb06949b29033c70b4ac3abc1551d8dacafe843e3719e4e160d4dd153195f7483584f40a646ecb74905 + SHA512 e853b7a08d1d1001a45e8d8f7179be7b02d803959d598bd9d097f096b33fd2a380bcecc8c9c1c446941b9df41018271b45d7995f79f8d360e15feb0c32d43f39 PATCHES cmake-config-dir.diff spirv-tools-shared.diff diff --git a/ports/spirv-tools/vcpkg.json b/ports/spirv-tools/vcpkg.json index 7b4a178f43..aa952a77c7 100644 --- a/ports/spirv-tools/vcpkg.json +++ b/ports/spirv-tools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "spirv-tools", - "version": "1.4.350.1", + "version": "1.4.357.0", "description": "API and commands for processing SPIR-V modules", "homepage": "https://github.com/KhronosGroup/SPIRV-Tools", "license": "Apache-2.0", diff --git a/ports/vk-bootstrap/portfile.cmake b/ports/vk-bootstrap/portfile.cmake index d3dee4d169..b90392e302 100644 --- a/ports/vk-bootstrap/portfile.cmake +++ b/ports/vk-bootstrap/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO charles-lunarg/vk-bootstrap REF "v${VERSION}" - SHA512 4c4490f033d4a0c8da299016c124bfb2f8d28d58f8061ca078389727889e7753ea567b8d2261aac50c4b85e2a6a55c7cae8b2b75422888439b7628a9e66a02b5 + SHA512 bac7b03ab0e4cebd703dc04d18d05ebc6edc09ba3e20f899320a758ba88369ba936a98323028b449e26f4889b7ebea5ac60184fc4e84389d072293c9a6497844 HEAD_REF master PATCHES fix-targets.patch diff --git a/ports/vk-bootstrap/vcpkg.json b/ports/vk-bootstrap/vcpkg.json index 8640e403bf..f9f9da5ec7 100644 --- a/ports/vk-bootstrap/vcpkg.json +++ b/ports/vk-bootstrap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vk-bootstrap", - "version": "1.4.350", + "version": "1.4.357", "description": "Vulkan bootstraping library", "homepage": "https://github.com/charles-lunarg/vk-bootstrap", "license": "MIT", diff --git a/ports/volk/portfile.cmake b/ports/volk/portfile.cmake index d062605873..a647bd7d56 100644 --- a/ports/volk/portfile.cmake +++ b/ports/volk/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeux/volk REF "vulkan-sdk-${VERSION}" - SHA512 7377965906f6b7eabc2038defc82eefb2d0d31b5aa60935f98cffb57a93c40abe1ca091092a41f9dea233346026975f0bde21824c4d82355aa2f5b1684caad09 + SHA512 44feaf57236d8f52d4bde05cf4ba59de5df4730b6c8dc38c278a3aa13d02d4bb48e11660832232f7122c2d55b65d60fe9b5f8fe6725ee63d5d5213e5275b7110 HEAD_REF master ) diff --git a/ports/volk/vcpkg.json b/ports/volk/vcpkg.json index 6d1c16c90b..fb3f9effe3 100644 --- a/ports/volk/vcpkg.json +++ b/ports/volk/vcpkg.json @@ -1,6 +1,6 @@ { "name": "volk", - "version": "1.4.350.1", + "version": "1.4.357.0", "description": [ "Meta loader for Vulkan API.", "Note that the static library target volk::volk is built without platform-specific defines.", diff --git a/ports/vulkan-extensionlayer/portfile.cmake b/ports/vulkan-extensionlayer/portfile.cmake index 792fdf1958..74f7354a7f 100644 --- a/ports/vulkan-extensionlayer/portfile.cmake +++ b/ports/vulkan-extensionlayer/portfile.cmake @@ -7,7 +7,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/Vulkan-ExtensionLayer REF "vulkan-sdk-${VERSION}" - SHA512 5f87981049e184962be998132aeeabb062fb02ff7956489e1cfb9b79531393a34f3779977fd3b8e864989645f2ec2cba18cd07f72c305da311a781ae01f8e375 + SHA512 365741d6f2a06864422a33ac98c3b1defa8d4b7054172232ffe5ef7518510db88d61136d27b4a37d3349318cfdfa91323a2e5dad7beb22387b2d8131679d367a HEAD_REF main ) diff --git a/ports/vulkan-extensionlayer/vcpkg.json b/ports/vulkan-extensionlayer/vcpkg.json index f103c02530..8da7d9c138 100644 --- a/ports/vulkan-extensionlayer/vcpkg.json +++ b/ports/vulkan-extensionlayer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vulkan-extensionlayer", - "version": "1.4.350.1", + "version": "1.4.357.0", "description": "Layer providing Vulkan features when native support is unavailable", "homepage": "https://github.com/KhronosGroup/Vulkan-ExtensionLayer", "license": "Apache-2.0", diff --git a/ports/vulkan-headers/portfile.cmake b/ports/vulkan-headers/portfile.cmake index 1e672fd7db..0c0c146ed0 100644 --- a/ports/vulkan-headers/portfile.cmake +++ b/ports/vulkan-headers/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/Vulkan-Headers REF "vulkan-sdk-${VERSION}" - SHA512 eee702ee5ff447986901e44989d96a5e38f7ef7f67e2015c8db6280251cb23b69cb9e1a0568b0a43dc3df820685079ed31998a1dc4704f5649768e26db5147b1 + SHA512 253975e391fe23a3a63f9c10b7510e5e5bce6b15b36a81499eba9ceb1000cbf69b00807442b4678e69d4b6a2a8ec14c6c0d9d05ec739c277ca1cd8ee7d5d84f6 HEAD_REF main ) diff --git a/ports/vulkan-headers/vcpkg.json b/ports/vulkan-headers/vcpkg.json index 609d257886..96fddf9fbb 100644 --- a/ports/vulkan-headers/vcpkg.json +++ b/ports/vulkan-headers/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vulkan-headers", - "version": "1.4.350.1", + "version": "1.4.357.0", "description": "Vulkan header files and API registry", "homepage": "https://github.com/KhronosGroup/Vulkan-Headers", "license": "Apache-2.0 OR MIT", diff --git a/ports/vulkan-loader/fix-marmasm-conditional-assembly.patch b/ports/vulkan-loader/fix-marmasm-conditional-assembly.patch new file mode 100644 index 0000000000..cf04c25c8e --- /dev/null +++ b/ports/vulkan-loader/fix-marmasm-conditional-assembly.patch @@ -0,0 +1,56 @@ +diff --git a/loader/unknown_ext_chain_marmasm.asm b/loader/unknown_ext_chain_marmasm.asm +index 61f0182..6e9ee40 100644 +--- a/loader/unknown_ext_chain_marmasm.asm ++++ b/loader/unknown_ext_chain_marmasm.asm +@@ -25,18 +25,11 @@ + ; jump to the next function in the call chain + + +-#if defined(_ARM64EC_) +-; arm64ec needs the SDK macros, which ksarm64.h gates on _M_ARM64EC. MARMASM +-; doesn't set that, so derive it from the _ARM64EC_ it does set. +-#define _M_ARM64EC 1 +-#include "ksarm64.h" +-#endif +- + GET gen_defines.asm + + EXTERN loader_log_asm_function_not_supported + +-#if defined(_ARM64EC_) ++ IF :DEF: _ARM64EC_ + + ; arm64ec apps can reach these through emulated x64, so each trampoline is an + ; adjustor thunk: an entry thunk for x64 callers (jumps via __os_arm64x_x64_jump) +@@ -137,7 +130,7 @@ terminError$num + NESTED_END + MEND + +-#else ++ ELSE + + IF AARCH_64==1 + +@@ -244,18 +237,18 @@ vkdev_ext$num FUNCTION + + ENDIF + +-#endif ++ ENDIF + + AREA terminator_string_data, DATA, READONLY + + termin_error_string DCB "Function %s not supported for this physical device", 0 + +-#if defined(_ARM64EC_) ++ IF :DEF: _ARM64EC_ + ; the entry-thunk pointer wants 16-byte aligned functions, so set .text alignment here + AREA |.text|, CODE, READONLY, ALIGN=4 +-#else ++ ELSE + AREA UnknownFunctionImpl, CODE, READONLY +-#endif ++ ENDIF + + PhysDevExtTramp 0 + PhysDevExtTramp 1 diff --git a/ports/vulkan-loader/portfile.cmake b/ports/vulkan-loader/portfile.cmake index c08f72e20b..8c077a0787 100644 --- a/ports/vulkan-loader/portfile.cmake +++ b/ports/vulkan-loader/portfile.cmake @@ -4,10 +4,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/Vulkan-Loader REF "vulkan-sdk-${VERSION}" - SHA512 158602f1527392280744404bdeb80961ab972c076f9a99d5e35ba2ab37b96bd9c8d96041b93763787ec21a8a5b2587e4d40236afa6c4a0bc23255e9b3426ef31 + SHA512 3376ce1be08ec4f453d6674118cc5e59d07ba7c7ec135f3cdd4d6820fa26bf4ef5e176ac9ade4413d25d90b4828060a1d0e0c1c2a7b4bec3118d70cdd61e6bfa HEAD_REF main PATCHES link-directfb.patch + fix-marmasm-conditional-assembly.patch ) vcpkg_find_acquire_program(PYTHON3) diff --git a/ports/vulkan-loader/vcpkg.json b/ports/vulkan-loader/vcpkg.json index 79f8e2b712..ca51965aa2 100644 --- a/ports/vulkan-loader/vcpkg.json +++ b/ports/vulkan-loader/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vulkan-loader", - "version": "1.4.350.1", + "version": "1.4.357.0", "description": "Vulkan Development Tools", "homepage": "https://github.com/KhronosGroup/Vulkan-Loader", "license": null, diff --git a/ports/vulkan-sdk-components/vcpkg.json b/ports/vulkan-sdk-components/vcpkg.json index c4cd51163c..6ba0b29af0 100644 --- a/ports/vulkan-sdk-components/vcpkg.json +++ b/ports/vulkan-sdk-components/vcpkg.json @@ -1,7 +1,7 @@ { "$comment": "Dependencies extracted from e.g. https://sdk.lunarg.com/sdk/download/1.3.290.0/windows/config.json", "name": "vulkan-sdk-components", - "version": "1.4.350.0", + "version": "1.4.357.0", "description": "Installs packages which are part of the Vulkan SDK.", "license": null, "supports": "!uwp & !xbox", diff --git a/ports/vulkan-tools/portfile.cmake b/ports/vulkan-tools/portfile.cmake index 5e59ecb3fb..0dd3725607 100644 --- a/ports/vulkan-tools/portfile.cmake +++ b/ports/vulkan-tools/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/Vulkan-Tools REF "vulkan-sdk-${VERSION}" - SHA512 016bceae9d2caa276a6d7465f53e8a608e94c2c029f5be36c8706f23a0196c1e7bfff60a057c8cd3d39b7c143ece08977a6459500c5da0d9dd29b2fa2cab1f2a + SHA512 edfaf3cb0b7ce0547b7379764aea706443a70cbf1b1074089404ec22f4b84ed3ac55050c1cb230093345f22d6332e9a9459054c730da1e4be636cd09f820c4fa HEAD_REF main ) diff --git a/ports/vulkan-tools/vcpkg.json b/ports/vulkan-tools/vcpkg.json index 945b15b5fe..25d54ea74d 100644 --- a/ports/vulkan-tools/vcpkg.json +++ b/ports/vulkan-tools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vulkan-tools", - "version": "1.4.350.1", + "version": "1.4.357.0", "description": "Vulkan Development Tools", "homepage": "https://github.com/KhronosGroup/Vulkan-Tools", "license": "Apache-2.0", diff --git a/ports/vulkan-utility-libraries/portfile.cmake b/ports/vulkan-utility-libraries/portfile.cmake index 2af9d73938..10a30d94b6 100644 --- a/ports/vulkan-utility-libraries/portfile.cmake +++ b/ports/vulkan-utility-libraries/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/Vulkan-Utility-Libraries REF "vulkan-sdk-${VERSION}" - SHA512 67a696ebb961cf51414a255aad9fdf0bf5c9b8fff38e7824c73e5f33d8815b8bc9d22944a7d30d475ed7929464787c1ded93dbf23897826970bc4bef07268e49 + SHA512 97c8d4bdfaa6faed17d004f2fc27ef342e887cc63da1d121a5fd7ea3e35c24c5c770fb33fa088685d047d069b9d68336d48bdc4a3f0fa88d1336e2f09476c63c HEAD_REF main ) diff --git a/ports/vulkan-utility-libraries/vcpkg.json b/ports/vulkan-utility-libraries/vcpkg.json index 4e21974453..032eb9fb04 100644 --- a/ports/vulkan-utility-libraries/vcpkg.json +++ b/ports/vulkan-utility-libraries/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vulkan-utility-libraries", - "version": "1.4.350.1", + "version": "1.4.357.0", "description": "Utility libraries for Vulkan developers", "homepage": "https://github.com/KhronosGroup/Vulkan-Utility-Libraries", "license": null, diff --git a/ports/vulkan-validationlayers/disable-ltcg-on-x86.patch b/ports/vulkan-validationlayers/disable-ltcg-on-x86.patch new file mode 100644 index 0000000000..749298245d --- /dev/null +++ b/ports/vulkan-validationlayers/disable-ltcg-on-x86.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8d20036..03eb7a3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -201,7 +201,9 @@ elseif(MSVC) + add_link_options("$<$:/DEBUG:FULL>") + + # Enable /LTCG (Link-time code generation) +- set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE ON) ++ if(NOT CMAKE_SIZEOF_VOID_P EQUAL 4) ++ set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE ON) ++ endif() + # Remove unreferenced code/data. + add_link_options("$<$:/OPT:REF>") + # Merge duplicate data/functions diff --git a/ports/vulkan-validationlayers/fix-clang-windows-def-exports.diff b/ports/vulkan-validationlayers/fix-clang-windows-def-exports.diff deleted file mode 100644 index d74df1279f..0000000000 --- a/ports/vulkan-validationlayers/fix-clang-windows-def-exports.diff +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt -index 4a8ca7d..e091a8d 100644 ---- a/layers/CMakeLists.txt -+++ b/layers/CMakeLists.txt -@@ -541,6 +541,12 @@ elseif(MINGW) - target_sources(vvl PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/${LAYER_NAME}.def) - target_compile_options(vvl PRIVATE -Wa,-mbig-obj) - set_target_properties(vvl PROPERTIES PREFIX "") # remove the prefix "lib" so the manifest json "library_path" matches -+elseif(WIN32) -+ # A GNU-frontend clang targeting *-windows-msvc (i.e. clang/clang++, not -+ # clang-cl) is detected as neither MSVC nor MINGW, so without this branch it -+ # falls through to the ELF --version-script case below, which the Windows -+ # linker (lld-link) rejects. Forward the MSVC-style .def through the driver. -+ target_link_options(vvl PRIVATE LINKER:/DEF:${CMAKE_CURRENT_SOURCE_DIR}/${LAYER_NAME}.def) - elseif(APPLE) - - # IOS and APPLE can both be true (FYI) diff --git a/ports/vulkan-validationlayers/portfile.cmake b/ports/vulkan-validationlayers/portfile.cmake index 820067726c..396be54ee9 100644 --- a/ports/vulkan-validationlayers/portfile.cmake +++ b/ports/vulkan-validationlayers/portfile.cmake @@ -4,11 +4,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/Vulkan-ValidationLayers REF "vulkan-sdk-${VERSION}" - SHA512 ad07fcb4226e70dca82b419f257217245f354c47ef387fb1e6eac45574341fe1ddd4b9f5cfe7bf009b75000deca52b89c1c34d212c8c165b219151ac21f253c5 + SHA512 5bdec84ad1072e9728ab6c599c2f67af8d5b8b5f58f565a5f74f7a98a5e8b414e7b89b2c0c1b6de45c6ba6c58f9f1cd9953e242919bbb98c0c79888ecd328800 HEAD_REF main PATCHES disable_vendored_phmap.diff - fix-clang-windows-def-exports.diff + disable-ltcg-on-x86.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/layers/external/parallel_hashmap") # ensure that we use vcpkg's parallel-hashmap instead of upstream's vendored copy diff --git a/ports/vulkan-validationlayers/vcpkg.json b/ports/vulkan-validationlayers/vcpkg.json index 2f7db3cf04..b93bf1508f 100644 --- a/ports/vulkan-validationlayers/vcpkg.json +++ b/ports/vulkan-validationlayers/vcpkg.json @@ -1,7 +1,6 @@ { "name": "vulkan-validationlayers", - "version": "1.4.350.1", - "port-version": 1, + "version": "1.4.357.0", "description": "Vulkan Validation Layers (VVL)", "homepage": "https://github.com/KhronosGroup/Vulkan-ValidationLayers", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 2cfcab99e2..e8e88dbc44 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6317,7 +6317,7 @@ "port-version": 0 }, "lunarg-vulkantools": { - "baseline": "1.4.350.1", + "baseline": "1.4.357.0", "port-version": 0 }, "lunasvg": { @@ -9641,19 +9641,19 @@ "port-version": 4 }, "spirv-cross": { - "baseline": "1.4.350.1", + "baseline": "1.4.357.0", "port-version": 0 }, "spirv-headers": { - "baseline": "1.4.350.1", + "baseline": "1.4.357.0", "port-version": 0 }, "spirv-reflect": { - "baseline": "1.4.350.1", + "baseline": "1.4.357.0", "port-version": 0 }, "spirv-tools": { - "baseline": "1.4.350.1", + "baseline": "1.4.357.0", "port-version": 0 }, "spix": { @@ -10757,7 +10757,7 @@ "port-version": 0 }, "vk-bootstrap": { - "baseline": "1.4.350", + "baseline": "1.4.357", "port-version": 0 }, "vkfft": { @@ -10785,7 +10785,7 @@ "port-version": 0 }, "volk": { - "baseline": "1.4.350.1", + "baseline": "1.4.357.0", "port-version": 0 }, "voro": { @@ -10841,11 +10841,11 @@ "port-version": 0 }, "vulkan-extensionlayer": { - "baseline": "1.4.350.1", + "baseline": "1.4.357.0", "port-version": 0 }, "vulkan-headers": { - "baseline": "1.4.350.1", + "baseline": "1.4.357.0", "port-version": 0 }, "vulkan-hpp": { @@ -10853,7 +10853,7 @@ "port-version": 0 }, "vulkan-loader": { - "baseline": "1.4.350.1", + "baseline": "1.4.357.0", "port-version": 0 }, "vulkan-memory-allocator": { @@ -10865,20 +10865,20 @@ "port-version": 1 }, "vulkan-sdk-components": { - "baseline": "1.4.350.0", + "baseline": "1.4.357.0", "port-version": 0 }, "vulkan-tools": { - "baseline": "1.4.350.1", + "baseline": "1.4.357.0", "port-version": 0 }, "vulkan-utility-libraries": { - "baseline": "1.4.350.1", + "baseline": "1.4.357.0", "port-version": 0 }, "vulkan-validationlayers": { - "baseline": "1.4.350.1", - "port-version": 1 + "baseline": "1.4.357.0", + "port-version": 0 }, "vvenc": { "baseline": "1.14.0", diff --git a/versions/l-/lunarg-vulkantools.json b/versions/l-/lunarg-vulkantools.json index ba1650cd6e..83dbfdc1fd 100644 --- a/versions/l-/lunarg-vulkantools.json +++ b/versions/l-/lunarg-vulkantools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "812041cb12e89234a9ae8b0343cbf746bd512118", + "version": "1.4.357.0", + "port-version": 0 + }, { "git-tree": "e6b85bd4307fd456ec1c41cfeb981db80c6dbcdb", "version": "1.4.350.1", diff --git a/versions/s-/spirv-cross.json b/versions/s-/spirv-cross.json index 5811db7d92..5a89ad80f9 100644 --- a/versions/s-/spirv-cross.json +++ b/versions/s-/spirv-cross.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "53a95c2c4d6393de4fe074e3e1d819c7ddf7635d", + "version": "1.4.357.0", + "port-version": 0 + }, { "git-tree": "27e2f06963610b28fe83778fc15464f855b5dbcc", "version": "1.4.350.1", diff --git a/versions/s-/spirv-headers.json b/versions/s-/spirv-headers.json index cd66bd2873..76b6146d08 100644 --- a/versions/s-/spirv-headers.json +++ b/versions/s-/spirv-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3d961acfd1031d396517314818c8cf42d9bd2fa3", + "version": "1.4.357.0", + "port-version": 0 + }, { "git-tree": "7c27cb54a1af448c53e200f3895401f0de987d05", "version": "1.4.350.1", diff --git a/versions/s-/spirv-reflect.json b/versions/s-/spirv-reflect.json index 65a4bb70b6..548b8e3b4a 100644 --- a/versions/s-/spirv-reflect.json +++ b/versions/s-/spirv-reflect.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b20a6fe2bf917f560342f0970dc8fdf851646ba6", + "version": "1.4.357.0", + "port-version": 0 + }, { "git-tree": "6bf8f910186c43f4eac548dca6bf85551e99da49", "version": "1.4.350.1", diff --git a/versions/s-/spirv-tools.json b/versions/s-/spirv-tools.json index ab02d30fc0..ee04c9f585 100644 --- a/versions/s-/spirv-tools.json +++ b/versions/s-/spirv-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6d9cbafa3c851e4d91a220e93b765c2d26731c67", + "version": "1.4.357.0", + "port-version": 0 + }, { "git-tree": "90cd56e0dba36dc9db18f12fc4324bfb11ffc7b8", "version": "1.4.350.1", diff --git a/versions/v-/vk-bootstrap.json b/versions/v-/vk-bootstrap.json index e29def7005..fe51f125a1 100644 --- a/versions/v-/vk-bootstrap.json +++ b/versions/v-/vk-bootstrap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d37eaf5954a64eb83322593714026d982d491407", + "version": "1.4.357", + "port-version": 0 + }, { "git-tree": "b488745fbdfc97e37982a396a8568b7661e6f70a", "version": "1.4.350", diff --git a/versions/v-/volk.json b/versions/v-/volk.json index f942ad299a..d71a714bad 100644 --- a/versions/v-/volk.json +++ b/versions/v-/volk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac9d2230209404f5343cefa1d090a5ee6afe3528", + "version": "1.4.357.0", + "port-version": 0 + }, { "git-tree": "8bf417303019536d4929d018c685e12726f09eca", "version": "1.4.350.1", diff --git a/versions/v-/vulkan-extensionlayer.json b/versions/v-/vulkan-extensionlayer.json index 95da108446..3661ab31db 100644 --- a/versions/v-/vulkan-extensionlayer.json +++ b/versions/v-/vulkan-extensionlayer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b89f4fc792bf94f7c7578d238c451a9f540b7ed5", + "version": "1.4.357.0", + "port-version": 0 + }, { "git-tree": "a3ae9a074d5e9030e1d76b4d7c9ea6426658ead1", "version": "1.4.350.1", diff --git a/versions/v-/vulkan-headers.json b/versions/v-/vulkan-headers.json index 4ba94bfa29..89918b4df4 100644 --- a/versions/v-/vulkan-headers.json +++ b/versions/v-/vulkan-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81e4cd54b2b59aee033d9ea934fb844714d61fc1", + "version": "1.4.357.0", + "port-version": 0 + }, { "git-tree": "37aa7a1115cadea2caf59e629c26012d273744ba", "version": "1.4.350.1", diff --git a/versions/v-/vulkan-loader.json b/versions/v-/vulkan-loader.json index acfa298320..1d4e390c36 100644 --- a/versions/v-/vulkan-loader.json +++ b/versions/v-/vulkan-loader.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "28c580f45d87b98dec27e5eaa23de99bcaa464c9", + "version": "1.4.357.0", + "port-version": 0 + }, { "git-tree": "6f03ee4a417a8405f7ae886d0d8635ff7813a3fa", "version": "1.4.350.1", diff --git a/versions/v-/vulkan-sdk-components.json b/versions/v-/vulkan-sdk-components.json index 808a85d64d..74c8f067ff 100644 --- a/versions/v-/vulkan-sdk-components.json +++ b/versions/v-/vulkan-sdk-components.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "44aebd97b51e5ca0278b08409857add908eb694d", + "version": "1.4.357.0", + "port-version": 0 + }, { "git-tree": "67166e13b2d84e441d10ea93aa1cb95d834460ef", "version": "1.4.350.0", diff --git a/versions/v-/vulkan-tools.json b/versions/v-/vulkan-tools.json index 5cf750f561..7322241c32 100644 --- a/versions/v-/vulkan-tools.json +++ b/versions/v-/vulkan-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c406e40865544700c65f179c9233efded575cb6a", + "version": "1.4.357.0", + "port-version": 0 + }, { "git-tree": "161e22c7a463c8ba21e238959d6c7b6e234b4bb1", "version": "1.4.350.1", diff --git a/versions/v-/vulkan-utility-libraries.json b/versions/v-/vulkan-utility-libraries.json index ef4ebec622..9beedbf8df 100644 --- a/versions/v-/vulkan-utility-libraries.json +++ b/versions/v-/vulkan-utility-libraries.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "48a90a450240e6b1278cd060abf62a4dae95a5c0", + "version": "1.4.357.0", + "port-version": 0 + }, { "git-tree": "c2d6937d89129f611268e7b353cbf8c2a4e70a33", "version": "1.4.350.1", diff --git a/versions/v-/vulkan-validationlayers.json b/versions/v-/vulkan-validationlayers.json index af78e9a461..776b450797 100644 --- a/versions/v-/vulkan-validationlayers.json +++ b/versions/v-/vulkan-validationlayers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "34ff21c833fc08db040d98a76ecef47a6f024af8", + "version": "1.4.357.0", + "port-version": 0 + }, { "git-tree": "123ee841ccabee9ea392b47800fe78e276cf4869", "version": "1.4.350.1",