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.

Sign up for GitHub

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
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
963e201
Update Spirv-cross package
moudgils Jan 30, 2024
0fe4b0b
Removed debug build as well as VS2019 requirement. It should use the …
moudgils Jan 30, 2024
b7601f4
Removed VS 2019 requirement from release build.
moudgils Jan 30, 2024
c891ed6
Bringing back debug configs as that is an expectation by the build sc…
moudgils Jan 30, 2024
aaa5c7f
Switched to VS 2022
moudgils Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 4 additions & 36 deletions package-system/SPIRVCross/build_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,16 @@
{
"git_url":"https://github.com/o3de/SPIRV-Cross.git",
"git_tag":"release-2021.04.29",
"git_url":"https://github.com/KhronosGroup/SPIRV-Cross.git",
"git_tag":"vulkan-sdk-1.3.275.0",
"package_name":"SPIRVCross",
"package_version":"2021.04.29-rev1",
"package_url":"https://github.com/03de/SPIRV-Cross",
"package_version":"1.3.275.0-rev1",
"package_url":"https://github.com/KhronosGroup/SPIRV-Cross",
"package_license":"Apache-2.0",
"package_license_file":"LICENSE",
"cmake_find_target":"FindSPIRVCross.cmake",
"Platforms":{
"Windows":{
"Windows":{
"cmake_find_template":"FindSPIRVCross.cmake.Windows",
"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.

"cmake_generate_args_release":[
moudgils marked this conversation as resolved.
Show resolved Hide resolved
"-G",
"\"Visual Studio 16 2019\"",
Expand All @@ -42,16 +29,6 @@
"Darwin":{
"Mac":{
"cmake_find_template":"FindSPIRVCross.cmake.Mac",
"cmake_generate_args_debug":[
"-G",
"Xcode",
"-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13",
"-DSPIRV_CROSS_CLI=ON",
"-DSPIRV_CROSS_SHARED=OFF",
"-DCMAKE_INSTALL_LIBDIR=\"lib/Debug\"",
"-DCMAKE_INSTALL_BINDIR=\"bin/Debug\"",
"-DCMAKE_BUILD_TYPE=Debug"
],
moudgils marked this conversation as resolved.
Show resolved Hide resolved
"cmake_generate_args_release":[
"-G",
"Xcode",
Expand All @@ -67,15 +44,6 @@
"Linux":{
"Linux":{
"cmake_find_template":"FindSPIRVCross.cmake.Linux",
"cmake_generate_args_debug":[
"-G",
"Ninja",
"-DSPIRV_CROSS_CLI=ON",
"-DSPIRV_CROSS_SHARED=OFF",
"-DCMAKE_INSTALL_LIBDIR=\"lib/Debug\"",
"-DCMAKE_INSTALL_BINDIR=\"bin/Debug\"",
"-DCMAKE_BUILD_TYPE=Debug"
],
moudgils marked this conversation as resolved.
Show resolved Hide resolved
"cmake_generate_args_release":[
"-G",
"Ninja",
Expand Down
4 changes: 2 additions & 2 deletions package_build_list_host_darwin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"NvCloth-v1.1.6-4-gd243404-pr58-rev1-ios": "package-system/NvCloth/build_package_image.py --platform-name ios",
"poly2tri-7f0487a-rev1-mac": "package-system/poly2tri/build_package_image.py --platform-name mac",
"v-hacd-2.3-1a49edf-rev1-mac": "package-system/v-hacd/build_package_image.py --platform-name mac",
"SPIRVCross-2021.04.29-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Mac --package-root ../../package-system --clean",
"SPIRVCross-1.3.275.0-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Mac --package-root ../../package-system --clean",
"SQLite-3.37.2-rev2-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sqlite --platform-name Mac --package-root ../../package-system --clean",
"squish-ccr-deb557d-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/squish-ccr --platform-name Mac --package-root ../../package-system --clean",
"astc-encoder-3.2-rev5-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/astc-encoder --platform-name Mac --package-root ../../package-system --clean",
Expand Down Expand Up @@ -92,7 +92,7 @@
"poly2tri-7f0487a-rev1-mac": "package-system/poly2tri-mac",
"v-hacd-2.3-1a49edf-rev1-mac": "package-system/v-hacd-mac",
"mcpp-2.7.2_az.2-rev1-mac": "package-system/mcpp-mac",
"SPIRVCross-2021.04.29-rev1-mac": "package-system/SPIRVCross-mac",
"SPIRVCross-1.3.275.0-rev1-mac": "package-system/SPIRVCross-mac",
"squish-ccr-deb557d-rev1-mac": "package-system/squish-ccr-mac",
"astc-encoder-3.2-rev5-mac": "package-system/astc-encoder-mac",
"DirectXShaderCompilerDxc-1.7.2308-o3de-rev1-mac": "package-system/DirectXShaderCompilerDxc-mac",
Expand Down
4 changes: 2 additions & 2 deletions package_build_list_host_linux-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"python-3.10.5-rev4-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/python --platform-name Linux-aarch64 --clean",
"qt-5.15.2-rev9-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Linux-aarch64 --clean",
"sdformat-13.5.0-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sdformat --platform-name Linux-aarch64 --clean",
"SPIRVCross-2021.04.29-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Linux-aarch64 --clean",
"SPIRVCross-1.3.275.0-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Linux-aarch64 --clean",
"SQLite-3.37.2-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sqlite --platform-name Linux-aarch64 --clean",
"squish-ccr-deb557d-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/squish-ccr --platform-name Linux-aarch64 --clean",
"tiff-4.2.0.15-rev3-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/tiff --platform-name Linux-aarch64 --clean",
Expand Down Expand Up @@ -77,7 +77,7 @@
"python-3.10.5-rev4-linux-aarch64": "package-system/python/temp/python-linux-aarch64",
"qt-5.15.2-rev9-linux-aarch64": "package-system/Qt/temp/qt-linux-aarch64",
"sdformat-13.5.0-rev2-linux-aarch64": "package-system/sdformat/temp/sdformat-linux-aarch64",
"SPIRVCross-2021.04.29-rev1-linux-aarch64": "package-system/SPIRVCross/temp/SPIRVCross-linux-aarch64",
"SPIRVCross-1.3.275.0-rev1-linux-aarch64": "package-system/SPIRVCross/temp/SPIRVCross-linux-aarch64",
"SQLite-3.37.2-rev1-linux-aarch64": "package-system/sqlite/temp/SQLite-linux-aarch64",
"squish-ccr-deb557d-rev1-linux-aarch64": "package-system/squish-ccr/temp/squish-ccr-linux-aarch64",
"tiff-4.2.0.15-rev3-linux-aarch64": "package-system/tiff/temp/tiff-linux-aarch64",
Expand Down
4 changes: 2 additions & 2 deletions package_build_list_host_linux.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"v-hacd-2.3-1a49edf-rev1-linux": "package-system/v-hacd/build_package_image.py --platform-name linux",
"sdformat-13.5.0-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sdformat --platform-name Linux --clean",
"sdformat-13.5.0-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sdformat --platform-name Linux-aarch64 --clean",
"SPIRVCross-2021.04.29-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Linux --package-root ../../package-system --clean",
"SPIRVCross-1.3.275.0-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Linux --package-root ../../package-system --clean",
"SQLite-3.37.2-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sqlite --platform-name Linux --package-root ../../package-system --clean",
"squish-ccr-deb557d-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/squish-ccr --platform-name Linux --clean",
"squish-ccr-deb557d-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/squish-ccr --platform-name Linux-aarch64 --clean",
Expand Down Expand Up @@ -75,7 +75,7 @@
"OpenSSL-1.1.1t-rev1-linux-aarch64": "package-system/OpenSSL/temp/OpenSSL-linux-aarch64",
"sdformat-13.5.0-rev2-linux": "package-system/sdformat/temp/sdformat-linux",
"sdformat-13.5.0-rev2-linux-aarch64": "package-system/sdformat/temp/sdformat-linux-aarch64",
"SPIRVCross-2021.04.29-rev1-linux": "package-system/SPIRVCross-linux",
"SPIRVCross-1.3.275.0-rev1-linux": "package-system/SPIRVCross-linux",
"squish-ccr-deb557d-rev1-linux": "package-system/squish-ccr/temp/squish-ccr-linux",
"squish-ccr-deb557d-rev1-linux-aarch64": "package-system/squish-ccr/temp/squish-ccr-linux-aarch64",
"astc-encoder-3.2-rev3-linux": "package-system/astc-encoder-linux",
Expand Down
4 changes: 2 additions & 2 deletions package_build_list_host_windows.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"python-3.10.5-rev1-windows": "package-system/python/build_package_image.py",
"qt-5.15.2-rev7-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Windows --package-root ../../package-system/Qt/temp --clean",
"RapidJSON-1.1.0-rev1-multiplatform": "Scripts/extras/pull_and_build_from_git.py ../../package-system/RapidJSON --platform-name multiplatform --package-root ../../package-system",
"SPIRVCross-2021.04.29-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Windows --package-root ../../package-system --clean",
"SPIRVCross-1.3.275.0-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Windows --package-root ../../package-system --clean",
"SQLite-3.37.2-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sqlite --platform-name Windows --package-root ../../package-system --clean",
"squish-ccr-deb557d-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/squish-ccr --platform-name Windows --package-root ../../package-system --clean",
"tiff-4.2.0.15-rev3-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/tiff --platform-name Windows --package-root ../../package-system --clean",
Expand Down Expand Up @@ -124,7 +124,7 @@
"qt-5.15.2-rev7-windows": "package-system/Qt/temp/qt-windows",
"RapidJSON-1.1.0-rev1-multiplatform": "package-system/RapidJSON-multiplatform",
"RapidXML-1.13-rev1-multiplatform": "package-system/RapidXML-multiplatform",
"SPIRVCross-2021.04.29-rev1-windows": "package-system/SPIRVCross-windows",
"SPIRVCross-1.3.275.0-rev1-windows": "package-system/SPIRVCross-windows",
"SQLite-3.37.2-rev1-windows": "package-system/SQLite-windows",
"squish-ccr-deb557d-rev1-windows": "package-system/squish-ccr-windows",
"tiff-4.2.0.15-rev3-windows": "package-system/tiff-windows",
Expand Down
Loading