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

Jump to bottom

Update DirectXShaderCompiler to version 1.7.2308-o3de-rev2 #258

Merged
merged 8 commits into from
Jul 14, 2024
Merged

Update DirectXShaderCompiler to version 1.7.2308-o3de-rev2 #258

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c744591
Update DirectXShaderCompiler to version 1.7.2308-o3de-rev2
akioCL Jun 28, 2024
094cfee
Add DXSC to DirectXShaderCompiler
akioCL Jun 30, 2024
fb7cf13
Update to vs2022 for DirectXShaderCompiler win
akioCL Jul 1, 2024
953da2c
Revert to previous tag to test asset failure
akioCL Jul 3, 2024
a13f467
Testing old package
akioCL Jul 3, 2024
fedd6f2
Revert "Testing old package"
akioCL Jul 13, 2024
2ffae9d
Revert "Revert to previous tag to test asset failure"
akioCL Jul 13, 2024
79037c0
Revert "Update to vs2022 for DirectXShaderCompiler win"
akioCL Jul 13, 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
1 change: 1 addition & 0 deletions package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Windows
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
4 changes: 2 additions & 2 deletions package-system/DirectXShaderCompiler/build_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
7 changes: 7 additions & 0 deletions package-system/DirectXShaderCompiler/install_dxc_windows.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
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 @@ -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",
Expand Down Expand Up @@ -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",
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 @@ -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",
Expand Down Expand Up @@ -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",
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 @@ -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",
Expand Down Expand Up @@ -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",
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 @@ -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",
Expand Down Expand Up @@ -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",
Expand Down