-
Notifications
You must be signed in to change notification settings - Fork 101
Fix vulkan SDK install on linux/arm64 #205
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -10,10 +10,25 @@ main() { | |||||||||||||||||||||||||||||||||||||||||||||||||||||
| local vulkan_version=1.4.321.1 | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| local arch | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| arch=$(uname -m) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| apt-get install -y wget xz-utils | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| wget -qO /tmp/vulkan-sdk.tar.xz https://sdk.lunarg.com/sdk/download/$vulkan_version/linux/vulkan-sdk-linux-"$arch"-$vulkan_version.tar.xz | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| mkdir -p /opt/vulkan | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| tar -xf /tmp/vulkan-sdk.tar.xz -C /tmp --strip-components=1 | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| mv /tmp/"$arch"/* /opt/vulkan/ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| tar -xf /tmp/vulkan-sdk.tar.xz -C /tmp | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||
| if [ "$arch" != "x86_64" ]; then | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| # TODO: uninstall build time deps after building the SDK | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| apt-get install -y libglm-dev cmake libxcb-dri3-0 libxcb-present0 libpciaccess0 \ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| libpng-dev libxcb-keysyms1-dev libxcb-dri3-dev libx11-dev g++ gcc \ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| libwayland-dev libxrandr-dev libxcb-randr0-dev libxcb-ewmh-dev \ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| git python-is-python3 bison libx11-xcb-dev liblz4-dev libzstd-dev \ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| ocaml-core ninja-build pkg-config libxml2-dev wayland-protocols python3-jsonschema \ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| clang-format qtbase5-dev qt6-base-dev | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| pushd /tmp/"${vulkan_version}" | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| # TODO: we don't need the whole SDK to run stuff, so eventually only build necessary targets here | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| ./vulkansdk --no-deps -j "$(nproc)" | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| fi | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
Comment on lines
+18
to
+29
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The current implementation for building the Vulkan SDK on non-x86_64 architectures has a few issues that should be addressed:
Here is a suggested replacement that addresses these points.
Suggested change
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||
| mv /tmp/"${vulkan_version}"/"$arch"/* /opt/vulkan/ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| rm -rf /tmp/* | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| fi | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change introduces an additional
apt-get installcommand. The script now contains multipleapt-get installcalls (here, for build dependencies, and forca-certificates). For better efficiency and to optimize Docker image layers, it's recommended to consolidate all package installations into a singleapt-get installcommand at the top of the script, right afterapt-get update.