From 963e2018b8ce947b9227f4442bddd983224d61f5 Mon Sep 17 00:00:00 2001 From: moudgils Date: Tue, 30 Jan 2024 10:02:17 -0800 Subject: [PATCH 1/5] Update Spirv-cross package Signed-off-by: moudgils --- package-system/SPIRVCross/build_config.json | 8 ++++---- package_build_list_host_darwin.json | 4 ++-- package_build_list_host_linux-aarch64.json | 4 ++-- package_build_list_host_linux.json | 4 ++-- package_build_list_host_windows.json | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package-system/SPIRVCross/build_config.json b/package-system/SPIRVCross/build_config.json index 7db9aa35..b078a891 100644 --- a/package-system/SPIRVCross/build_config.json +++ b/package-system/SPIRVCross/build_config.json @@ -1,9 +1,9 @@ { - "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", diff --git a/package_build_list_host_darwin.json b/package_build_list_host_darwin.json index 127b68f1..29caccae 100644 --- a/package_build_list_host_darwin.json +++ b/package_build_list_host_darwin.json @@ -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", @@ -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", diff --git a/package_build_list_host_linux-aarch64.json b/package_build_list_host_linux-aarch64.json index 9fc93d15..88ea2344 100644 --- a/package_build_list_host_linux-aarch64.json +++ b/package_build_list_host_linux-aarch64.json @@ -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", @@ -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", diff --git a/package_build_list_host_linux.json b/package_build_list_host_linux.json index a40a438f..0c5d6fc8 100644 --- a/package_build_list_host_linux.json +++ b/package_build_list_host_linux.json @@ -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", @@ -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", diff --git a/package_build_list_host_windows.json b/package_build_list_host_windows.json index 0746dd76..f8791a69 100644 --- a/package_build_list_host_windows.json +++ b/package_build_list_host_windows.json @@ -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", @@ -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", From 0fe4b0b0b84bcaf78244e2672ef501e9868de81c Mon Sep 17 00:00:00 2001 From: moudgils Date: Tue, 30 Jan 2024 10:35:57 -0800 Subject: [PATCH 2/5] Removed debug build as well as VS2019 requirement. It should use the latest VS on the node to build the package Signed-off-by: moudgils --- package-system/SPIRVCross/build_config.json | 32 --------------------- 1 file changed, 32 deletions(-) diff --git a/package-system/SPIRVCross/build_config.json b/package-system/SPIRVCross/build_config.json index b078a891..8b5cf6a6 100644 --- a/package-system/SPIRVCross/build_config.json +++ b/package-system/SPIRVCross/build_config.json @@ -11,19 +11,6 @@ "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" - ], "cmake_generate_args_release":[ "-G", "\"Visual Studio 16 2019\"", @@ -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" - ], "cmake_generate_args_release":[ "-G", "Xcode", @@ -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" - ], "cmake_generate_args_release":[ "-G", "Ninja", From b7601f4ae1cbb5fa8f4bfededd72c413debb384f Mon Sep 17 00:00:00 2001 From: moudgils Date: Tue, 30 Jan 2024 10:50:46 -0800 Subject: [PATCH 3/5] Removed VS 2019 requirement from release build. Signed-off-by: moudgils --- package-system/SPIRVCross/build_config.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/package-system/SPIRVCross/build_config.json b/package-system/SPIRVCross/build_config.json index 8b5cf6a6..820ed8ee 100644 --- a/package-system/SPIRVCross/build_config.json +++ b/package-system/SPIRVCross/build_config.json @@ -12,8 +12,6 @@ "Windows":{ "cmake_find_template":"FindSPIRVCross.cmake.Windows", "cmake_generate_args_release":[ - "-G", - "\"Visual Studio 16 2019\"", "-A", "x64", "-T", From c891ed6591d7199c810baa8307cc7a080ec8f254 Mon Sep 17 00:00:00 2001 From: moudgils Date: Tue, 30 Jan 2024 11:36:48 -0800 Subject: [PATCH 4/5] Bringing back debug configs as that is an expectation by the build scripts Signed-off-by: moudgils --- package-system/SPIRVCross/build_config.json | 30 +++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/package-system/SPIRVCross/build_config.json b/package-system/SPIRVCross/build_config.json index 820ed8ee..e9747e88 100644 --- a/package-system/SPIRVCross/build_config.json +++ b/package-system/SPIRVCross/build_config.json @@ -11,6 +11,17 @@ "Windows":{ "Windows":{ "cmake_find_template":"FindSPIRVCross.cmake.Windows", + "cmake_generate_args_debug":[ + "-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" + ], "cmake_generate_args_release":[ "-A", "x64", @@ -27,6 +38,16 @@ "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" + ], "cmake_generate_args_release":[ "-G", "Xcode", @@ -42,6 +63,15 @@ "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" + ], "cmake_generate_args_release":[ "-G", "Ninja", From aaa5c7f892c07bddd64a718a52433fb977c85295 Mon Sep 17 00:00:00 2001 From: moudgils Date: Tue, 30 Jan 2024 11:46:30 -0800 Subject: [PATCH 5/5] Switched to VS 2022 Signed-off-by: moudgils --- package-system/SPIRVCross/build_config.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package-system/SPIRVCross/build_config.json b/package-system/SPIRVCross/build_config.json index e9747e88..118cbbba 100644 --- a/package-system/SPIRVCross/build_config.json +++ b/package-system/SPIRVCross/build_config.json @@ -12,6 +12,8 @@ "Windows":{ "cmake_find_template":"FindSPIRVCross.cmake.Windows", "cmake_generate_args_debug":[ + "-G", + "\"Visual Studio 17 2022\"", "-A", "x64", "-T", @@ -23,6 +25,8 @@ "-DCMAKE_BUILD_TYPE=Debug" ], "cmake_generate_args_release":[ + "-G", + "\"Visual Studio 17 2022\"", "-A", "x64", "-T",