commit 7d2d30bef758eb19640b9f191acf8798aed32dd4
author Loko Kung <lokokung@google.com> Fri Feb 23 01:23:55 2024 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Feb 23 01:23:55 2024 +0000
tree 8df4d35a597593b4fdaea9f47fa0bfe2b9ec3a74
parent 18aaf71f1f9c9dc3e7a8d261293385e021577448

[dawn][wire] Remove deprecated server injection APIs.

Change-Id: Ie3cc408ce0f93eb192736a8f6be63525f49ae921
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/174441
Commit-Queue: Loko Kung <lokokung@google.com>
Reviewed-by: Austin Eng <enga@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>

include/dawn/wire/WireClient.h

diff --git a/include/dawn/wire/WireClient.h b/include/dawn/wire/WireClient.h
index b505802..fea95b6 100644
--- a/include/dawn/wire/WireClient.h
+++ b/include/dawn/wire/WireClient.h
@@ -47,11 +47,6 @@
     WGPUTexture texture;
     Handle handle;
     Handle deviceHandle;
-    // TODO(dawn:2021) Remove this once Chromium has been updated.
-    uint32_t id;
-    uint32_t generation;
-    uint32_t deviceId;
-    uint32_t deviceGeneration;
 };
 
 struct ReservedSwapChain {

include/dawn/wire/WireServer.h

diff --git a/include/dawn/wire/WireServer.h b/include/dawn/wire/WireServer.h
index 61424bb..3738cab 100644
--- a/include/dawn/wire/WireServer.h
+++ b/include/dawn/wire/WireServer.h
@@ -54,19 +54,6 @@
 
     const volatile char* HandleCommands(const volatile char* commands, size_t size) override;
 
-    bool InjectTexture(WGPUTexture texture,
-                       uint32_t id,
-                       uint32_t generation,
-                       uint32_t deviceId,
-                       uint32_t deviceGeneration);
-    bool InjectSwapChain(WGPUSwapChain swapchain,
-                         uint32_t id,
-                         uint32_t generation,
-                         uint32_t deviceId,
-                         uint32_t deviceGeneration);
-    bool InjectDevice(WGPUDevice device, uint32_t id, uint32_t generation);
-    bool InjectInstance(WGPUInstance instance, uint32_t id, uint32_t generation);
-
     bool InjectTexture(WGPUTexture texture, const Handle& handle, const Handle& deviceHandle);
     bool InjectSwapChain(WGPUSwapChain swapchain, const Handle& handle, const Handle& deviceHandle);
     bool InjectDevice(WGPUDevice device, const Handle& handle);

src/dawn/wire/WireServer.cpp

diff --git a/src/dawn/wire/WireServer.cpp b/src/dawn/wire/WireServer.cpp
index 8f99bde..6f299d8 100644
--- a/src/dawn/wire/WireServer.cpp
+++ b/src/dawn/wire/WireServer.cpp
@@ -44,32 +44,6 @@
 }
 
 bool WireServer::InjectTexture(WGPUTexture texture,
-                               uint32_t id,
-                               uint32_t generation,
-                               uint32_t deviceId,
-                               uint32_t deviceGeneration) {
-    return mImpl->InjectTexture(texture, {id, generation}, {deviceId, deviceGeneration}) ==
-           WireResult::Success;
-}
-
-bool WireServer::InjectSwapChain(WGPUSwapChain swapchain,
-                                 uint32_t id,
-                                 uint32_t generation,
-                                 uint32_t deviceId,
-                                 uint32_t deviceGeneration) {
-    return mImpl->InjectSwapChain(swapchain, {id, generation}, {deviceId, deviceGeneration}) ==
-           WireResult::Success;
-}
-
-bool WireServer::InjectDevice(WGPUDevice device, uint32_t id, uint32_t generation) {
-    return mImpl->InjectDevice(device, {id, generation}) == WireResult::Success;
-}
-
-bool WireServer::InjectInstance(WGPUInstance instance, uint32_t id, uint32_t generation) {
-    return mImpl->InjectInstance(instance, {id, generation}) == WireResult::Success;
-}
-
-bool WireServer::InjectTexture(WGPUTexture texture,
                                const Handle& handle,
                                const Handle& deviceHandle) {
     return mImpl->InjectTexture(texture, handle, deviceHandle) == WireResult::Success;

src/dawn/wire/client/Client.cpp

diff --git a/src/dawn/wire/client/Client.cpp b/src/dawn/wire/client/Client.cpp
index c50293e..435246c 100644
--- a/src/dawn/wire/client/Client.cpp
+++ b/src/dawn/wire/client/Client.cpp
@@ -101,11 +101,6 @@
     result.texture = ToAPI(texture);
     result.handle = texture->GetWireHandle();
     result.deviceHandle = FromAPI(device)->GetWireHandle();
-    // TODO(dawn:2021) Remove setting of deprecated fields once Chromium is updated.
-    result.id = texture->GetWireId();
-    result.generation = texture->GetWireGeneration();
-    result.deviceId = FromAPI(device)->GetWireId();
-    result.deviceGeneration = FromAPI(device)->GetWireGeneration();
     return result;
 }