Fix DXC roll into Dawn
Add new cpp files from:
https://github.com/microsoft/DirectXShaderCompiler/commit/ceff9b8043df3ac8d7d3ce71b409d83afcd7925b
Bug: none
Change-Id: Id50603935d02911cffce0fe987ff016e0b5f9459
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/160020
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Antonio Maiorano <amaiorano@google.com>
Reviewed-by: Austin Eng <enga@chromium.org>
diff --git a/.gitmodules b/.gitmodules
index 7cfc0f3..7a78129 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,3 @@
-[submodule "build"]
- path = build
- url = https://chromium.googlesource.com/chromium/src/build
- gclient-condition = dawn_standalone
[submodule "buildtools"]
path = buildtools
url = https://chromium.googlesource.com/chromium/src/buildtools
@@ -18,10 +14,18 @@
path = third_party/libc++abi/src
url = https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git
gclient-condition = dawn_standalone
+[submodule "build"]
+ path = build
+ url = https://chromium.googlesource.com/chromium/src/build
+ gclient-condition = dawn_standalone
[submodule "tools/clang"]
path = tools/clang
url = https://chromium.googlesource.com/chromium/src/tools/clang
gclient-condition = dawn_standalone
+[submodule "tools/rust"]
+ path = tools/rust
+ url = https://chromium.googlesource.com/chromium/src/tools/rust
+ gclient-condition = dawn_standalone and checkout_rust
[submodule "testing"]
path = testing
url = https://chromium.googlesource.com/chromium/src/testing
@@ -114,6 +118,3 @@
path = third_party/partition_alloc
url = https://chromium.googlesource.com/chromium/src/base/allocator/partition_allocator.git
gclient-condition = dawn_standalone
-[submodule "tools/rust"]
- path = tools/rust
- url = https://chromium.googlesource.com/chromium/src/tools/rust
diff --git a/DEPS b/DEPS
index 62aca6c..22e5109 100644
--- a/DEPS
+++ b/DEPS
@@ -197,7 +197,7 @@
},
'third_party/dxc': {
- 'url': '{chromium_git}/external/github.com/microsoft/DirectXShaderCompiler@6db52c7b566e791461926fa06522b23b64fd261e',
+ 'url': '{chromium_git}/external/github.com/microsoft/DirectXShaderCompiler@ceff9b8043df3ac8d7d3ce71b409d83afcd7925b',
},
'third_party/dxheaders': {
diff --git a/third_party/dxc b/third_party/dxc
index 6db52c7..ceff9b8 160000
--- a/third_party/dxc
+++ b/third_party/dxc
@@ -1 +1 @@
-Subproject commit 6db52c7b566e791461926fa06522b23b64fd261e
+Subproject commit ceff9b8043df3ac8d7d3ce71b409d83afcd7925b
diff --git a/third_party/gn/dxc/BUILD.gn b/third_party/gn/dxc/BUILD.gn
index 95a090d..cda30e0 100644
--- a/third_party/gn/dxc/BUILD.gn
+++ b/third_party/gn/dxc/BUILD.gn
@@ -1159,6 +1159,7 @@
"$dawn_dxc_dir/lib/DXIL/DxilMetadataHelper.cpp",
"$dawn_dxc_dir/lib/DXIL/DxilModule.cpp",
"$dawn_dxc_dir/lib/DXIL/DxilModuleHelper.cpp",
+ "$dawn_dxc_dir/lib/DXIL/DxilNodeProps.cpp",
"$dawn_dxc_dir/lib/DXIL/DxilOperations.cpp",
"$dawn_dxc_dir/lib/DXIL/DxilPDB.cpp",
"$dawn_dxc_dir/lib/DXIL/DxilResource.cpp",
@@ -1175,6 +1176,7 @@
"$dawn_dxc_dir/lib/DXIL/DxilTypeSystem.cpp",
"$dawn_dxc_dir/lib/DXIL/DxilUtil.cpp",
"$dawn_dxc_dir/lib/DXIL/DxilUtilDbgInfoAndMisc.cpp",
+ "$dawn_dxc_dir/lib/DXIL/DxilWaveMatrix.cpp",
"$dawn_dxc_dir/lib/DxcSupport/FileIOHelper.cpp",
"$dawn_dxc_dir/lib/DxcSupport/Global.cpp",
"$dawn_dxc_dir/lib/DxcSupport/HLSLOptions.cpp",
