commit 53137bd57d5f3df72e077182dc34a1204f89ccd5
author Zhaoming Jiang <zhaoming.jiang@intel.com> Wed Dec 08 02:42:17 2021 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Dec 08 02:42:17 2021 +0000
tree c63f3c6ea42c17874b2ba9af47f6ce35035d2543
parent 8b9e591f48b44673ab83936a7ebf18acdb2dd1b6

Remove wgpu::ErrorFilter::None

Remove wgpu::ErrorFilter::None from Dawn as it is removed from the
specification.

Bug: dawn:1206
Change-Id: If8ec2722cf1b2bad380011f191f296f0e591646d
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/71607
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Zhaoming Jiang <zhaoming.jiang@intel.com>

dawn.json

diff --git a/dawn.json b/dawn.json
index 9df80d7..a0a2116 100644
--- a/dawn.json
+++ b/dawn.json
@@ -1211,9 +1211,8 @@
     "error filter": {
         "category": "enum",
         "values": [
-            {"value": 0, "name": "none"},
-            {"value": 1, "name": "validation"},
-            {"value": 2, "name": "out of memory"}
+            {"value": 0, "name": "validation"},
+            {"value": 1, "name": "out of memory"}
         ]
     },
     "error type": {

src/dawn_native/ErrorScope.cpp

diff --git a/src/dawn_native/ErrorScope.cpp b/src/dawn_native/ErrorScope.cpp
index d021de1..4aebf1a 100644
--- a/src/dawn_native/ErrorScope.cpp
+++ b/src/dawn_native/ErrorScope.cpp
@@ -22,8 +22,6 @@
 
         wgpu::ErrorType ErrorFilterToErrorType(wgpu::ErrorFilter filter) {
             switch (filter) {
-                case wgpu::ErrorFilter::None:
-                    return wgpu::ErrorType::NoError;
                 case wgpu::ErrorFilter::Validation:
                     return wgpu::ErrorType::Validation;
                 case wgpu::ErrorFilter::OutOfMemory:
@@ -62,7 +60,6 @@
     }
 
     bool ErrorScopeStack::HandleError(wgpu::ErrorType type, const char* message) {
-        ASSERT(type != wgpu::ErrorType::NoError);
         for (auto it = mScopes.rbegin(); it != mScopes.rend(); ++it) {
             if (it->mMatchedErrorType != type) {
                 // Error filter does not match. Move on to the next scope.