Removes unused callback mode argument to TrackEvent.
Change-Id: I62c80e23d990329513ba2cd68cb84351b73f78b6
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/173844
Reviewed-by: Austin Eng <enga@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Loko Kung <lokokung@google.com>
diff --git a/src/dawn/native/Adapter.cpp b/src/dawn/native/Adapter.cpp
index c846ed6..d284148 100644
--- a/src/dawn/native/Adapter.cpp
+++ b/src/dawn/native/Adapter.cpp
@@ -314,7 +314,6 @@
}
FutureID futureID = mPhysicalDevice->GetInstance()->GetEventManager()->TrackEvent(
- callbackInfo.mode,
AcquireRef(new RequestDeviceEvent(callbackInfo, CreateDevice(descriptor))));
return {futureID};
}
diff --git a/src/dawn/native/Buffer.cpp b/src/dawn/native/Buffer.cpp
index b916e5f..6b6a096 100644
--- a/src/dawn/native/Buffer.cpp
+++ b/src/dawn/native/Buffer.cpp
@@ -630,8 +630,7 @@
event = mPendingMapEvent;
}
- FutureID futureID =
- GetInstance()->GetEventManager()->TrackEvent(callbackInfo.mode, std::move(event));
+ FutureID futureID = GetInstance()->GetEventManager()->TrackEvent(std::move(event));
return {futureID};
}
diff --git a/src/dawn/native/Device.cpp b/src/dawn/native/Device.cpp
index ff230c3..b6adac6 100644
--- a/src/dawn/native/Device.cpp
+++ b/src/dawn/native/Device.cpp
@@ -779,7 +779,7 @@
}
FutureID futureID = GetInstance()->GetEventManager()->TrackEvent(
- callbackInfo.mode, AcquireRef(new PopErrorScopeEvent(callbackInfo, std::move(scope))));
+ AcquireRef(new PopErrorScopeEvent(callbackInfo, std::move(scope))));
return {futureID};
}
diff --git a/src/dawn/native/EventManager.cpp b/src/dawn/native/EventManager.cpp
index 573f346..6a0e419 100644
--- a/src/dawn/native/EventManager.cpp
+++ b/src/dawn/native/EventManager.cpp
@@ -338,7 +338,7 @@
mEvents.reset();
}
-FutureID EventManager::TrackEvent(wgpu::CallbackMode mode, Ref<TrackedEvent>&& future) {
+FutureID EventManager::TrackEvent(Ref<TrackedEvent>&& future) {
FutureID futureID = mNextFutureID++;
if (!mEvents.has_value()) {
return futureID;
diff --git a/src/dawn/native/EventManager.h b/src/dawn/native/EventManager.h
index 27401fb..8dec94a 100644
--- a/src/dawn/native/EventManager.h
+++ b/src/dawn/native/EventManager.h
@@ -72,7 +72,7 @@
class TrackedEvent;
// Track a TrackedEvent and give it a FutureID.
- [[nodiscard]] FutureID TrackEvent(wgpu::CallbackMode mode, Ref<TrackedEvent>&&);
+ [[nodiscard]] FutureID TrackEvent(Ref<TrackedEvent>&&);
// Returns true if future ProcessEvents is needed.
bool ProcessPollEvents();
[[nodiscard]] wgpu::WaitStatus WaitAny(size_t count,
diff --git a/src/dawn/native/Instance.cpp b/src/dawn/native/Instance.cpp
index b1c15a6..1aeb9a2 100644
--- a/src/dawn/native/Instance.cpp
+++ b/src/dawn/native/Instance.cpp
@@ -291,9 +291,8 @@
}
auto adapters = EnumerateAdapters(options);
- FutureID futureID = GetEventManager()->TrackEvent(
- callbackInfo.mode, AcquireRef(new RequestAdapterEvent(
- callbackInfo, adapters.empty() ? nullptr : std::move(adapters[0]))));
+ FutureID futureID = GetEventManager()->TrackEvent(AcquireRef(new RequestAdapterEvent(
+ callbackInfo, adapters.empty() ? nullptr : std::move(adapters[0]))));
return {futureID};
}
diff --git a/src/dawn/native/Queue.cpp b/src/dawn/native/Queue.cpp
index 1069cc5..c71ae3b 100644
--- a/src/dawn/native/Queue.cpp
+++ b/src/dawn/native/Queue.cpp
@@ -328,8 +328,7 @@
event = AcquireRef(new WorkDoneEvent(callbackInfo, this, GetScheduledWorkDoneSerial()));
}
- FutureID futureID =
- GetInstance()->GetEventManager()->TrackEvent(callbackInfo.mode, std::move(event));
+ FutureID futureID = GetInstance()->GetEventManager()->TrackEvent(std::move(event));
return {futureID};
}