commit cbdde604b87f27128185c8f9393f2c3d2211b7fc
author Austin Eng <enga@chromium.org> Thu Mar 24 16:01:55 2022 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Mar 24 16:01:55 2022 +0000
tree 8565626e87fb581ff55f99b2e3c222175eee5299
parent 08985d46d5aa3908fb14d7249a43874ca6aca4e7

Fix ForceSetToggle to only warn when an overriden toggle is forced

The condition was partially wrong, causing lots of spurious warning
messages when the default toggle (not user override) was forced to
another value by the backend.

Change-Id: Ie69e275fa3d4ceaeb7c3379dfdc8d8cbb91cf04a
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/84601
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>

src/dawn/native/Device.cpp

diff --git a/src/dawn/native/Device.cpp b/src/dawn/native/Device.cpp
index 0855ebe..39ef97f 100644
--- a/src/dawn/native/Device.cpp
+++ b/src/dawn/native/Device.cpp
@@ -1661,7 +1661,7 @@
     }
 
     void DeviceBase::ForceSetToggle(Toggle toggle, bool isEnabled) {
-        if (!mOverridenToggles.Has(toggle) && mEnabledToggles.Has(toggle) != isEnabled) {
+        if (mOverridenToggles.Has(toggle) && mEnabledToggles.Has(toggle) != isEnabled) {
             dawn::WarningLog() << "Forcing toggle \"" << ToggleEnumToName(toggle) << "\" to "
                                << isEnabled << " when it was overriden to be " << !isEnabled;
         }