[vulkan, spirv, etc] Update to v1.4.328 (#48304)

This commit is contained in:
Chris Sarbora
2025-12-06 08:07:02 -05:00
committed by GitHub
parent 8420dd0b66
commit ab2977be50
55 changed files with 290 additions and 137 deletions

View File

@@ -0,0 +1,19 @@
diff --git a/src/ggml-vulkan/vulkan-shaders/dequant_funcs.glsl b/src/ggml-vulkan/vulkan-shaders/dequant_funcs.glsl
index 09676a6..021bc66 100644
--- a/src/ggml-vulkan/vulkan-shaders/dequant_funcs.glsl
+++ b/src/ggml-vulkan/vulkan-shaders/dequant_funcs.glsl
@@ -454,8 +454,12 @@ vec2 get_dm(uint ib, uint a_offset) {
#if defined(DATA_A_IQ1_M)
vec2 get_dm(uint ib, uint a_offset) {
- const uint16_t[4] scales = data_a[a_offset + ib].scales;
- const u16vec4 s = u16vec4(scales[0], scales[1], scales[2], scales[3]) >> 12;
+ const u16vec4 s = u16vec4(
+ data_a[a_offset + ib].scales[0],
+ data_a[a_offset + ib].scales[1],
+ data_a[a_offset + ib].scales[2],
+ data_a[a_offset + ib].scales[3]
+ ) >> 12;
const float d = float(unpackHalf2x16(s.x | (s.y << 4) | (s.z << 8) | (s.w << 12)).x);
return vec2(d, 0);
}

View File

@@ -9,6 +9,7 @@ vcpkg_from_github(
pkgconfig.diff
relax-link-options.diff
vulkan-shaders-gen.diff
fix-dequant_funcs.diff
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

View File

@@ -1,6 +1,7 @@
{
"name": "ggml",
"version-date": "2025-11-17",
"port-version": 1,
"description": "Tensor library for machine learning",
"homepage": "https://github.com/ggml-org/ggml",
"license": "MIT",

View File

@@ -1,14 +0,0 @@
diff --git a/via/CMakeLists.txt b/via/CMakeLists.txt
index 975fdb3..327acb1 100644
--- a/via/CMakeLists.txt
+++ b/via/CMakeLists.txt
@@ -72,6 +72,9 @@ endif()
find_package(jsoncpp CONFIG)
if (TARGET jsoncpp_static)
target_link_libraries(vkvia PRIVATE jsoncpp_static)
+
+elseif (TARGET JsonCpp::JsonCpp)
+ target_link_libraries(vkvia PRIVATE JsonCpp::JsonCpp)
# Support using jsoncpp.pc but only for UNIX platforms.
# And only if UPDATE_DEPS is disabled.

View File

@@ -7,11 +7,11 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO LunarG/VulkanTools
REF "vulkan-sdk-${VERSION}"
SHA512 c4d44f94e93234a5b5a98f3a76072d43b1c08b44dcf68a0bbbdc711e487b9e3b1be0fc8ab084b8d19662ac7394f25ec3ad2430fb2c79497d6e3e715c93d4f306
SHA512 0879b0aed84bcc080a853ce4f00bd3dca3b963bdc167fea33553886518053b3d9484141503011816ea486223496287de248805164602f6558485f296b94f9a9e
HEAD_REF main
PATCHES
disable-qtdeploy.patch
jsoncpp.diff
static-linkage.patch
)
x_vcpkg_get_python_packages(PYTHON_VERSION "3" PACKAGES jsonschema OUT_PYTHON_VAR PYTHON3)
@@ -31,7 +31,7 @@ vcpkg_cmake_configure(
)
vcpkg_cmake_install()
vcpkg_copy_tools(TOOL_NAMES vkvia vkconfig vkconfig-gui AUTO_CLEAN)
vcpkg_copy_tools(TOOL_NAMES vkconfig vkconfig-gui AUTO_CLEAN)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

View File

@@ -0,0 +1,15 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 669fdf3a6..81ba38f12 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -152,10 +152,5 @@ if(BUILD_LAYERMGR)
add_subdirectory(vkconfig_cmd)
add_subdirectory(vkconfig_gui)
- if(WIN32 AND (QT_TARGET_TYPE STREQUAL STATIC_LIBRARY))
- set_property(TARGET vkconfig-gui vkconfig-cmd vkconfig-core PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
- message(STATUS "INFO: vkconfig will link against static runtime")
- endif()
-
endif()
endif()

View File

@@ -1,11 +1,10 @@
{
"name": "lunarg-vulkantools",
"version": "1.4.309.0",
"port-version": 1,
"version": "1.4.328.0",
"description": "Tools to aid in Vulkan development",
"homepage": "https://github.com/LunarG/VulkanTools",
"license": null,
"supports": "!osx & !staticcrt",
"supports": "!osx & !(static & staticcrt)",
"dependencies": [
"jsoncpp",
{

View File

@@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/SPIRV-Cross
REF vulkan-sdk-${VERSION}
SHA512 7b3c68fb9c2a8ff665096d03291e0339b679f80cc190b626c94a072a515a702d1bf168a6e0c618795273570a8e5c29498c041b92beb860d931f000bc8c3bb72f
SHA512 b04be1ed7495d227e0c2fdd4dd6f9e17edcec635fc398f60c4599fcc2d4d57487c99203f25921edf1d65357b6079460b83550f1a01b3099677275c4e5c864c94
HEAD_REF master
)

View File

@@ -1,6 +1,6 @@
{
"name": "spirv-cross",
"version": "1.4.309.0",
"version": "1.4.328.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": [

View File

@@ -3,7 +3,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/SPIRV-Headers
REF "vulkan-sdk-${VERSION}"
SHA512 545526940e5b42a53143732d6d00b61ee544f8137507f86b32230fb5110cf2cc8f3fc71d0b167e614ab2dd5faa1c4915965627146d519832d73f23ee6a2aa4bb
SHA512 8b4f9a0f678184fbdc9a56831ecbbc83d561555bbac2b84df91e7a00f56e8905f1e107a9a497e98ae93b231b0789661110d0e247829da14e57edd14ee40ceea5
HEAD_REF master
)

View File

@@ -1,6 +1,6 @@
{
"name": "spirv-headers",
"version": "1.4.309.0",
"version": "1.4.328.0",
"description": "Machine-readable files for the SPIR-V Registry",
"homepage": "https://github.com/KhronosGroup/SPIRV-Headers",
"dependencies": [

View File

@@ -1,30 +1,33 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 040c818..0e1476c 100644
index ad9131a..143df0a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -111,10 +111,20 @@ if(SPIRV_REFLECT_STATIC_LIB)
@@ -116,12 +116,23 @@ if(SPIRV_REFLECT_STATIC_LIB)
add_library(spirv-reflect-static STATIC ${CMAKE_CURRENT_SOURCE_DIR}/spirv_reflect.h
${CMAKE_CURRENT_SOURCE_DIR}/spirv_reflect.c)
- target_include_directories(spirv-reflect-static
- PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
- install(TARGETS spirv-reflect-static
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib)
-
- set_target_properties(spirv-reflect-static PROPERTIES PUBLIC_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/spirv_reflect.h")
-
+ target_include_directories(spirv-reflect-static INTERFACE $<INSTALL_INTERFACE:include/spirv-reflect>)
+
+ set_target_properties(spirv-reflect-static PROPERTIES PUBLIC_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/spirv_reflect.h")
+ set_target_properties(spirv-reflect-static PROPERTIES EXPORT_NAME spirv-reflect)
+
+ install(TARGETS spirv-reflect-static
+ EXPORT unofficial-spirv-reflect-config
+ LIBRARY DESTINATION lib)
if(SPIRV_REFLECT_INSTALL)
+ install(TARGETS spirv-reflect-static
+ EXPORT unofficial-spirv-reflect-config
+ LIBRARY DESTINATION lib)
+
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/spirv/unified1/spirv.h DESTINATION include/spirv-reflect)
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/spirv_reflect.h DESTINATION include/spirv-reflect)
+
+ install(EXPORT unofficial-spirv-reflect-config
+ FILE unofficial-spirv-reflect-config.cmake
+ NAMESPACE unofficial::
+ DESTINATION share/unofficial-spirv-reflect)
endif()
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/spirv/unified1/spirv.h DESTINATION include/spirv-reflect)
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/spirv_reflect.h DESTINATION include/spirv-reflect)
+
+ install(EXPORT unofficial-spirv-reflect-config
+ FILE unofficial-spirv-reflect-config.cmake
+ NAMESPACE unofficial::
+ DESTINATION share/unofficial-spirv-reflect)
+
install(TARGETS spirv-reflect-static
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib

View File

@@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/SPIRV-Reflect
REF "vulkan-sdk-${VERSION}"
SHA512 d87ab91fd9b2ca6c86aaf72fd19332fb2d9eb7d5056480868ed79312fe111a3832099806d7a297fc82024683c8fe7ab96d7bec260f2828c111e535a85e288efb
SHA512 0062021edd4694caf417674b3763f0a3361a29c29d399573579206c83054afbf3c999c08534bd234f818875b84711f3ce891ec2316949e29a8360c3c38ca079d
HEAD_REF main
PATCHES
export-targets.patch

View File

@@ -1,6 +1,6 @@
{
"name": "spirv-reflect",
"version": "1.4.309.0",
"version": "1.4.328.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",

View File

@@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75830b44..367fe889 100644
index 8c6fe41e..cae234fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -270,7 +270,7 @@ else()
@@ -274,7 +274,7 @@ else()
endif()
if(ENABLE_SPIRV_TOOLS_INSTALL)

View File

@@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75830b44..9c9e7ba8 100644
index 1b69fbe8..9d9fab15 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -281,8 +281,13 @@ if(ENABLE_SPIRV_TOOLS_INSTALL)
@@ -285,8 +285,13 @@ if(ENABLE_SPIRV_TOOLS_INSTALL)
endif()
macro(spvtools_generate_config_file TARGET)

View File

@@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/SPIRV-Tools
REF "vulkan-sdk-${VERSION}"
SHA512 aa8163ad79eb5e60b8b373cbb49f1a140426f6346d5cb8e8a9aa2c72d6feaa528a9d690e0c52b44f3e4b2f60206050601441351f777752d6bf6c1b143f55589d
SHA512 a87f8ba15a0a58e34fe0de9a3eaf0e299deccd9ec98f0c27566d4dfd15abcce3f2599df93c8bfeb287b3ef3b8e4ff34332bca83e21204d75068ab21d8dd30229
PATCHES
cmake-config-dir.diff
spirv-tools-shared.diff
@@ -43,7 +43,7 @@ if("tools" IN_LIST FEATURES)
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
file(RENAME "${CURRENT_PACKAGES_DIR}/bin/spirv-lesspipe.sh" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/spirv-lesspipe.sh")
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/spirv-lesspipe.sh")
set(tools spirv-as spirv-cfg spirv-dis spirv-link spirv-lint spirv-objdump spirv-opt spirv-reduce spirv-val)
set(tools spirv-as spirv-cfg spirv-diff spirv-dis spirv-link spirv-lint spirv-objdump spirv-opt spirv-reduce spirv-val)
vcpkg_copy_tools(TOOL_NAMES ${tools} AUTO_CLEAN)
endif()

View File

@@ -1,35 +1,35 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75830b44..39cc039e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -390,10 +390,14 @@ add_custom_target(spirv-tools-shared-pkg-config ALL
# Install pkg-config file
if (ENABLE_SPIRV_TOOLS_INSTALL)
+ set(shared_pc "")
+ if(BUILD_SHARED_LIBS)
+ set(shared_pc "${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools-shared.pc")
+ endif()
install(
FILES
${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools.pc
- ${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools-shared.pc
+ ${shared_pc}
DESTINATION
${CMAKE_INSTALL_LIBDIR}/pkgconfig)
endif()
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index acfa0c12..b3286db3 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -425,6 +425,10 @@ if (ANDROID)
endif()
if(ENABLE_SPIRV_TOOLS_INSTALL)
+ if(NOT BUILD_SHARED_LIBS)
+ set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES EXCLUDE_FROM_ALL 1)
+ list(REMOVE_ITEM SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-shared)
+ endif()
install(TARGETS ${SPIRV_TOOLS_TARGETS} EXPORT ${SPIRV_TOOLS}Targets)
export(EXPORT ${SPIRV_TOOLS}Targets FILE ${SPIRV_TOOLS}Target.cmake)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d843b4d..257b41c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -406,10 +406,14 @@ add_custom_target(spirv-tools-pkg-config
# Install pkg-config file
if (ENABLE_SPIRV_TOOLS_INSTALL)
+ set(shared_pc "")
+ if (BUILD_SHARED_LIBS)
+ set(shared_pc "${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools-shared.pc")
+ endif()
install(
FILES
${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools.pc
- ${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools-shared.pc
+ ${shared_pc}
DESTINATION
${CMAKE_INSTALL_LIBDIR}/pkgconfig)
endif()
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 641bc1f7..f6dff6c6 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -386,6 +386,10 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
endif()
if(ENABLE_SPIRV_TOOLS_INSTALL)
+ if (NOT BUILD_SHARED_LIBS)
+ set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES EXCLUDE_FROM_ALL 1)
+ list(REMOVE_ITEM SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-shared)
+ endif()
if (SPIRV_TOOLS_USE_MIMALLOC AND (NOT SPIRV_TOOLS_BUILD_STATIC OR SPIRV_TOOLS_USE_MIMALLOC_IN_STATIC_BUILD))
list(APPEND SPIRV_TOOLS_TARGETS mimalloc-static)
endif()

View File

@@ -1,6 +1,6 @@
{
"name": "spirv-tools",
"version": "1.4.309.0",
"version": "1.4.328.0",
"description": "API and commands for processing SPIR-V modules",
"homepage": "https://github.com/KhronosGroup/SPIRV-Tools",
"license": "Apache-2.0",

View File

@@ -1,13 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 43bc5cd..7d626fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -137,7 +137,7 @@ if (VK_BOOTSTRAP_INSTALL)
message(FATAL_ERROR "Unable to locate required dependency Vulkan::Headers!")
endif()
endif()
- include(@PACKAGE_VK_BOOTSTRAP_EXPORT_TARGETS@)
+ include("${CMAKE_CURRENT_LIST_DIR}/vk-bootstrap-targets.cmake")
]=])
configure_package_config_file(
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 612c511..3bf918a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -144,7 +144,7 @@ if (VK_BOOTSTRAP_INSTALL)
message(FATAL_ERROR "Unable to locate required dependency Vulkan::Headers!")
endif()
endif()
- include(@PACKAGE_VK_BOOTSTRAP_EXPORT_TARGETS@)
+ include("${CMAKE_CURRENT_LIST_DIR}/vk-bootstrap-targets.cmake")
]=])
configure_package_config_file(

View File

@@ -6,7 +6,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO charles-lunarg/vk-bootstrap
REF "v${VERSION}"
SHA512 d55752fbaa84ecf8c674eb9c8639553db2631024797e62b807078c95601dd711263381443d52ddd2ef6635d61ffcacd39650aa638363cf1d124ff0a37010c2d9
SHA512 62ddd5b68835b11279b405052ef2b4d7090a21dbcaf177cc8f99c108c29ca0748f37fcbaee71ad3544038e6d190f3881a8bf8512791146988f067c5f4a5ae26a
HEAD_REF master
PATCHES
fix-targets.patch

View File

@@ -1,6 +1,6 @@
{
"name": "vk-bootstrap",
"version": "1.4.312",
"version": "1.4.328",
"description": "Vulkan bootstraping library",
"homepage": "https://github.com/charles-lunarg/vk-bootstrap",
"license": "MIT",

View File

@@ -5,7 +5,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO zeux/volk
REF "vulkan-sdk-${VERSION}"
SHA512 0be7705dfd643582fcd156972b69216e2f42bdf4cf42846a9ad21e5165cb38c0c1912d2786d4bfff8553c3b9b3664318e6efe9067ce1d73417539999434826cb
SHA512 967673bac3f489e3c20e914085c854fc450e18fffe30a35ec69dedbb64a7df7e059c9492c88afc257c24ff808871cefff4c1dbd03e7bbc2ad4ad94800bfe33b3
HEAD_REF master
)

View File

@@ -1,6 +1,6 @@
{
"name": "volk",
"version": "1.4.309.0",
"version": "1.4.328.0",
"description": [
"Meta loader for Vulkan API.",
"Note that the static library target volk::volk is built without platform-specific defines.",

View File

@@ -7,7 +7,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/Vulkan-ExtensionLayer
REF "vulkan-sdk-${VERSION}"
SHA512 a58d52dfdb73624a739784bfcb5e775ba7318478d6844a09a3fbbf71d092e080664b3dbde2eba282c671286e2f925b3f70986a09d97784256b88de8cabb67d47
SHA512 69699c0fa3e3d66c3eb3ef8206c5d530d0c46a850b182ab011f75b1a6e3fa6076b3f3ff9aee0f329416753a74e8eeff232a3c2df7fc94b6e486acd870b88c0d9
HEAD_REF main
)
@@ -25,4 +25,11 @@ if(VCPKG_TARGET_IS_ANDROID)
else()
file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
endif()
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
file(GLOB LICENSE_FILES
LIST_DIRECTORIES false
"${SOURCE_PATH}/LICENSES/*")
if(EXISTS "${SOURCE_PATH}/LICENSE")
list(APPEND LICENSE_FILES "${SOURCE_PATH}/LICENSE")
endif()
vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES})

View File

@@ -1,6 +1,6 @@
{
"name": "vulkan-extensionlayer",
"version": "1.4.309.0",
"version": "1.4.328.0",
"description": "Layer providing Vulkan features when native support is unavailable",
"homepage": "https://github.com/KhronosGroup/Vulkan-ExtensionLayer",
"license": "Apache-2.0",

View File

@@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/Vulkan-Headers
REF "vulkan-sdk-${VERSION}"
SHA512 1199344dcfe8c074926cffad6b921730ba46802d39e70d7acc23d8764549cf1070432215095b7305f7b61397d14a5e48966ced87f1a39b93d5992c1d8e97ba35
SHA512 613a330e37cb4c4c4d17d77e10d47e7482a6cd143a1ae618fdd0f2f0af05b1cdb4ddeebc44f6395d6dee5766a322b9ea9a16ad3cf9e4fffef30d804b976093ee
HEAD_REF main
)

View File

@@ -1,6 +1,6 @@
{
"name": "vulkan-headers",
"version": "1.4.309.0",
"version": "1.4.328.0",
"description": "Vulkan header files and API registry",
"homepage": "https://github.com/KhronosGroup/Vulkan-Headers",
"license": "Apache-2.0 OR MIT",

View File

@@ -0,0 +1,12 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a30752492..b429a5235 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -144,6 +144,7 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Linux|BSD|DragonFly|GNU")
target_compile_definitions(platform_wsi INTERFACE VK_USE_PLATFORM_DIRECTFB_EXT)
# vulkan_core.h includes <directfb.h> but the header is installed to directfb/directfb.h
target_include_directories(platform_wsi INTERFACE ${DIRECTFB_INCLUDE_DIRS} ${DIRECTFB_INCLUDE_DIRS}/directfb)
+ target_link_libraries(platform_wsi INTERFACE PkgConfig::DirectFB)
endif()
elseif(CMAKE_SYSTEM_NAME MATCHES "QNX")
message(FATAL_ERROR "See BUILD.md for QNX build")

View File

@@ -4,8 +4,10 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/Vulkan-Loader
REF "vulkan-sdk-${VERSION}"
SHA512 f77d42639037b79eeeba4007eded039527a345cd39ed1b6a3c5e786a418c481811a72c43cb24821268c7bc57c39941cfe5511e86362ac892c51d45a062dc0e2c
SHA512 f35017b0b4ca9e1b149e2ab956fac59ffbab1f861971459c0b3c340377a0399b27ec706284ac4e4a931b58a3c2f7e6df36838ab0829f4a17cf087c0199793e16
HEAD_REF main
PATCHES
link-directfb.patch
)
vcpkg_find_acquire_program(PYTHON3)

View File

@@ -1,7 +1,6 @@
{
"name": "vulkan-loader",
"version": "1.4.309.0",
"port-version": 3,
"version": "1.4.328.0",
"description": "Vulkan Development Tools",
"homepage": "https://github.com/KhronosGroup/Vulkan-Loader",
"license": null,

View File

@@ -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.309.0",
"version": "1.4.328.0",
"description": "Installs packages which are part of the Vulkan SDK.",
"license": null,
"supports": "!uwp & !xbox",
@@ -17,7 +17,6 @@
"name": "mimalloc",
"platform": "windows"
},
"robin-hood-hashing",
"sdl2",
"shaderc",
"spirv-cross",

View File

@@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/Vulkan-Tools
REF "vulkan-sdk-${VERSION}"
SHA512 ff505ba27556261103664b50ee88d26efdd040d7e0168ec0a37cdcebf421fbf75f73bdae55282c1e82b913491abd365a61edf95a5b917eb0b20abf6f60b89742
SHA512 61ff1b61efd536c10ab6edc71c56bec9fe5ca42c827fae6dfc5af84c729597143c9530b5a050c95fa4a8c4eb390ad8956bdd8f42d29ffa1da2e53397073fa0b0
HEAD_REF main
)

View File

@@ -1,6 +1,6 @@
{
"name": "vulkan-tools",
"version": "1.4.309.0",
"version": "1.4.328.0",
"description": "Vulkan Development Tools",
"homepage": "https://github.com/KhronosGroup/Vulkan-Tools",
"license": "Apache-2.0",

View File

@@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/Vulkan-Utility-Libraries
REF "vulkan-sdk-${VERSION}"
SHA512 9b875fecc295a45cdb8e6ff26345cf2b7df3959e2271e3f26546df3b415bf46a7bfd709ec482659fc86c35ff4314d7df482641f4c2e82e1b03f4c7ffc26d2a64
SHA512 598c03da7c4a76be6ee95d74fc4a00908b0dc3165e82ec0eec01c329c0a79654d827f8eeada8d9b4e173443b848c15cd71c23c965ac799d7d4d354cf76cc68e9
HEAD_REF main
)

View File

@@ -1,6 +1,6 @@
{
"name": "vulkan-utility-libraries",
"version": "1.4.309.0",
"version": "1.4.328.0",
"description": "Utility libraries for Vulkan developers",
"homepage": "https://github.com/KhronosGroup/Vulkan-Utility-Libraries",
"license": null,

View File

@@ -0,0 +1,31 @@
diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
index 984b878f0..31003176a 100644
--- a/layers/CMakeLists.txt
+++ b/layers/CMakeLists.txt
@@ -112,14 +112,8 @@ endif()
if (USE_CUSTOM_HASH_MAP)
message(STATUS "Using parallel_hashmap as custom hash maps")
target_compile_definitions(VkLayer_utils PUBLIC USE_CUSTOM_HASH_MAP)
- # Prefer using a locally installed parallel-hashmap package before using the in-tree sources.
- # This approach supports installation with package managers such as conan
- find_package(phmap CONFIG)
- if (TARGET phmap)
- target_link_libraries(VkLayer_utils PRIVATE phmap)
- else()
- add_subdirectory(external/parallel_hashmap)
- endif()
+ find_path(PARALLEL_HASHMAP_INCLUDE_DIRS "parallel_hashmap/btree.h" REQUIRED)
+ target_include_directories(VkLayer_utils PRIVATE ${PARALLEL_HASHMAP_INCLUDE_DIRS})
else()
message(STATUS "Using STL maps instead of custom hash maps")
endif()
@@ -468,7 +468,8 @@ if(MSVC)
target_link_options(vvl PRIVATE /DEF:${CMAKE_CURRENT_SOURCE_DIR}/${LAYER_NAME}.def)
target_compile_options(vvl PRIVATE /bigobj)
- set(NATVIS_FILES "${CMAKE_CURRENT_SOURCE_DIR}/types.natvis" "${CMAKE_CURRENT_SOURCE_DIR}/external/parallel_hashmap/natvis/phmap.natvis")
+ find_file(PHMAP_NATVIS "phmap.natvis" REQUIRED)
+ set(NATVIS_FILES "${CMAKE_CURRENT_SOURCE_DIR}/types.natvis" "${PHMAP_NATVIS}")
target_sources(vvl PRIVATE ${NATVIS_FILES})
elseif(MINGW)
target_sources(vvl PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/${LAYER_NAME}.def)

View File

@@ -4,10 +4,14 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/Vulkan-ValidationLayers
REF "vulkan-sdk-${VERSION}"
SHA512 453fb519e2b4e035e82f9e372e235e6870eff7e32938fc903a3ee35354f4a535393f9f45264518e8ff5113ce3d59450668253b8d9b833c6f0669b7a1373cb7cc
SHA512 d98ae93e738fee540e4924c887497f06ca7296a22a1a450f08e5278bdc51fb440443361fdf839793bc632b6e6115754621f24a8e7f2548da58d1bf67713ccaf9
HEAD_REF main
PATCHES
disable_vendored_phmap.diff
)
file(REMOVE_RECURSE "${SOURCE_PATH}/layers/external/parallel_hashmap") # ensure that we use vcpkg's parallel-hashmap instead of upstream's vendored copy
vcpkg_find_acquire_program(PYTHON3)
get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
vcpkg_add_to_path("${PYTHON3_DIR}")

View File

@@ -1,12 +1,12 @@
{
"name": "vulkan-validationlayers",
"version": "1.4.309.0",
"version": "1.4.328.0",
"description": "Vulkan Validation Layers (VVL)",
"homepage": "https://github.com/KhronosGroup/Vulkan-ValidationLayers",
"license": null,
"dependencies": [
"mimalloc",
"robin-hood-hashing",
"parallel-hashmap",
"spirv-cross",
"spirv-headers",
"spirv-reflect",

View File

@@ -3298,7 +3298,7 @@
},
"ggml": {
"baseline": "2025-11-17",
"port-version": 0
"port-version": 1
},
"ghc-filesystem": {
"baseline": "1.5.14",
@@ -6093,8 +6093,8 @@
"port-version": 1
},
"lunarg-vulkantools": {
"baseline": "1.4.309.0",
"port-version": 1
"baseline": "1.4.328.0",
"port-version": 0
},
"lunasvg": {
"baseline": "3.5.0",
@@ -9289,19 +9289,19 @@
"port-version": 4
},
"spirv-cross": {
"baseline": "1.4.309.0",
"baseline": "1.4.328.0",
"port-version": 0
},
"spirv-headers": {
"baseline": "1.4.309.0",
"baseline": "1.4.328.0",
"port-version": 0
},
"spirv-reflect": {
"baseline": "1.4.309.0",
"baseline": "1.4.328.0",
"port-version": 0
},
"spirv-tools": {
"baseline": "1.4.309.0",
"baseline": "1.4.328.0",
"port-version": 0
},
"spout2": {
@@ -10333,7 +10333,7 @@
"port-version": 0
},
"vk-bootstrap": {
"baseline": "1.4.312",
"baseline": "1.4.328",
"port-version": 0
},
"vkfft": {
@@ -10357,7 +10357,7 @@
"port-version": 0
},
"volk": {
"baseline": "1.4.309.0",
"baseline": "1.4.328.0",
"port-version": 0
},
"voro": {
@@ -10413,11 +10413,11 @@
"port-version": 0
},
"vulkan-extensionlayer": {
"baseline": "1.4.309.0",
"baseline": "1.4.328.0",
"port-version": 0
},
"vulkan-headers": {
"baseline": "1.4.309.0",
"baseline": "1.4.328.0",
"port-version": 0
},
"vulkan-hpp": {
@@ -10425,8 +10425,8 @@
"port-version": 0
},
"vulkan-loader": {
"baseline": "1.4.309.0",
"port-version": 3
"baseline": "1.4.328.0",
"port-version": 0
},
"vulkan-memory-allocator": {
"baseline": "3.3.0",
@@ -10437,19 +10437,19 @@
"port-version": 1
},
"vulkan-sdk-components": {
"baseline": "1.4.309.0",
"baseline": "1.4.328.0",
"port-version": 0
},
"vulkan-tools": {
"baseline": "1.4.309.0",
"baseline": "1.4.328.0",
"port-version": 0
},
"vulkan-utility-libraries": {
"baseline": "1.4.309.0",
"baseline": "1.4.328.0",
"port-version": 0
},
"vulkan-validationlayers": {
"baseline": "1.4.309.0",
"baseline": "1.4.328.0",
"port-version": 0
},
"vvenc": {

View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "56adeee23aaed103cd81d95b0f40f47ed308c761",
"version-date": "2025-11-17",
"port-version": 1
},
{
"git-tree": "f8acb500a2b05dd4dcd1228eea81d0c36f95bb29",
"version-date": "2025-11-17",

View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "86e2934d6d6ae5aedec88f24893ed9e325325ac1",
"version": "1.4.328.0",
"port-version": 0
},
{
"git-tree": "8932e52440aba5c3eef9648513539501529ef7a8",
"version": "1.4.309.0",

View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5629c9d940b2cd523ed81ad587e6c8bb3e5609b4",
"version": "1.4.328.0",
"port-version": 0
},
{
"git-tree": "3246574c039c7c7b5c1fc8c4f5ba6aac45e3f4ab",
"version": "1.4.309.0",

View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "89b6eb9d8791aba32786ceafa27c4070b4b55a07",
"version": "1.4.328.0",
"port-version": 0
},
{
"git-tree": "a41db95cf3e45fc0db319e8fe55d8866ce5d9924",
"version": "1.4.309.0",

View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0ba6f14d0a33baf2bf66eeda69c54f2c2e6eb63e",
"version": "1.4.328.0",
"port-version": 0
},
{
"git-tree": "7bad0b3d0a4517898ddbe6c0295b096a7f48680a",
"version": "1.4.309.0",

View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "89d902f9670c857cf4a5f64409a6952d4e3a2e83",
"version": "1.4.328.0",
"port-version": 0
},
{
"git-tree": "cc4dbd60fdf45319d659f2465b7f34c596395f94",
"version": "1.4.309.0",

View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "28dfde85bf592d5e0b0731ca008e366f5afdcbad",
"version": "1.4.328",
"port-version": 0
},
{
"git-tree": "568c66b9021388111729f9ce67d6b860b1b00b06",
"version": "1.4.312",

View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "75b328f0b405f8c7b5444eaf65a4105c028b1ba0",
"version": "1.4.328.0",
"port-version": 0
},
{
"git-tree": "f038baf96536e3865f387943f07900527936699f",
"version": "1.4.309.0",

View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7d5146dd0d29a5f9bd31f37af5ef71b56b1efb5a",
"version": "1.4.328.0",
"port-version": 0
},
{
"git-tree": "726011480060e48c4b9fe13e9a20fc09704ceab3",
"version": "1.4.309.0",

View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "6330c7b1698e3912015dfa083ba5657b989aef7b",
"version": "1.4.328.0",
"port-version": 0
},
{
"git-tree": "b7d36ff535cf43f24afaec43d86ca5b9145456bb",
"version": "1.4.309.0",

View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8a726e9d1ce110deecfa12c6f2fbfa367afeae08",
"version": "1.4.328.0",
"port-version": 0
},
{
"git-tree": "1fdf24f832033f1e6a1179ecbff1ac5aa2126d6e",
"version": "1.4.309.0",

View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "33b7b86f863f95011c3f7d9f096d65c1a8f11cfe",
"version": "1.4.328.0",
"port-version": 0
},
{
"git-tree": "65c6b3463b44db7c0e7c39c23872fd6418e1a642",
"version": "1.4.309.0",

View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9a6b44cc534dfb1bbe776c092db40658b8ad4af7",
"version": "1.4.328.0",
"port-version": 0
},
{
"git-tree": "074f1241bbbc7049eb2549053c92d2e9d8e727c3",
"version": "1.4.309.0",

View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "bd129e4217805e20990d957437d874b02759dcb3",
"version": "1.4.328.0",
"port-version": 0
},
{
"git-tree": "964a4f5e9c2e9f21f9b817c03bad37a50bf07c3e",
"version": "1.4.309.0",

View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ce9fa408aa67c240ec2a0380e7c278145e6e98cb",
"version": "1.4.328.0",
"port-version": 0
},
{
"git-tree": "67c2d8e4b781d617803afb86c11f5d7953dafd71",
"version": "1.4.309.0",