Fix dawn tests not using CLI adapter toggles For example, `--disable-toggles=use_dxc` was being ignored. Use the ParamTogglesHelper to collect all adapter toggles, as we do for device toggles. Note that we were previously needlessly passing in force enabled/disabled *device* toggles in the adapter options. This no longer happens now as ParamTogglesHelper filters the toggles by stage. Change-Id: I439129e8e7a33f50cdefca8b810efba0c1c34fa1 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/206259 Commit-Queue: Antonio Maiorano <amaiorano@google.com> Reviewed-by: Corentin Wallez <cwallez@chromium.org>
diff --git a/src/dawn/tests/DawnTest.cpp b/src/dawn/tests/DawnTest.cpp index 7848458..2a7e9a6 100644 --- a/src/dawn/tests/DawnTest.cpp +++ b/src/dawn/tests/DawnTest.cpp
@@ -727,16 +727,10 @@ DAWN_ASSERT(callbackInfo.mode == WGPUCallbackMode_AllowSpontaneous); // Use the required toggles of test case when creating adapter. - const auto& enabledToggles = gCurrentTest->mParam.forceEnabledWorkarounds; - const auto& disabledToggles = gCurrentTest->mParam.forceDisabledWorkarounds; - wgpu::DawnTogglesDescriptor adapterToggles; - adapterToggles.enabledToggleCount = enabledToggles.size(); - adapterToggles.enabledToggles = enabledToggles.data(); - adapterToggles.disabledToggleCount = disabledToggles.size(); - adapterToggles.disabledToggles = disabledToggles.data(); + ParamTogglesHelper deviceTogglesHelper(gCurrentTest->mParam, native::ToggleStage::Adapter); wgpu::RequestAdapterOptions adapterOptions; - adapterOptions.nextInChain = &adapterToggles; + adapterOptions.nextInChain = &deviceTogglesHelper.togglesDesc; adapterOptions.backendType = gCurrentTest->mParam.adapterProperties.backendType; adapterOptions.compatibilityMode = gCurrentTest->mParam.adapterProperties.compatibilityMode;