commit da0f4f779e01866244fcb7af35321079552a8c11
author Kai Ninomiya <kainino@chromium.org> Thu Mar 13 11:49:49 2025 -0700
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Mar 13 11:49:49 2025 -0700
tree 8314e957ea8464d1fad1317559d22f167c6df0f2
parent 1bcd8836ee8054b87372c4fca84b92604d220726

[dawn] ConsumedError: display context on additionalAllowedErrors

additionalAllowedErrors essentially specifies error types that we
surface to the user. Appended context should therefore be shown.

Bug: 42241190
Change-Id: I4828dd28b5a2221e0e65332b2b24080f79c78100
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/230634
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Kai Ninomiya <kainino@chromium.org>

src/dawn/native/ErrorSink.h

diff --git a/src/dawn/native/ErrorSink.h b/src/dawn/native/ErrorSink.h
index 54d0ee4..feb34da 100644
--- a/src/dawn/native/ErrorSink.h
+++ b/src/dawn/native/ErrorSink.h
@@ -60,7 +60,7 @@
                                      const Args&... args) {
         if (DAWN_UNLIKELY(maybeError.IsError())) {
             std::unique_ptr<ErrorData> error = maybeError.AcquireError();
-            if (error->GetType() == InternalErrorType::Validation) {
+            if (error->GetType() & (additionalAllowedErrors | InternalErrorType::Validation)) {
                 error->AppendContext(formatStr, args...);
             }
             ConsumeError(std::move(error), additionalAllowedErrors);
@@ -97,7 +97,7 @@
                                      const Args&... args) {
         if (DAWN_UNLIKELY(resultOrError.IsError())) {
             std::unique_ptr<ErrorData> error = resultOrError.AcquireError();
-            if (error->GetType() == InternalErrorType::Validation) {
+            if (error->GetType() & (additionalAllowedErrors | InternalErrorType::Validation)) {
                 error->AppendContext(formatStr, args...);
             }
             ConsumeError(std::move(error), additionalAllowedErrors);