From 489f4d38f03f80adfbc4d1f0a7a815d3d0d611ce Mon Sep 17 00:00:00 2001 From: Antonio Maiorano Date: Thu, 12 Sep 2024 21:19:50 +0000 Subject: [PATCH] Fix DXC into Dawn import Update submodule to DXC ToT and add missing new files to GN build. Change-Id: I1929653636cd4e3bf386ef17a6f7db8a985fe246 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/206394 Reviewed-by: James Price Commit-Queue: Antonio Maiorano --- DEPS | 2 +- third_party/dxc | 2 +- third_party/gn/dxc/BUILD.gn | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index bff6c2c767c..f3b1a8ebf4a 100644 --- a/DEPS +++ b/DEPS @@ -338,7 +338,7 @@ deps = { }, 'third_party/dxc': { - 'url': '{chromium_git}/external/github.com/microsoft/DirectXShaderCompiler@0e7591a6ee94c8c8eb0d536ce7815fd56a776451', + 'url': '{chromium_git}/external/github.com/microsoft/DirectXShaderCompiler@05334a70d3e5355fc86c94bb4e3cfe1c31a65999', }, 'third_party/dxheaders': { diff --git a/third_party/dxc b/third_party/dxc index 0e7591a6ee9..05334a70d3e 160000 --- a/third_party/dxc +++ b/third_party/dxc @@ -1 +1 @@ -Subproject commit 0e7591a6ee94c8c8eb0d536ce7815fd56a776451 +Subproject commit 05334a70d3e5355fc86c94bb4e3cfe1c31a65999 diff --git a/third_party/gn/dxc/BUILD.gn b/third_party/gn/dxc/BUILD.gn index d341031b6d8..4cd30d1c6c9 100644 --- a/third_party/gn/dxc/BUILD.gn +++ b/third_party/gn/dxc/BUILD.gn @@ -1220,9 +1220,11 @@ dxc_module("dxclib") { "$dawn_dxc_dir/lib/DxilContainer/DxilContainer.cpp", "$dawn_dxc_dir/lib/DxilContainer/DxilContainerAssembler.cpp", "$dawn_dxc_dir/lib/DxilContainer/DxilContainerReader.cpp", + "$dawn_dxc_dir/lib/DxilContainer/DxilPipelineStateValidation.cpp", "$dawn_dxc_dir/lib/DxilContainer/DxilRDATBuilder.cpp", "$dawn_dxc_dir/lib/DxilContainer/DxilRuntimeReflection.cpp", "$dawn_dxc_dir/lib/DxilContainer/RDATDxilSubobjects.cpp", + "$dawn_dxc_dir/lib/DxilHash/DxilHash.cpp", "$dawn_dxc_dir/lib/Option/Arg.cpp", "$dawn_dxc_dir/lib/Option/ArgList.cpp", "$dawn_dxc_dir/lib/Option/OptTable.cpp",