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

Externals: Update glslang. #8658

Open
wants to merge 2 commits into
base: master
from
Open

Externals: Update glslang. #8658

wants to merge 2 commits into from

Conversation

@orbea
Copy link
Contributor

orbea commented Mar 2, 2020

This updates Externals/glslang to upstream commit KhronosGroup/glslang@56364b6 which is listed in the scripts/known_good.json file from the Vulkan-ValidationLayers repo for version 1.2.131.2 of the Vulkan-sdk, see https://github.com/KhronosGroup/Vulkan-ValidationLayers/blob/sdk-1.2.131.2/scripts/known_good.json.

in my experience this is as close as it gets for a stable glslang version, see KhronosGroup/Vulkan-ValidationLayers#1082.

I also made sure to include the missing LICENSE.txt and tried to omit files that were previously omitted and are not needed.

Please review the additional commit for build fixes. This includes updating some code that seems to have been copied from Externals/glslang/StandAlone/ResourceLimits.cpp and adding SPIRV/SpvPostProcess.cpp to Externals/glslang/CMakeLists.txt.

I tested this briefly with vulkan and found no regressions with radv + aco using a RX Vega 56 with the mesa git master.

My main goal behind this is to fix the build with clang-10 which fails to build older glslang versions like the one currently included.

@orbea

This comment has been minimized.

Copy link
Contributor Author

orbea commented Mar 2, 2020

I added an alternative build fix in a third commit that I think should make it easier when updating glslang again in the future or if a system version of glslang is used (Not yet supported). I'm not really sure what the best course of action is so please advise and I will squash this PR as needed.

@orbea orbea force-pushed the orbea:glslang branch from 4be8c67 to a181ecf Mar 6, 2020
@orbea

This comment has been minimized.

Copy link
Contributor Author

orbea commented Mar 6, 2020

I went with the second fix to use the glslang defaults as suggested to be better by Stenzek on irc.

@orbea orbea force-pushed the orbea:glslang branch 5 times, most recently from fae1b18 to addc2b6 Mar 6, 2020
orbea added 2 commits Mar 2, 2020
This updates glslang to commit 4fc7a33910fb8e40b970d160e1b38ab3f67fe0f3
which is the current version listed in the known_good.json file for the
version 1.2.131.2 of the Vulkan-ValidationLayers repo.
@orbea orbea force-pushed the orbea:glslang branch from addc2b6 to 5d84b2a Mar 6, 2020
@orbea

This comment has been minimized.

Copy link
Contributor Author

orbea commented Mar 6, 2020

CI now passes and I think this is ready for review and testing. Please review the vcxproj changes carefully, I'm not familiar with these files.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Linked issues

Successfully merging this pull request may close these issues.

None yet

1 participant
You can’t perform that action at this time.