From c744591724e3a340c0d357feba30998841cc4ede Mon Sep 17 00:00:00 2001 From: Akio Gaule <10719597+akioCL@users.noreply.github.com> Date: Fri, 28 Jun 2024 14:23:57 -0400 Subject: [PATCH 1/8] Update DirectXShaderCompiler to version 1.7.2308-o3de-rev2 -Add support for specialization constants Signed-off-by: Akio Gaule <10719597+akioCL@users.noreply.github.com> --- .../FindDirectXShaderCompilerDxc.cmake.Windows | 1 + package-system/DirectXShaderCompiler/build_config.json | 4 ++-- .../DirectXShaderCompiler/install_dxc_windows.cmd | 7 +++++++ 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 ++-- 7 files changed, 18 insertions(+), 10 deletions(-) diff --git a/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Windows b/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Windows index cd2c0abe..696a25a3 100644 --- a/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Windows +++ b/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Windows @@ -19,6 +19,7 @@ add_library(${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL) set(${MY_NAME}_RUNTIME_DEPENDENCIES ${${MY_NAME}_BINARY_DIR}/Release/dxc.exe + ${${MY_NAME}_BINARY_DIR}/Release/dxsc.exe ${${MY_NAME}_BINARY_DIR}/Release/dxil.dll ${${MY_NAME}_BINARY_DIR}/Release/dxcompiler.dll) ly_add_target_files(TARGETS ${TARGET_WITH_NAMESPACE} OUTPUT_SUBDIRECTORY ${output_subfolder} FILES ${${MY_NAME}_RUNTIME_DEPENDENCIES}) diff --git a/package-system/DirectXShaderCompiler/build_config.json b/package-system/DirectXShaderCompiler/build_config.json index d8b72380..d7ed308d 100644 --- a/package-system/DirectXShaderCompiler/build_config.json +++ b/package-system/DirectXShaderCompiler/build_config.json @@ -1,8 +1,8 @@ { "git_url":"https://github.com/o3de/DirectXShaderCompiler.git", - "git_tag":"release-1.7.2308-o3de", + "git_tag":"release-1.7.2308-o3de.2", "package_name":"DirectXShaderCompilerDxc", - "package_version":"1.7.2308-o3de-rev1", + "package_version":"1.7.2308-o3de-rev2", "package_url":"https://github.com/o3de/DirectXShaderCompiler", "package_license":"NCSA", "package_license_file":"LICENSE.TXT", diff --git a/package-system/DirectXShaderCompiler/install_dxc_windows.cmd b/package-system/DirectXShaderCompiler/install_dxc_windows.cmd index 61a27766..7824f1b2 100644 --- a/package-system/DirectXShaderCompiler/install_dxc_windows.cmd +++ b/package-system/DirectXShaderCompiler/install_dxc_windows.cmd @@ -34,6 +34,13 @@ IF %ERRORLEVEL% NEQ 0 ( exit /b 1 ) +echo Copying %BLD_PATH%\Release\bin\dxsc.exe to %BIN_PATH%\Release\ +copy /Y %BLD_PATH%\Release\bin\dxsc.exe %BIN_PATH%\Release\ +IF %ERRORLEVEL% NEQ 0 ( + ECHO Unable to copy %BLD_PATH%\Release\bin\dxsc.exe + exit /b 1 +) + ECHO Copying %BLD_PATH%\Release\bin\dxcompiler.dll to %BIN_PATH%\\Release\ copy /Y %BLD_PATH%\Release\bin\dxcompiler.dll %BIN_PATH%\\Release\ IF %ERRORLEVEL% NEQ 0 ( diff --git a/package_build_list_host_darwin.json b/package_build_list_host_darwin.json index 83d0705c..c979de2d 100644 --- a/package_build_list_host_darwin.json +++ b/package_build_list_host_darwin.json @@ -38,7 +38,7 @@ "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", - "DirectXShaderCompilerDxc-1.7.2308-o3de-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Mac --package-root ../../package-system --clean", + "DirectXShaderCompilerDxc-1.7.2308-o3de-rev2-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Mac --package-root ../../package-system --clean", "azslc-1.8.19-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/azslc --platform-name Mac --package-root ../../package-system/azslc/temp --clean", "python-3.10.13-rev1-darwin": "package-system/python/build_package_image.py", "mcpp-2.7.2_az.2-rev1-mac": "package-system/mcpp/get_and_build_mcpp.py mcpp-2.7.2_az.2-rev1", @@ -95,7 +95,7 @@ "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", + "DirectXShaderCompilerDxc-1.7.2308-o3de-rev2-mac": "package-system/DirectXShaderCompilerDxc-mac", "azslc-1.8.19-rev1-mac": "package-system/azslc/temp/azslc-mac", "SQLite-3.37.2-rev2-mac": "package-system/SQLite-mac", "xxhash-0.7.4-rev1-multiplatform": "package-system/xxhash-multiplatform", diff --git a/package_build_list_host_linux-aarch64.json b/package_build_list_host_linux-aarch64.json index c6ad3a34..94b0677b 100644 --- a/package_build_list_host_linux-aarch64.json +++ b/package_build_list_host_linux-aarch64.json @@ -11,7 +11,7 @@ "AWSNativeSDK-1.11.288-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux-aarch64 --clean", "azslc-1.8.19-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/azslc --platform-name Linux-aarch64 --clean", "cityhash-1.1-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/cityhash --platform-name Linux-aarch64 --clean", - "DirectXShaderCompilerDxc-1.7.2308-o3de-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Linux-aarch64 --clean", + "DirectXShaderCompilerDxc-1.7.2308-o3de-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Linux-aarch64 --clean", "expat-2.4.2-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/expat --platform-name Linux-aarch64 --clean", "freetype-2.11.1-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Linux-aarch64 --clean", "googlebenchmark-1.7.0-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googlebenchmark --platform-name Linux-aarch64 --clean", @@ -52,7 +52,7 @@ "AWSNativeSDK-1.11.288-rev1-linux-aarch64": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux-aarch64", "azslc-1.8.19-rev1-linux-aarch64": "package-system/azslc/temp/azslc-linux-aarch64", "cityhash-1.1-rev1-linux-aarch64": "package-system/cityhash/temp/cityhash-linux-aarch64", - "DirectXShaderCompilerDxc-1.7.2308-o3de-rev1-linux-aarch64": "package-system/DirectXShaderCompiler/temp/DirectXShaderCompilerDxc-linux-aarch64", + "DirectXShaderCompilerDxc-1.7.2308-o3de-rev2-linux-aarch64": "package-system/DirectXShaderCompiler/temp/DirectXShaderCompilerDxc-linux-aarch64", "expat-2.4.2-rev2-linux-aarch64": "package-system/expat/temp/expat-linux-aarch64", "freetype-2.11.1-rev1-linux-aarch64": "package-system/freetype/temp/freetype-linux-aarch64", "googlebenchmark-1.7.0-rev1-linux-aarch64": "package-system/googlebenchmark/temp/googlebenchmark-linux-aarch64", diff --git a/package_build_list_host_linux.json b/package_build_list_host_linux.json index 97627e4e..62e7a1e3 100644 --- a/package_build_list_host_linux.json +++ b/package_build_list_host_linux.json @@ -39,7 +39,7 @@ "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", "astc-encoder-3.2-rev3-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/astc-encoder --platform-name Linux --package-root ../../package-system --clean", - "DirectXShaderCompilerDxc-1.7.2308-o3de-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Linux --package-root ../../package-system --clean", + "DirectXShaderCompilerDxc-1.7.2308-o3de-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Linux --package-root ../../package-system --clean", "azslc-1.8.19-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/azslc --platform-name Linux --package-root ../../package-system/azslc/temp --clean", "tiff-4.2.0.15-rev3-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/tiff --platform-name Linux --package-root ../../package-system --clean", "python-3.10.13-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/python --platform-name Linux --clean", @@ -81,7 +81,7 @@ "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", - "DirectXShaderCompilerDxc-1.7.2308-o3de-rev1-linux": "package-system/DirectXShaderCompilerDxc-linux", + "DirectXShaderCompilerDxc-1.7.2308-o3de-rev2-linux": "package-system/DirectXShaderCompilerDxc-linux", "azslc-1.8.19-rev1-linux": "package-system/azslc/temp/azslc-linux", "tiff-4.2.0.15-rev3-linux": "package-system/tiff-linux", "python-3.10.13-rev2-linux": "package-system/python/temp/python-linux", diff --git a/package_build_list_host_windows.json b/package_build_list_host_windows.json index 164d465e..24d9b8c7 100644 --- a/package_build_list_host_windows.json +++ b/package_build_list_host_windows.json @@ -13,7 +13,7 @@ "AWSNativeSDK-1.11.288-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Windows --package-root ../../package-system --clean", "Blast-v1.1.7_rc2-9-geb169fe-rev2-windows": "package-system/Blast/build_package_image.py --platform-name windows", "Crashpad-0.8.0-rev1-windows": "package-system/Crashpad/build_package_image.py", - "DirectXShaderCompilerDxc-1.7.2308-o3de-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Windows --package-root ../../package-system --clean", + "DirectXShaderCompilerDxc-1.7.2308-o3de-rev2-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Windows --package-root ../../package-system --clean", "expat-2.4.2-rev2-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/expat --platform-name Android --package-root ../../package-system/expat/temp --clean", "expat-2.4.2-rev2-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/expat --platform-name Windows --package-root ../../package-system/expat/temp --clean", "freetype-2.11.1-rev1-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Android --package-root ../../package-system/freetype/temp --clean", @@ -77,7 +77,7 @@ "cityhash-1.1-multiplatform": "package-system/cityhash-multiplatform", "civetweb-1.8-rev1-windows": "package-system/civetweb-windows", "Crashpad-0.8.0-rev1-windows": "package-system/Crashpad-windows", - "DirectXShaderCompilerDxc-1.7.2308-o3de-rev1-windows": "package-system/DirectXShaderCompilerDxc-windows", + "DirectXShaderCompilerDxc-1.7.2308-o3de-rev2-windows": "package-system/DirectXShaderCompilerDxc-windows", "d3dx12-headers-rev1-windows": "package-system/d3dx12-windows", "expat-2.4.2-rev2-android": "package-system/expat/temp/expat-android", "expat-2.4.2-rev2-windows": "package-system/expat/temp/expat-windows", From 094cfee59aae1fe78eca4bc6b67ef826aae5da83 Mon Sep 17 00:00:00 2001 From: Akio Gaule <10719597+akioCL@users.noreply.github.com> Date: Sat, 29 Jun 2024 22:12:00 -0400 Subject: [PATCH 2/8] Add DXSC to DirectXShaderCompiler Signed-off-by: Akio Gaule <10719597+akioCL@users.noreply.github.com> --- .../FindDirectXShaderCompilerDxc.cmake.Linux | 1 + .../DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Mac | 1 + 2 files changed, 2 insertions(+) diff --git a/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Linux b/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Linux index 95b65add..cd9c8990 100644 --- a/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Linux +++ b/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Linux @@ -21,6 +21,7 @@ add_library(${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL) set(${MY_NAME}_BIN_RUNTIME_DEPENDENCIES ${${MY_NAME}_BINARY_DIR}/dxc ${${MY_NAME}_BINARY_DIR}/dxc-3.7 + ${${MY_NAME}_BINARY_DIR}/dxsc ) ly_add_target_files(TARGETS ${TARGET_WITH_NAMESPACE} OUTPUT_SUBDIRECTORY "${output_subfolder}/bin" FILES ${${MY_NAME}_BIN_RUNTIME_DEPENDENCIES}) diff --git a/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Mac b/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Mac index 3a310e27..685f33a5 100644 --- a/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Mac +++ b/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Mac @@ -20,6 +20,7 @@ add_library(${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL) set(${MY_NAME}_BIN_RUNTIME_DEPENDENCIES ${${MY_NAME}_BINARY_DIR}/dxc ${${MY_NAME}_BINARY_DIR}/dxc-3.7 + ${${MY_NAME}_BINARY_DIR}/dxsc ) ly_add_target_files(TARGETS ${TARGET_WITH_NAMESPACE} OUTPUT_SUBDIRECTORY "${output_subfolder}/bin" FILES ${${MY_NAME}_BIN_RUNTIME_DEPENDENCIES}) From fb7cf13a6090a2848bc9e92b04faa662012151f4 Mon Sep 17 00:00:00 2001 From: Akio Gaule <10719597+akioCL@users.noreply.github.com> Date: Sun, 30 Jun 2024 22:12:41 -0400 Subject: [PATCH 3/8] Update to vs2022 for DirectXShaderCompiler win Signed-off-by: Akio Gaule <10719597+akioCL@users.noreply.github.com> --- package-system/DirectXShaderCompiler/build_dxc_windows.cmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-system/DirectXShaderCompiler/build_dxc_windows.cmd b/package-system/DirectXShaderCompiler/build_dxc_windows.cmd index 2d90fc47..c1e0322a 100755 --- a/package-system/DirectXShaderCompiler/build_dxc_windows.cmd +++ b/package-system/DirectXShaderCompiler/build_dxc_windows.cmd @@ -29,9 +29,9 @@ IF %ERRORLEVEL% NEQ 0 ( ) REM Run the build for Release -call utils\hct\hctbuild.cmd -rel -x64 -vs2019 -spirv +call utils\hct\hctbuild.cmd -rel -x64 -vs2022 -spirv IF %ERRORLEVEL% NEQ 0 ( - ECHO "Building Release with hctbuild.cmd -rel -x64 -vs2019 Failed" + ECHO "Building Release with hctbuild.cmd -rel -x64 -vs2022 Failed" exit /b 1 ) From 953da2c20e181bea3830d31a59389404772acddf Mon Sep 17 00:00:00 2001 From: Akio Gaule <10719597+akioCL@users.noreply.github.com> Date: Wed, 3 Jul 2024 17:02:58 -0400 Subject: [PATCH 4/8] Revert to previous tag to test asset failure Signed-off-by: Akio Gaule <10719597+akioCL@users.noreply.github.com> --- package-system/DirectXShaderCompiler/build_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-system/DirectXShaderCompiler/build_config.json b/package-system/DirectXShaderCompiler/build_config.json index d7ed308d..b81c22b0 100644 --- a/package-system/DirectXShaderCompiler/build_config.json +++ b/package-system/DirectXShaderCompiler/build_config.json @@ -1,6 +1,6 @@ { "git_url":"https://github.com/o3de/DirectXShaderCompiler.git", - "git_tag":"release-1.7.2308-o3de.2", + "git_tag":"release-1.7.2308-o3de", "package_name":"DirectXShaderCompilerDxc", "package_version":"1.7.2308-o3de-rev2", "package_url":"https://github.com/o3de/DirectXShaderCompiler", From a13f4672668f91d622413a440e3064f49caf7029 Mon Sep 17 00:00:00 2001 From: Akio Gaule <10719597+akioCL@users.noreply.github.com> Date: Wed, 3 Jul 2024 17:20:36 -0400 Subject: [PATCH 5/8] Testing old package Signed-off-by: Akio Gaule <10719597+akioCL@users.noreply.github.com> --- .../FindDirectXShaderCompilerDxc.cmake.Windows | 1 - package-system/DirectXShaderCompiler/install_dxc_windows.cmd | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Windows b/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Windows index 696a25a3..cd2c0abe 100644 --- a/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Windows +++ b/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Windows @@ -19,7 +19,6 @@ add_library(${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL) set(${MY_NAME}_RUNTIME_DEPENDENCIES ${${MY_NAME}_BINARY_DIR}/Release/dxc.exe - ${${MY_NAME}_BINARY_DIR}/Release/dxsc.exe ${${MY_NAME}_BINARY_DIR}/Release/dxil.dll ${${MY_NAME}_BINARY_DIR}/Release/dxcompiler.dll) ly_add_target_files(TARGETS ${TARGET_WITH_NAMESPACE} OUTPUT_SUBDIRECTORY ${output_subfolder} FILES ${${MY_NAME}_RUNTIME_DEPENDENCIES}) diff --git a/package-system/DirectXShaderCompiler/install_dxc_windows.cmd b/package-system/DirectXShaderCompiler/install_dxc_windows.cmd index 7824f1b2..ba502398 100644 --- a/package-system/DirectXShaderCompiler/install_dxc_windows.cmd +++ b/package-system/DirectXShaderCompiler/install_dxc_windows.cmd @@ -38,7 +38,7 @@ echo Copying %BLD_PATH%\Release\bin\dxsc.exe to %BIN_PATH%\Release\ copy /Y %BLD_PATH%\Release\bin\dxsc.exe %BIN_PATH%\Release\ IF %ERRORLEVEL% NEQ 0 ( ECHO Unable to copy %BLD_PATH%\Release\bin\dxsc.exe - exit /b 1 + REM exit /b 1 ) ECHO Copying %BLD_PATH%\Release\bin\dxcompiler.dll to %BIN_PATH%\\Release\ From fedd6f2b39b4e2f18518ba4f3a0d4f80ce648f57 Mon Sep 17 00:00:00 2001 From: Akio Gaule <10719597+akioCL@users.noreply.github.com> Date: Sat, 13 Jul 2024 17:31:51 -0400 Subject: [PATCH 6/8] Revert "Testing old package" This reverts commit a13f4672668f91d622413a440e3064f49caf7029. --- .../FindDirectXShaderCompilerDxc.cmake.Windows | 1 + package-system/DirectXShaderCompiler/install_dxc_windows.cmd | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Windows b/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Windows index cd2c0abe..696a25a3 100644 --- a/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Windows +++ b/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Windows @@ -19,6 +19,7 @@ add_library(${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL) set(${MY_NAME}_RUNTIME_DEPENDENCIES ${${MY_NAME}_BINARY_DIR}/Release/dxc.exe + ${${MY_NAME}_BINARY_DIR}/Release/dxsc.exe ${${MY_NAME}_BINARY_DIR}/Release/dxil.dll ${${MY_NAME}_BINARY_DIR}/Release/dxcompiler.dll) ly_add_target_files(TARGETS ${TARGET_WITH_NAMESPACE} OUTPUT_SUBDIRECTORY ${output_subfolder} FILES ${${MY_NAME}_RUNTIME_DEPENDENCIES}) diff --git a/package-system/DirectXShaderCompiler/install_dxc_windows.cmd b/package-system/DirectXShaderCompiler/install_dxc_windows.cmd index ba502398..7824f1b2 100644 --- a/package-system/DirectXShaderCompiler/install_dxc_windows.cmd +++ b/package-system/DirectXShaderCompiler/install_dxc_windows.cmd @@ -38,7 +38,7 @@ echo Copying %BLD_PATH%\Release\bin\dxsc.exe to %BIN_PATH%\Release\ copy /Y %BLD_PATH%\Release\bin\dxsc.exe %BIN_PATH%\Release\ IF %ERRORLEVEL% NEQ 0 ( ECHO Unable to copy %BLD_PATH%\Release\bin\dxsc.exe - REM exit /b 1 + exit /b 1 ) ECHO Copying %BLD_PATH%\Release\bin\dxcompiler.dll to %BIN_PATH%\\Release\ From 2ffae9daeb0a51eb4fd41cd7cffdc5a24e0a8190 Mon Sep 17 00:00:00 2001 From: Akio Gaule <10719597+akioCL@users.noreply.github.com> Date: Sat, 13 Jul 2024 17:31:58 -0400 Subject: [PATCH 7/8] Revert "Revert to previous tag to test asset failure" This reverts commit 953da2c20e181bea3830d31a59389404772acddf. --- package-system/DirectXShaderCompiler/build_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-system/DirectXShaderCompiler/build_config.json b/package-system/DirectXShaderCompiler/build_config.json index b81c22b0..d7ed308d 100644 --- a/package-system/DirectXShaderCompiler/build_config.json +++ b/package-system/DirectXShaderCompiler/build_config.json @@ -1,6 +1,6 @@ { "git_url":"https://github.com/o3de/DirectXShaderCompiler.git", - "git_tag":"release-1.7.2308-o3de", + "git_tag":"release-1.7.2308-o3de.2", "package_name":"DirectXShaderCompilerDxc", "package_version":"1.7.2308-o3de-rev2", "package_url":"https://github.com/o3de/DirectXShaderCompiler", From 79037c05f648655df1754a21851687b8b9d1f761 Mon Sep 17 00:00:00 2001 From: Akio Gaule <10719597+akioCL@users.noreply.github.com> Date: Sat, 13 Jul 2024 17:32:06 -0400 Subject: [PATCH 8/8] Revert "Update to vs2022 for DirectXShaderCompiler win" This reverts commit fb7cf13a6090a2848bc9e92b04faa662012151f4. --- package-system/DirectXShaderCompiler/build_dxc_windows.cmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-system/DirectXShaderCompiler/build_dxc_windows.cmd b/package-system/DirectXShaderCompiler/build_dxc_windows.cmd index c1e0322a..2d90fc47 100755 --- a/package-system/DirectXShaderCompiler/build_dxc_windows.cmd +++ b/package-system/DirectXShaderCompiler/build_dxc_windows.cmd @@ -29,9 +29,9 @@ IF %ERRORLEVEL% NEQ 0 ( ) REM Run the build for Release -call utils\hct\hctbuild.cmd -rel -x64 -vs2022 -spirv +call utils\hct\hctbuild.cmd -rel -x64 -vs2019 -spirv IF %ERRORLEVEL% NEQ 0 ( - ECHO "Building Release with hctbuild.cmd -rel -x64 -vs2022 Failed" + ECHO "Building Release with hctbuild.cmd -rel -x64 -vs2019 Failed" exit /b 1 )