[dawn][headers] Renames InstanceDropped->CallbackCancelled.
Bug: 403612359
Change-Id: If58db7ee03a2c51718a7818f128d9da11228496e
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/232734
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Commit-Queue: Loko Kung <lokokung@google.com>
diff --git a/generator/templates/api.h b/generator/templates/api.h
index c6586ff..6602470 100644
--- a/generator/templates/api.h
+++ b/generator/templates/api.h
@@ -40,6 +40,7 @@
#define WGPU_BREAKING_CHANGE_STRING_VIEW_LABELS
#define WGPU_BREAKING_CHANGE_STRING_VIEW_OUTPUT_STRUCTS
#define WGPU_BREAKING_CHANGE_STRING_VIEW_CALLBACKS
+#define WGPU_BREAKING_CHANGE_INSTANCE_DROPPED_RENAME
{% set API = metadata.c_prefix %}
{% set api = API.lower() %}
diff --git a/src/dawn/dawn.json b/src/dawn/dawn.json
index 44728b6..cd31d29 100644
--- a/src/dawn/dawn.json
+++ b/src/dawn/dawn.json
@@ -109,7 +109,7 @@
"emscripten_no_enum_table": true,
"values": [
{"value": 1, "name": "success"},
- {"value": 2, "name": "instance dropped"},
+ {"value": 2, "name": "callback cancelled"},
{"value": 3, "name": "unavailable"},
{"value": 4, "name": "error"}
]
@@ -692,7 +692,7 @@
"emscripten_no_enum_table": true,
"values": [
{"value": 1, "name": "success"},
- {"value": 2, "name": "instance dropped"},
+ {"value": 2, "name": "callback cancelled"},
{"value": 3, "name": "error"},
{"value": 4, "name": "aborted"}
]
@@ -945,7 +945,7 @@
"category": "enum",
"values": [
{"value": 1, "name": "success"},
- {"value": 2, "name": "instance dropped"}
+ {"value": 2, "name": "callback cancelled"}
]
},
"compilation message": {
@@ -1152,7 +1152,7 @@
"emscripten_no_enum_table": true,
"values": [
{"value": 1, "name": "success"},
- {"value": 2, "name": "instance dropped"},
+ {"value": 2, "name": "callback cancelled"},
{"value": 3, "name": "validation error"},
{"value": 4, "name": "internal error"}
]
@@ -1491,7 +1491,7 @@
"values": [
{"value": 1, "name": "unknown"},
{"value": 2, "name": "destroyed"},
- {"value": 3, "name": "instance dropped", "emscripten_string_to_int": false},
+ {"value": 3, "name": "callback cancelled", "emscripten_string_to_int": false},
{"value": 4, "name": "failed creation", "emscripten_string_to_int": false}
]
},
@@ -1518,7 +1518,7 @@
"emscripten_no_enum_table": true,
"values": [
{"value": 1, "name": "success"},
- {"value": 2, "name": "instance dropped"},
+ {"value": 2, "name": "callback cancelled"},
{"value": 3, "name": "error"}
]
},
@@ -2831,7 +2831,7 @@
"emscripten_no_enum_table": true,
"values": [
{"value": 1, "name": "success"},
- {"value": 2, "name": "instance dropped"},
+ {"value": 2, "name": "callback cancelled"},
{"value": 3, "name": "error"}
]
},
@@ -3307,7 +3307,7 @@
"emscripten_no_enum_table": true,
"values": [
{"value": 1, "name": "success"},
- {"value": 2, "name": "instance dropped"},
+ {"value": 2, "name": "callback cancelled"},
{"value": 3, "name": "error"}
]
},
diff --git a/src/dawn/native/Adapter.cpp b/src/dawn/native/Adapter.cpp
index 08ed688..c7bc5f6 100644
--- a/src/dawn/native/Adapter.cpp
+++ b/src/dawn/native/Adapter.cpp
@@ -452,7 +452,7 @@
void Complete(EventCompletionType completionType) override {
if (completionType == EventCompletionType::Shutdown) {
- mStatus = WGPURequestDeviceStatus_InstanceDropped;
+ mStatus = WGPURequestDeviceStatus_CallbackCancelled;
mDevice = nullptr;
mMessage = "A valid external Instance reference no longer exists.";
}
diff --git a/src/dawn/native/Buffer.cpp b/src/dawn/native/Buffer.cpp
index 2c2de00..f99f976 100644
--- a/src/dawn/native/Buffer.cpp
+++ b/src/dawn/native/Buffer.cpp
@@ -234,7 +234,7 @@
void* userdata2 = mUserdata2.ExtractAsDangling();
if (completionType == EventCompletionType::Shutdown) {
- mCallback(WGPUMapAsyncStatus_InstanceDropped,
+ mCallback(WGPUMapAsyncStatus_CallbackCancelled,
ToOutputStringView("A valid external Instance reference no longer exists."),
userdata1, userdata2);
return;
diff --git a/src/dawn/native/CreatePipelineAsyncEvent.cpp b/src/dawn/native/CreatePipelineAsyncEvent.cpp
index 4b79627..844d1d2 100644
--- a/src/dawn/native/CreatePipelineAsyncEvent.cpp
+++ b/src/dawn/native/CreatePipelineAsyncEvent.cpp
@@ -187,7 +187,7 @@
if (completionType == EventCompletionType::Shutdown) {
if (mCallback) {
- mCallback(WGPUCreatePipelineAsyncStatus_InstanceDropped, nullptr,
+ mCallback(WGPUCreatePipelineAsyncStatus_CallbackCancelled, nullptr,
ToOutputStringView("Instance dropped"), userdata1, userdata2);
}
return;
diff --git a/src/dawn/native/Device.cpp b/src/dawn/native/Device.cpp
index 4cd89d2..dcef8e7 100644
--- a/src/dawn/native/Device.cpp
+++ b/src/dawn/native/Device.cpp
@@ -215,7 +215,7 @@
void DeviceBase::DeviceLostEvent::Complete(EventCompletionType completionType) {
if (completionType == EventCompletionType::Shutdown) {
- mReason = wgpu::DeviceLostReason::InstanceDropped;
+ mReason = wgpu::DeviceLostReason::CallbackCancelled;
mMessage = "A valid external Instance reference no longer exists.";
}
@@ -234,7 +234,7 @@
void* userdata1 = mUserdata1.ExtractAsDangling();
void* userdata2 = mUserdata2.ExtractAsDangling();
- if (mReason == wgpu::DeviceLostReason::InstanceDropped ||
+ if (mReason == wgpu::DeviceLostReason::CallbackCancelled ||
mReason == wgpu::DeviceLostReason::FailedCreation) {
device = nullptr;
}
@@ -833,7 +833,7 @@
void Complete(EventCompletionType completionType) override {
WGPUPopErrorScopeStatus status = completionType == EventCompletionType::Ready
? WGPUPopErrorScopeStatus_Success
- : WGPUPopErrorScopeStatus_InstanceDropped;
+ : WGPUPopErrorScopeStatus_CallbackCancelled;
WGPUErrorType type;
WGPUStringView message = kEmptyOutputStringView;
if (mScope) {
diff --git a/src/dawn/native/Instance.cpp b/src/dawn/native/Instance.cpp
index 8c54cd9..2dc6339 100644
--- a/src/dawn/native/Instance.cpp
+++ b/src/dawn/native/Instance.cpp
@@ -293,8 +293,8 @@
void* userdata2 = mUserdata2.ExtractAsDangling();
if (completionType == EventCompletionType::Shutdown) {
- mCallback(WGPURequestAdapterStatus_InstanceDropped, nullptr, kEmptyOutputStringView,
- userdata1, userdata2);
+ mCallback(WGPURequestAdapterStatus_CallbackCancelled, nullptr,
+ kEmptyOutputStringView, userdata1, userdata2);
return;
}
diff --git a/src/dawn/native/Queue.cpp b/src/dawn/native/Queue.cpp
index d59ff3d..c4f3532 100644
--- a/src/dawn/native/Queue.cpp
+++ b/src/dawn/native/Queue.cpp
@@ -209,7 +209,7 @@
// WorkDoneEvent has no error cases other than the mEarlyStatus ones.
WGPUQueueWorkDoneStatus status = WGPUQueueWorkDoneStatus_Success;
if (completionType == EventCompletionType::Shutdown) {
- status = WGPUQueueWorkDoneStatus_InstanceDropped;
+ status = WGPUQueueWorkDoneStatus_CallbackCancelled;
} else if (mEarlyStatus) {
status = mEarlyStatus.value();
}
diff --git a/src/dawn/native/ShaderModule.cpp b/src/dawn/native/ShaderModule.cpp
index 16ae996..99d4abe 100644
--- a/src/dawn/native/ShaderModule.cpp
+++ b/src/dawn/native/ShaderModule.cpp
@@ -1641,7 +1641,7 @@
void Complete(EventCompletionType completionType) override {
WGPUCompilationInfoRequestStatus status =
- WGPUCompilationInfoRequestStatus_InstanceDropped;
+ WGPUCompilationInfoRequestStatus_CallbackCancelled;
const CompilationInfo* compilationInfo = nullptr;
if (completionType == EventCompletionType::Ready) {
status = WGPUCompilationInfoRequestStatus_Success;
diff --git a/src/dawn/node/binding/GPUAdapter.cpp b/src/dawn/node/binding/GPUAdapter.cpp
index 65e2360..ceeaae8 100644
--- a/src/dawn/node/binding/GPUAdapter.cpp
+++ b/src/dawn/node/binding/GPUAdapter.cpp
@@ -245,7 +245,7 @@
auto r = interop::GPUDeviceLostReason::kDestroyed;
switch (reason) {
case wgpu::DeviceLostReason::Destroyed:
- case wgpu::DeviceLostReason::InstanceDropped:
+ case wgpu::DeviceLostReason::CallbackCancelled:
r = interop::GPUDeviceLostReason::kDestroyed;
break;
case wgpu::DeviceLostReason::FailedCreation:
diff --git a/src/dawn/node/binding/GPUBuffer.cpp b/src/dawn/node/binding/GPUBuffer.cpp
index 5903760..5bffb0b 100644
--- a/src/dawn/node/binding/GPUBuffer.cpp
+++ b/src/dawn/node/binding/GPUBuffer.cpp
@@ -88,7 +88,7 @@
ctx->promise.Resolve();
mapped_ = true;
break;
- case wgpu::MapAsyncStatus::InstanceDropped: // fallthrough
+ case wgpu::MapAsyncStatus::CallbackCancelled: // fallthrough
assert(false);
case wgpu::MapAsyncStatus::Aborted:
async_->Reject(ctx->env, ctx->promise, Errors::AbortError(ctx->env));
diff --git a/src/dawn/samples/SampleUtils.cpp b/src/dawn/samples/SampleUtils.cpp
index 7671a19..7604916 100644
--- a/src/dawn/samples/SampleUtils.cpp
+++ b/src/dawn/samples/SampleUtils.cpp
@@ -214,8 +214,8 @@
case wgpu::DeviceLostReason::Destroyed:
reasonName = "Destroyed";
break;
- case wgpu::DeviceLostReason::InstanceDropped:
- reasonName = "InstanceDropped";
+ case wgpu::DeviceLostReason::CallbackCancelled:
+ reasonName = "CallbackCancelled";
break;
case wgpu::DeviceLostReason::FailedCreation:
reasonName = "FailedCreation";
diff --git a/src/dawn/tests/end2end/EventTests.cpp b/src/dawn/tests/end2end/EventTests.cpp
index 17a66c4..3d00661 100644
--- a/src/dawn/tests/end2end/EventTests.cpp
+++ b/src/dawn/tests/end2end/EventTests.cpp
@@ -419,9 +419,9 @@
// the callback to be cleaned up immediately (and should expect it to happen on a future
// Tick).
ASSERT_THAT(status, AnyOf(Eq(wgpu::QueueWorkDoneStatus::Success),
- Eq(wgpu::QueueWorkDoneStatus::InstanceDropped)));
+ Eq(wgpu::QueueWorkDoneStatus::CallbackCancelled)));
} else {
- ASSERT_EQ(status, wgpu::QueueWorkDoneStatus::InstanceDropped);
+ ASSERT_EQ(status, wgpu::QueueWorkDoneStatus::CallbackCancelled);
}
}
@@ -442,11 +442,11 @@
// the callback to be cleaned up immediately (and should expect it to happen on a future
// Tick).
ASSERT_THAT(status, AnyOf(Eq(wgpu::QueueWorkDoneStatus::Success),
- Eq(wgpu::QueueWorkDoneStatus::InstanceDropped)));
+ Eq(wgpu::QueueWorkDoneStatus::CallbackCancelled)));
} else {
ASSERT_EQ(status, kStatusUninitialized);
testInstance = nullptr; // Drop the last external ref to the instance.
- ASSERT_EQ(status, wgpu::QueueWorkDoneStatus::InstanceDropped);
+ ASSERT_EQ(status, wgpu::QueueWorkDoneStatus::CallbackCancelled);
}
}
diff --git a/src/dawn/tests/unittests/wire/WireAdapterTests.cpp b/src/dawn/tests/unittests/wire/WireAdapterTests.cpp
index b7d64da..1468ae1 100644
--- a/src/dawn/tests/unittests/wire/WireAdapterTests.cpp
+++ b/src/dawn/tests/unittests/wire/WireAdapterTests.cpp
@@ -352,7 +352,7 @@
RequestDevice(&desc);
ExpectWireCallbacksWhen([&](auto& mockCb) {
- EXPECT_CALL(mockCb, Call(wgpu::RequestDeviceStatus::InstanceDropped, IsNull(),
+ EXPECT_CALL(mockCb, Call(wgpu::RequestDeviceStatus::CallbackCancelled, IsNull(),
NonEmptySizedString()))
.Times(1);
diff --git a/src/dawn/tests/unittests/wire/WireBufferMappingTests.cpp b/src/dawn/tests/unittests/wire/WireBufferMappingTests.cpp
index 51d5566..c604d23 100644
--- a/src/dawn/tests/unittests/wire/WireBufferMappingTests.cpp
+++ b/src/dawn/tests/unittests/wire/WireBufferMappingTests.cpp
@@ -728,7 +728,7 @@
}
// Test that registering a callback then wire disconnect calls the callback with
-// InstanceDropped.
+// CallbackCancelled.
TEST_P(WireBufferMappingTests, MapThenDisconnect) {
wgpu::MapMode mapMode = GetMapMode();
MapAsync(mapMode, 0, kBufferSize);
@@ -744,20 +744,20 @@
FlushClient();
ExpectWireCallbacksWhen([&](auto& mockCb) {
- EXPECT_CALL(mockCb, Call(wgpu::MapAsyncStatus::InstanceDropped, _)).Times(1);
+ EXPECT_CALL(mockCb, Call(wgpu::MapAsyncStatus::CallbackCancelled, _)).Times(1);
GetWireClient()->Disconnect();
});
}
// Test that registering a callback after wire disconnect calls the callback with
-// InstanceDropped.
+// CallbackCancelled.
TEST_P(WireBufferMappingTests, MapAfterDisconnect) {
wgpu::MapMode mapMode = GetMapMode();
GetWireClient()->Disconnect();
ExpectWireCallbacksWhen([&](auto& mockCb) {
- EXPECT_CALL(mockCb, Call(wgpu::MapAsyncStatus::InstanceDropped, _)).Times(1);
+ EXPECT_CALL(mockCb, Call(wgpu::MapAsyncStatus::CallbackCancelled, _)).Times(1);
MapAsync(mapMode, 0, kBufferSize);
});
@@ -912,7 +912,7 @@
static constexpr size_t kNumRequests = 10;
ExpectWireCallbacksWhen([&](auto& mockCb) {
- EXPECT_CALL(mockCb, Call(wgpu::MapAsyncStatus::InstanceDropped, _))
+ EXPECT_CALL(mockCb, Call(wgpu::MapAsyncStatus::CallbackCancelled, _))
.Times(kNumRequests + 1)
.WillOnce([&]() {
for (size_t i = 0; i < kNumRequests; i++) {
diff --git a/src/dawn/tests/unittests/wire/WireCreatePipelineAsyncTests.cpp b/src/dawn/tests/unittests/wire/WireCreatePipelineAsyncTests.cpp
index 9542443..1f3f4c1 100644
--- a/src/dawn/tests/unittests/wire/WireCreatePipelineAsyncTests.cpp
+++ b/src/dawn/tests/unittests/wire/WireCreatePipelineAsyncTests.cpp
@@ -234,7 +234,7 @@
}
// Test that registering a callback then wire disconnect calls the callback with
-// InstanceDropped.
+// CallbackCancelled.
TEST_P(WireCreateComputePipelineAsyncTest, CreateThenDisconnect) {
CreateComputePipelineAsync(&mDescriptor);
@@ -247,7 +247,7 @@
FlushClient();
ExpectWireCallbacksWhen([&](auto& mockCb) {
- EXPECT_CALL(mockCb, Call(wgpu::CreatePipelineAsyncStatus::InstanceDropped, IsNull(),
+ EXPECT_CALL(mockCb, Call(wgpu::CreatePipelineAsyncStatus::CallbackCancelled, IsNull(),
NonEmptySizedString()))
.Times(1);
@@ -256,7 +256,7 @@
}
// Test that registering a callback then wire disconnect calls the callback with
-// InstanceDropped.
+// CallbackCancelled.
TEST_P(WireCreateRenderPipelineAsyncTest, CreateThenDisconnect) {
CreateRenderPipelineAsync(&mDescriptor);
@@ -269,7 +269,7 @@
FlushClient();
ExpectWireCallbacksWhen([&](auto& mockCb) {
- EXPECT_CALL(mockCb, Call(wgpu::CreatePipelineAsyncStatus::InstanceDropped, IsNull(),
+ EXPECT_CALL(mockCb, Call(wgpu::CreatePipelineAsyncStatus::CallbackCancelled, IsNull(),
NonEmptySizedString()))
.Times(1);
@@ -278,12 +278,12 @@
}
// Test that registering a callback after wire disconnect calls the callback with
-// InstanceDropped.
+// CallbackCancelled.
TEST_P(WireCreateComputePipelineAsyncTest, CreateAfterDisconnect) {
GetWireClient()->Disconnect();
ExpectWireCallbacksWhen([&](auto& mockCb) {
- EXPECT_CALL(mockCb, Call(wgpu::CreatePipelineAsyncStatus::InstanceDropped, IsNull(),
+ EXPECT_CALL(mockCb, Call(wgpu::CreatePipelineAsyncStatus::CallbackCancelled, IsNull(),
NonEmptySizedString()))
.Times(1);
@@ -292,12 +292,12 @@
}
// Test that registering a callback after wire disconnect calls the callback with
-// InstanceDropped.
+// CallbackCancelled.
TEST_P(WireCreateRenderPipelineAsyncTest, CreateAfterDisconnect) {
GetWireClient()->Disconnect();
ExpectWireCallbacksWhen([&](auto& mockCb) {
- EXPECT_CALL(mockCb, Call(wgpu::CreatePipelineAsyncStatus::InstanceDropped, IsNull(),
+ EXPECT_CALL(mockCb, Call(wgpu::CreatePipelineAsyncStatus::CallbackCancelled, IsNull(),
NonEmptySizedString()))
.Times(1);
@@ -313,7 +313,7 @@
CreateComputePipelineAsync(&mDescriptor);
ExpectWireCallbacksWhen([&](auto& mockCb) {
- EXPECT_CALL(mockCb, Call(wgpu::CreatePipelineAsyncStatus::InstanceDropped, IsNull(),
+ EXPECT_CALL(mockCb, Call(wgpu::CreatePipelineAsyncStatus::CallbackCancelled, IsNull(),
NonEmptySizedString()))
.Times(1);
@@ -329,7 +329,7 @@
CreateRenderPipelineAsync(&mDescriptor);
ExpectWireCallbacksWhen([&](auto& mockCb) {
- EXPECT_CALL(mockCb, Call(wgpu::CreatePipelineAsyncStatus::InstanceDropped, IsNull(),
+ EXPECT_CALL(mockCb, Call(wgpu::CreatePipelineAsyncStatus::CallbackCancelled, IsNull(),
NonEmptySizedString()))
.Times(1);
@@ -344,7 +344,7 @@
instance = nullptr;
ExpectWireCallbacksWhen([&](auto& mockCb) {
- EXPECT_CALL(mockCb, Call(wgpu::CreatePipelineAsyncStatus::InstanceDropped, IsNull(),
+ EXPECT_CALL(mockCb, Call(wgpu::CreatePipelineAsyncStatus::CallbackCancelled, IsNull(),
NonEmptySizedString()))
.Times(1);
@@ -359,7 +359,7 @@
instance = nullptr;
ExpectWireCallbacksWhen([&](auto& mockCb) {
- EXPECT_CALL(mockCb, Call(wgpu::CreatePipelineAsyncStatus::InstanceDropped, IsNull(),
+ EXPECT_CALL(mockCb, Call(wgpu::CreatePipelineAsyncStatus::CallbackCancelled, IsNull(),
NonEmptySizedString()))
.Times(1);
diff --git a/src/dawn/tests/unittests/wire/WireDisconnectTests.cpp b/src/dawn/tests/unittests/wire/WireDisconnectTests.cpp
index be82669..94f54fd 100644
--- a/src/dawn/tests/unittests/wire/WireDisconnectTests.cpp
+++ b/src/dawn/tests/unittests/wire/WireDisconnectTests.cpp
@@ -84,7 +84,7 @@
// Check that disconnecting the wire client calls the device lost callback exacty once.
TEST_F(WireDisconnectTests, CallsDeviceLostCallback) {
// Disconnect the wire client. We should receive device lost only once.
- EXPECT_CALL(deviceLostCallback, Call(_, wgpu::DeviceLostReason::InstanceDropped, _))
+ EXPECT_CALL(deviceLostCallback, Call(_, wgpu::DeviceLostReason::CallbackCancelled, _))
.Times(Exactly(1));
GetWireClient()->Disconnect();
GetWireClient()->Disconnect();
@@ -124,7 +124,7 @@
// Check that a device loss after a disconnect does not trigger the callback again.
TEST_F(WireDisconnectTests, DisconnectThenServerLost) {
// Disconnect the client. We should see the callback once.
- EXPECT_CALL(deviceLostCallback, Call(_, wgpu::DeviceLostReason::InstanceDropped, _))
+ EXPECT_CALL(deviceLostCallback, Call(_, wgpu::DeviceLostReason::CallbackCancelled, _))
.Times(Exactly(1));
GetWireClient()->Disconnect();
diff --git a/src/dawn/tests/unittests/wire/WireErrorCallbackTests.cpp b/src/dawn/tests/unittests/wire/WireErrorCallbackTests.cpp
index aaa8953..dd00342 100644
--- a/src/dawn/tests/unittests/wire/WireErrorCallbackTests.cpp
+++ b/src/dawn/tests/unittests/wire/WireErrorCallbackTests.cpp
@@ -155,7 +155,7 @@
FlushClient();
FlushFutures();
ExpectWireCallbacksWhen([&](auto& mockCb) {
- EXPECT_CALL(mockCb, Call(wgpu::PopErrorScopeStatus::InstanceDropped,
+ EXPECT_CALL(mockCb, Call(wgpu::PopErrorScopeStatus::CallbackCancelled,
wgpu::ErrorType::NoError, EmptySizedString()))
.Times(1);
@@ -181,7 +181,7 @@
FlushClient();
FlushFutures();
ExpectWireCallbacksWhen([&](auto& mockCb) {
- EXPECT_CALL(mockCb, Call(wgpu::PopErrorScopeStatus::InstanceDropped,
+ EXPECT_CALL(mockCb, Call(wgpu::PopErrorScopeStatus::CallbackCancelled,
wgpu::ErrorType::Validation, EmptySizedString()))
.Times(1);
diff --git a/src/dawn/tests/unittests/wire/WireInstanceTests.cpp b/src/dawn/tests/unittests/wire/WireInstanceTests.cpp
index 21c67d9..c5db660 100644
--- a/src/dawn/tests/unittests/wire/WireInstanceTests.cpp
+++ b/src/dawn/tests/unittests/wire/WireInstanceTests.cpp
@@ -481,7 +481,7 @@
RequestAdapter(&options);
ExpectWireCallbacksWhen([&](auto& mockCb) {
- EXPECT_CALL(mockCb, Call(wgpu::RequestAdapterStatus::InstanceDropped, IsNull(),
+ EXPECT_CALL(mockCb, Call(wgpu::RequestAdapterStatus::CallbackCancelled, IsNull(),
NonEmptySizedString()))
.Times(1);
@@ -496,7 +496,7 @@
RequestAdapter(&options);
ExpectWireCallbacksWhen([&](auto& mockCb) {
- EXPECT_CALL(mockCb, Call(wgpu::RequestAdapterStatus::InstanceDropped, IsNull(),
+ EXPECT_CALL(mockCb, Call(wgpu::RequestAdapterStatus::CallbackCancelled, IsNull(),
NonEmptySizedString()))
.Times(1);
diff --git a/src/dawn/tests/unittests/wire/WireQueueTests.cpp b/src/dawn/tests/unittests/wire/WireQueueTests.cpp
index eb9a433..8781132 100644
--- a/src/dawn/tests/unittests/wire/WireQueueTests.cpp
+++ b/src/dawn/tests/unittests/wire/WireQueueTests.cpp
@@ -103,7 +103,7 @@
FlushFutures();
ExpectWireCallbacksWhen([&](auto& mockCb) {
- EXPECT_CALL(mockCb, Call(wgpu::QueueWorkDoneStatus::InstanceDropped)).Times(1);
+ EXPECT_CALL(mockCb, Call(wgpu::QueueWorkDoneStatus::CallbackCancelled)).Times(1);
GetWireClient()->Disconnect();
});
@@ -121,7 +121,7 @@
FlushClient();
ExpectWireCallbacksWhen([&](auto& mockCb) {
- EXPECT_CALL(mockCb, Call(wgpu::QueueWorkDoneStatus::InstanceDropped)).Times(1);
+ EXPECT_CALL(mockCb, Call(wgpu::QueueWorkDoneStatus::CallbackCancelled)).Times(1);
GetWireClient()->Disconnect();
});
@@ -133,7 +133,7 @@
GetWireClient()->Disconnect();
ExpectWireCallbacksWhen([&](auto& mockCb) {
- EXPECT_CALL(mockCb, Call(wgpu::QueueWorkDoneStatus::InstanceDropped)).Times(1);
+ EXPECT_CALL(mockCb, Call(wgpu::QueueWorkDoneStatus::CallbackCancelled)).Times(1);
OnSubmittedWorkDone();
});
@@ -150,7 +150,7 @@
FlushClient();
ExpectWireCallbacksWhen([&](auto& mockCb) {
- EXPECT_CALL(mockCb, Call(wgpu::QueueWorkDoneStatus::InstanceDropped))
+ EXPECT_CALL(mockCb, Call(wgpu::QueueWorkDoneStatus::CallbackCancelled))
.Times(kNumRequests + 1)
.WillOnce([&]() {
for (size_t i = 0; i < kNumRequests; i++) {
diff --git a/src/dawn/tests/unittests/wire/WireShaderModuleTests.cpp b/src/dawn/tests/unittests/wire/WireShaderModuleTests.cpp
index 9925656..c547cf1 100644
--- a/src/dawn/tests/unittests/wire/WireShaderModuleTests.cpp
+++ b/src/dawn/tests/unittests/wire/WireShaderModuleTests.cpp
@@ -139,7 +139,7 @@
FlushFutures();
ExpectWireCallbacksWhen([&](auto& mockCb) {
- EXPECT_CALL(mockCb, Call(wgpu::CompilationInfoRequestStatus::InstanceDropped, nullptr))
+ EXPECT_CALL(mockCb, Call(wgpu::CompilationInfoRequestStatus::CallbackCancelled, nullptr))
.Times(1);
GetWireClient()->Disconnect();
@@ -152,7 +152,7 @@
GetWireClient()->Disconnect();
ExpectWireCallbacksWhen([&](auto& mockCb) {
- EXPECT_CALL(mockCb, Call(wgpu::CompilationInfoRequestStatus::InstanceDropped, nullptr))
+ EXPECT_CALL(mockCb, Call(wgpu::CompilationInfoRequestStatus::CallbackCancelled, nullptr))
.Times(1);
GetCompilationInfo();
@@ -175,7 +175,7 @@
FlushFutures();
ExpectWireCallbacksWhen([&](auto& mockCb) {
- EXPECT_CALL(mockCb, Call(wgpu::CompilationInfoRequestStatus::InstanceDropped, nullptr))
+ EXPECT_CALL(mockCb, Call(wgpu::CompilationInfoRequestStatus::CallbackCancelled, nullptr))
.Times(kNumRequests + 1)
.WillOnce([&]() {
for (size_t i = 0; i < kNumRequests; i++) {
diff --git a/src/dawn/wire/client/Adapter.cpp b/src/dawn/wire/client/Adapter.cpp
index afac972..8df4599 100644
--- a/src/dawn/wire/client/Adapter.cpp
+++ b/src/dawn/wire/client/Adapter.cpp
@@ -73,7 +73,7 @@
private:
void CompleteImpl(FutureID futureID, EventCompletionType completionType) override {
if (completionType == EventCompletionType::Shutdown) {
- mStatus = WGPURequestDeviceStatus_InstanceDropped;
+ mStatus = WGPURequestDeviceStatus_CallbackCancelled;
mMessage = "A valid external Instance reference no longer exists.";
}
@@ -91,9 +91,9 @@
if (mStatus != WGPURequestDeviceStatus_Success) {
// If there was an error and we didn't return a device, we need to call the device lost
// callback and reclaim the device allocation.
- if (mStatus == WGPURequestDeviceStatus_InstanceDropped) {
+ if (mStatus == WGPURequestDeviceStatus_CallbackCancelled) {
mDevice->HandleDeviceLost(
- WGPUDeviceLostReason_InstanceDropped,
+ WGPUDeviceLostReason_CallbackCancelled,
ToOutputStringView("A valid external Instance reference no longer exists."));
} else {
mDevice->HandleDeviceLost(WGPUDeviceLostReason_FailedCreation,
diff --git a/src/dawn/wire/client/Buffer.cpp b/src/dawn/wire/client/Buffer.cpp
index 4376f67..e33afae 100644
--- a/src/dawn/wire/client/Buffer.cpp
+++ b/src/dawn/wire/client/Buffer.cpp
@@ -136,7 +136,7 @@
private:
void CompleteImpl(FutureID futureID, EventCompletionType completionType) override {
if (completionType == EventCompletionType::Shutdown) {
- mStatus = WGPUMapAsyncStatus_InstanceDropped;
+ mStatus = WGPUMapAsyncStatus_CallbackCancelled;
mMessage = "A valid external Instance reference no longer exists.";
}
diff --git a/src/dawn/wire/client/Device.cpp b/src/dawn/wire/client/Device.cpp
index 09e344d..38e4fde 100644
--- a/src/dawn/wire/client/Device.cpp
+++ b/src/dawn/wire/client/Device.cpp
@@ -67,7 +67,7 @@
private:
void CompleteImpl(FutureID futureID, EventCompletionType completionType) override {
if (completionType == EventCompletionType::Shutdown) {
- mStatus = WGPUPopErrorScopeStatus_InstanceDropped;
+ mStatus = WGPUPopErrorScopeStatus_CallbackCancelled;
mMessage = "";
}
if (mCallback) {
@@ -124,7 +124,7 @@
}
if (completionType == EventCompletionType::Shutdown) {
- mStatus = WGPUCreatePipelineAsyncStatus_InstanceDropped;
+ mStatus = WGPUCreatePipelineAsyncStatus_CallbackCancelled;
mMessage = "A valid external Instance reference no longer exists.";
}
@@ -188,7 +188,7 @@
private:
void CompleteImpl(FutureID futureID, EventCompletionType completionType) override {
if (completionType == EventCompletionType::Shutdown) {
- mReason = WGPUDeviceLostReason_InstanceDropped;
+ mReason = WGPUDeviceLostReason_CallbackCancelled;
mMessage = "A valid external Instance reference no longer exists.";
}
diff --git a/src/dawn/wire/client/Instance.cpp b/src/dawn/wire/client/Instance.cpp
index c3d80f8..ea307aa 100644
--- a/src/dawn/wire/client/Instance.cpp
+++ b/src/dawn/wire/client/Instance.cpp
@@ -79,7 +79,7 @@
private:
void CompleteImpl(FutureID futureID, EventCompletionType completionType) override {
if (completionType == EventCompletionType::Shutdown) {
- mStatus = WGPURequestAdapterStatus_InstanceDropped;
+ mStatus = WGPURequestAdapterStatus_CallbackCancelled;
mMessage = "A valid external Instance reference no longer exists.";
}
diff --git a/src/dawn/wire/client/Queue.cpp b/src/dawn/wire/client/Queue.cpp
index ac860d2..89bd325 100644
--- a/src/dawn/wire/client/Queue.cpp
+++ b/src/dawn/wire/client/Queue.cpp
@@ -57,7 +57,7 @@
private:
void CompleteImpl(FutureID futureID, EventCompletionType completionType) override {
if (completionType == EventCompletionType::Shutdown) {
- mStatus = WGPUQueueWorkDoneStatus_InstanceDropped;
+ mStatus = WGPUQueueWorkDoneStatus_CallbackCancelled;
}
void* userdata1 = mUserdata1.ExtractAsDangling();
void* userdata2 = mUserdata2.ExtractAsDangling();
diff --git a/src/dawn/wire/client/ShaderModule.cpp b/src/dawn/wire/client/ShaderModule.cpp
index 79fea77..befc9bd 100644
--- a/src/dawn/wire/client/ShaderModule.cpp
+++ b/src/dawn/wire/client/ShaderModule.cpp
@@ -90,7 +90,7 @@
void CompleteImpl(FutureID futureID, EventCompletionType completionType) override {
WGPUCompilationInfo* compilationInfo = nullptr;
if (completionType == EventCompletionType::Shutdown) {
- mStatus = WGPUCompilationInfoRequestStatus_InstanceDropped;
+ mStatus = WGPUCompilationInfoRequestStatus_CallbackCancelled;
} else {
compilationInfo = &(*mShader->mCompilationInfo);
}
diff --git a/src/dawn/wire/server/ServerAdapter.cpp b/src/dawn/wire/server/ServerAdapter.cpp
index a4d8c36..1516ecb 100644
--- a/src/dawn/wire/server/ServerAdapter.cpp
+++ b/src/dawn/wire/server/ServerAdapter.cpp
@@ -141,7 +141,7 @@
// Assign the handle and allocated status if the device is created successfully.
Known<WGPUDevice> reservation;
if (FillReservation(data->deviceObjectId, device, &reservation) == WireResult::FatalError) {
- cmd.status = WGPURequestDeviceStatus_InstanceDropped;
+ cmd.status = WGPURequestDeviceStatus_CallbackCancelled;
cmd.message = ToOutputStringView("Destroyed before request was fulfilled.");
SerializeCommand(cmd);
return;
diff --git a/src/dawn/wire/server/ServerDevice.cpp b/src/dawn/wire/server/ServerDevice.cpp
index d3f7ea3..cb0bfc1 100644
--- a/src/dawn/wire/server/ServerDevice.cpp
+++ b/src/dawn/wire/server/ServerDevice.cpp
@@ -128,7 +128,7 @@
if (status == WGPUCreatePipelineAsyncStatus_Success &&
FillReservation(data->pipelineObjectID, pipeline) == WireResult::FatalError) {
- cmd.status = WGPUCreatePipelineAsyncStatus_InstanceDropped;
+ cmd.status = WGPUCreatePipelineAsyncStatus_CallbackCancelled;
cmd.message = ToOutputStringView("Destroyed before request was fulfilled.");
}
SerializeCommand(cmd);
@@ -170,7 +170,7 @@
if (status == WGPUCreatePipelineAsyncStatus_Success &&
FillReservation(data->pipelineObjectID, pipeline) == WireResult::FatalError) {
- cmd.status = WGPUCreatePipelineAsyncStatus_InstanceDropped;
+ cmd.status = WGPUCreatePipelineAsyncStatus_CallbackCancelled;
cmd.message = ToOutputStringView("Destroyed before request was fulfilled.");
}
SerializeCommand(cmd);
diff --git a/src/dawn/wire/server/ServerInstance.cpp b/src/dawn/wire/server/ServerInstance.cpp
index 60ad8ec..073e425 100644
--- a/src/dawn/wire/server/ServerInstance.cpp
+++ b/src/dawn/wire/server/ServerInstance.cpp
@@ -73,7 +73,7 @@
// Assign the handle and allocated status if the adapter is created successfully.
if (FillReservation(data->adapterObjectId, adapter) == WireResult::FatalError) {
- cmd.status = WGPURequestAdapterStatus_InstanceDropped;
+ cmd.status = WGPURequestAdapterStatus_CallbackCancelled;
cmd.message = ToOutputStringView("Destroyed before request was fulfilled.");
SerializeCommand(cmd);
return;
diff --git a/third_party/emdawnwebgpu/webgpu.cpp b/third_party/emdawnwebgpu/webgpu.cpp
index b0beed3..5bfac41 100644
--- a/third_party/emdawnwebgpu/webgpu.cpp
+++ b/third_party/emdawnwebgpu/webgpu.cpp
@@ -842,7 +842,7 @@
void Complete(FutureID, EventCompletionType type) override {
if (type == EventCompletionType::Shutdown) {
- mStatus = WGPUCompilationInfoRequestStatus_InstanceDropped;
+ mStatus = WGPUCompilationInfoRequestStatus_CallbackCancelled;
}
if (mCallback) {
mCallback(mStatus,
@@ -888,7 +888,7 @@
void Complete(FutureID, EventCompletionType type) override {
if (type == EventCompletionType::Shutdown) {
- mStatus = WGPUCreatePipelineAsyncStatus_InstanceDropped;
+ mStatus = WGPUCreatePipelineAsyncStatus_CallbackCancelled;
mMessage = "A valid external Instance reference no longer exists.";
}
if (mCallback) {
@@ -945,7 +945,7 @@
void Complete(FutureID, EventCompletionType type) override {
if (type == EventCompletionType::Shutdown) {
- mReason = WGPUDeviceLostReason_InstanceDropped;
+ mReason = WGPUDeviceLostReason_CallbackCancelled;
mMessage = "A valid external Instance reference no longer exists.";
}
if (mCallback) {
@@ -993,7 +993,7 @@
void Complete(FutureID, EventCompletionType type) override {
if (type == EventCompletionType::Shutdown) {
- mStatus = WGPUPopErrorScopeStatus_InstanceDropped;
+ mStatus = WGPUPopErrorScopeStatus_CallbackCancelled;
mErrorType = WGPUErrorType_NoError;
mMessage = "A valid external Instance reference no longer exists.";
}
@@ -1045,7 +1045,7 @@
void Complete(FutureID futureID, EventCompletionType type) override {
if (type == EventCompletionType::Shutdown) {
- mStatus = WGPUMapAsyncStatus_InstanceDropped;
+ mStatus = WGPUMapAsyncStatus_CallbackCancelled;
mMessage = "A valid external Instance reference no longer exists.";
}
@@ -1100,7 +1100,7 @@
void Complete(FutureID, EventCompletionType type) override {
if (type == EventCompletionType::Shutdown) {
- mStatus = WGPURequestAdapterStatus_InstanceDropped;
+ mStatus = WGPURequestAdapterStatus_CallbackCancelled;
mMessage = "A valid external Instance reference no longer exists.";
}
if (mCallback) {
@@ -1147,7 +1147,7 @@
void Complete(FutureID, EventCompletionType type) override {
if (type == EventCompletionType::Shutdown) {
- mStatus = WGPURequestDeviceStatus_InstanceDropped;
+ mStatus = WGPURequestDeviceStatus_CallbackCancelled;
mMessage = "A valid external Instance reference no longer exists.";
}
if (mCallback) {
@@ -1186,7 +1186,7 @@
void Complete(FutureID, EventCompletionType type) override {
if (type == EventCompletionType::Shutdown) {
- mStatus = WGPUQueueWorkDoneStatus_InstanceDropped;
+ mStatus = WGPUQueueWorkDoneStatus_CallbackCancelled;
}
if (mCallback) {
mCallback(mStatus, mUserdata1, mUserdata2);
