encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-07-04 04:06:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove wgpu::ErrorFilter::None

Browse Source 
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>
This commit is contained in:
Zhaoming Jiang 2021-12-08 02:42:17 +00:00 committed by Dawn LUCI CQ
parent 8b9e591f48
commit 53137bd57d
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dawn.json
View File

@ -1211,9 +1211,8 @@
"error filter": { "error filter": {
"category": "enum", "category": "enum",
"values": [ "values": [
{"value": 0, "name": "none"}, {"value": 0, "name": "validation"},
{"value": 1, "name": "validation"}, {"value": 1, "name": "out of memory"}
{"value": 2, "name": "out of memory"}
] ]
}, },
"error type": { "error type": {

3
src/dawn_native/ErrorScope.cpp
View File

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