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

Update Spirv-cross package in order to address some cross compilation bugs for Mac and iOS #244

Merged
merged 5 commits into from
Jan 31, 2024

Conversation

moudgils
Copy link
Contributor

@moudgils moudgils commented Jan 30, 2024

The current version of SPIRV-Cross is throwing exceptions when trying to compile spirv into metalSL which is addressed by the latest version.

…latest VS on the node to build the package

Signed-off-by: moudgils <[email protected]>
Copy link
Contributor

@AMZN-alexpete AMZN-alexpete left a comment

Choose a reason for hiding this comment

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

just a minor suggestion to remove the generator arg for Windows to always use the latest version of VS on the build node.

Comment on lines 14 to 26
"cmake_generate_args_debug":[
"-G",
"\"Visual Studio 16 2019\"",
"-A",
"x64",
"-T",
"host=x64",
"-DSPIRV_CROSS_CLI=ON",
"-DSPIRV_CROSS_SHARED=OFF",
"-DCMAKE_INSTALL_LIBDIR=\"lib/Debug\"",
"-DCMAKE_INSTALL_BINDIR=\"bin/Debug\"",
"-DCMAKE_BUILD_TYPE=Debug"
],
Copy link
Contributor

Choose a reason for hiding this comment

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

Why was the entire cmake_generate_args_debug removed? Its causing the pull_and_build_from_git script to fail. You should only need to remove the -G, -A, -T, and host=x64 arguments

Copy link
Contributor

Choose a reason for hiding this comment

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

If the intention is to only build on the release target, then a --build_configs release argument should be added to each package_build_list_host_*.jsoncommand.

pull_and_build_from_git.py defaults to the release and debug target if no argument is given: https://github.com/o3de/3p-package-source/blob/main/Scripts/extras/pull_and_build_from_git.py#L279C11-L279C103

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I brought the debug configs back to allow the packages to be built.

@moudgils
Copy link
Contributor Author

This is the autogenerated PR for runtime - o3de/o3de#17446. Will merge both PRs together

@moudgils moudgils merged commit 327fb82 into main Jan 31, 2024
14 checks passed
@moudgils moudgils deleted the UpdateSpirvCross branch January 31, 2024 18:54
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.

4 participants