Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[glslang] update to 13.1.1, opt feature [shaderc] update to 2023.7 #35219

Merged
merged 4 commits into from
Dec 9, 2023

Conversation

moritz-h
Copy link
Contributor

  • 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.

Update glslang to 13.1.1. Upstream changed the behaviour of the ENABLE_OPT option to require spirv-tools more explicitly, see https://github.com/KhronosGroup/glslang/blob/13.1.1/CMakeLists.txt#L268-L283.
Previously it was just used when found, otherwise not. Therefore, add an opt feature depending on the spirv-tools port.
In addition, there is a problem setting correct include dirs with external spirv-tools, a patch for this is merged upstream to latest main, but added as patch here for backporting to 13.1.1.

@moritz-h moritz-h marked this pull request as draft November 21, 2023 00:47
@moritz-h
Copy link
Contributor Author

Converting to draft due to shaderc regression.

@FrankXie05 FrankXie05 added the category:port-update The issue is with a library, which is requesting update new revision label Nov 21, 2023
@moritz-h
Copy link
Contributor Author

Another glslang patch was required, is submitted upstream: KhronosGroup/glslang#3420.
After that, shaderc did not compile because glslang now requires C++17 in public headers used by shaderc. So bump shaderc version as this was fixed upstream and the version of shaderc in vcpkg is already 2.5 years old. Let's see if CI now passes.

@moritz-h moritz-h changed the title [glslang] update to 13.1.1, opt feature [glslang] update to 13.1.1, opt feature [shaderc] update to 2023.7 Nov 23, 2023
@moritz-h moritz-h marked this pull request as ready for review November 23, 2023 16:29
ports/glslang/portfile.cmake Outdated Show resolved Hide resolved
@FrankXie05 FrankXie05 added the info:reviewed Pull Request changes follow basic guidelines label Dec 8, 2023
@BillyONeal BillyONeal merged commit 000d1bd into microsoft:master Dec 9, 2023
15 checks passed
@BillyONeal
Copy link
Member

Thanks for the update!

@moritz-h moritz-h deleted the glslang branch December 11, 2023 11:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants