Skip to content

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

Merged
vicroms merged 32 commits into
microsoft:masterfrom
tophyr:fixup-smaller-upgrade
Dec 6, 2025
Merged

[vulkan, spirv, etc] Update to v1.4.328#48304
vicroms merged 32 commits into
microsoft:masterfrom
tophyr:fixup-smaller-upgrade

Conversation

@tophyr
Copy link
Copy Markdown
Contributor

@tophyr tophyr commented Nov 15, 2025

  • Changes comply with the maintainer guide.
  • SHA512s are updated for each updated download.
  • The "supports" clause reflects platforms that may be fixed by this new version.
  • Any fixed CI baseline entries are removed from that file.
  • Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.

Comment thread ports/lunarg-vulkantools/portfile.cmake
Comment thread ports/vulkan-extensionlayer/portfile.cmake
@tophyr
Copy link
Copy Markdown
Contributor Author

tophyr commented Nov 15, 2025

@dg0yt nice to see you again 😅 this is draft for the moment mostly because i'm just stepwise restarting #46621, to see if i can get away now with a more minimal set of changes. if i get the CI checks to go all-green then i'll clean things up and do some PR diligence.

@tophyr tophyr force-pushed the fixup-smaller-upgrade branch from 461f2cb to d6cbdca Compare November 15, 2025 09:52
@ajtribick
Copy link
Copy Markdown
Contributor

From what I can see, vulkan-validationlayers switched their dependency from robin-hood-hashing to parallel-hashmap in 1.4.313 (USE_ROBIN_HOOD_HASHING option replaced with USE_CUSTOM_HASH_MAP in the CMake files), it would be useful to switch this as robin-hood-hashing is no longer maintained upstream.

@tophyr tophyr force-pushed the fixup-smaller-upgrade branch 2 times, most recently from 69a7e4b to ed473d4 Compare November 15, 2025 20:51
@tophyr tophyr force-pushed the fixup-smaller-upgrade branch from ed473d4 to 26e2e56 Compare November 15, 2025 21:28
@tophyr
Copy link
Copy Markdown
Contributor Author

tophyr commented Nov 16, 2025

From what I can see, vulkan-validationlayers switched their dependency from robin-hood-hashing to parallel-hashmap in 1.4.313 (USE_ROBIN_HOOD_HASHING option replaced with USE_CUSTOM_HASH_MAP in the CMake files), it would be useful to switch this as robin-hood-hashing is no longer maintained upstream.

@ajtribick, i swapped the dependencies, but it really feels like I should have to do something else as well - I was surprised that nothing broke with just a straight swap. Indeed, simply removing both parallel-hashmap and robin-hood-hashing results in a successful build. Are you sure the Vulkan-ValidationLayers build is actually using the custom hashmap?

Comment thread scripts/ci.feature.baseline.txt Outdated
@tophyr tophyr marked this pull request as ready for review November 16, 2025 20:22
@tophyr
Copy link
Copy Markdown
Contributor Author

tophyr commented Nov 16, 2025

@dg0yt marking this as ready-for-review.

Comment thread ports/lunarg-vulkantools/static-linkage.patch Outdated
@vicroms vicroms marked this pull request as draft November 18, 2025 07:14
@tophyr tophyr changed the title Fixup smaller upgrade [vulkan, spirv, etc] Update to v1.4.328 Nov 19, 2025
@tophyr tophyr marked this pull request as ready for review November 19, 2025 02:43
@tophyr tophyr marked this pull request as ready for review November 28, 2025 05:15
@tophyr tophyr requested a review from vicroms November 28, 2025 07:15
@BillyONeal
Copy link
Copy Markdown
Member

Please merge with master and fix the resulting build failures.

@BillyONeal BillyONeal marked this pull request as draft December 1, 2025 23:53
@ajtribick
Copy link
Copy Markdown
Contributor

ajtribick commented Dec 2, 2025

The issue I see is that it uses the vendored parallel-hashmap natvis file here: https://github.com/KhronosGroup/Vulkan-ValidationLayers/blob/a1ff2dbc7e50828def8098c5ebf0fee10b714f85/layers/CMakeLists.txt#L477

The parallel-hashmap port does actually install this file, so maybe that can be used instead:

file(COPY ${SOURCE_PATH}/phmap.natvis DESTINATION ${CURRENT_PACKAGES_DIR}/include)

Comment thread ports/ggml/fix-dequant_funcs.diff Outdated
@tophyr
Copy link
Copy Markdown
Contributor Author

tophyr commented Dec 4, 2025

don't want to merge it in because it looks like it's still in flux, but waiting on this PR for #48492

@tophyr tophyr force-pushed the fixup-smaller-upgrade branch from 2198b3e to a881457 Compare December 5, 2025 05:11
@tophyr
Copy link
Copy Markdown
Contributor Author

tophyr commented Dec 5, 2025

this should.... finally... be ready.

@tophyr tophyr marked this pull request as ready for review December 5, 2025 05:13
Copy link
Copy Markdown
Member

@vicroms vicroms left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Almost there, one merge issue on ports version db history.

Comment thread versions/g-/ggml.json Outdated
@vicroms vicroms marked this pull request as draft December 5, 2025 20:53
@tophyr tophyr marked this pull request as ready for review December 5, 2025 22:59
@vicroms vicroms enabled auto-merge (squash) December 6, 2025 09:21
@vicroms vicroms merged commit ab2977b into microsoft:master Dec 6, 2025
17 checks passed
@tophyr tophyr deleted the fixup-smaller-upgrade branch December 7, 2025 03:16
@tophyr
Copy link
Copy Markdown
Contributor Author

tophyr commented Dec 7, 2025

🥳

geiseri pushed a commit to geiseri/vcpkg that referenced this pull request Dec 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants