Revert "Enable dawn_use_built_dxc for non-standalone builds (Chromium)"
This reverts commit d68fb862b10f2538318dc402b8ee1290084d8d49.
Reason for revert: https://crrev.com/c/4855042
DXC failing to build on Win arm64
Original change's description:
> Enable dawn_use_built_dxc for non-standalone builds (Chromium)
>
> Once this rolls into Chromium, DXC will be built and packaged in the
> installer. This is necessary so that we can start the "WebGPUUseDXC"
> Finch trial.
>
> Bug: dawn:1990
> Change-Id: I43ad419f8a8a448d991fe17c3551f572478935d8
> Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/150620
> Kokoro: Kokoro <noreply+kokoro@google.com>
> Commit-Queue: Antonio Maiorano <amaiorano@google.com>
> Reviewed-by: Austin Eng <enga@chromium.org>
TBR=enga@chromium.org,amaiorano@google.com,noreply+kokoro@google.com,dawn-scoped@luci-project-accounts.iam.gserviceaccount.com
Change-Id: If3228b94003e0c7371966b6ed0a01d9211061b14
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: dawn:1990
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/150583
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Auto-Submit: Austin Eng <enga@chromium.org>
Kokoro: Austin Eng <enga@chromium.org>
Commit-Queue: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
diff --git a/scripts/dawn_features.gni b/scripts/dawn_features.gni
index 599f60f..6736f88 100644
--- a/scripts/dawn_features.gni
+++ b/scripts/dawn_features.gni
@@ -47,9 +47,11 @@
dawn_use_swiftshader = !is_android && !is_ios
# Whether we allow building DXC.
+ # Only use DXC in standalone builds until it is stable. It will be
+ # explicitly enabled in Chromium builds.
# DXC requires SM6.0+ which is blocklisted on x86.
# See crbug.com/tint/1753.
- dawn_use_built_dxc = is_win && target_cpu != "x86"
+ dawn_use_built_dxc = dawn_standalone && is_win && target_cpu != "x86"
}
declare_args() {
