commit 3fa3e5667b1ca22875a9e17a0aaabab1a22d243e
author Corentin Wallez <cwallez@chromium.org> Tue Jun 28 15:55:16 2022 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Jun 28 15:55:16 2022 +0000
tree df1e84996850ad23fe62d4afb527381d1fb541da
parent d23f296a9a31daa764d348169d3ae13d5a09877b

dawn::wire::client: ReserveTexture: remove defaulting of descriptor

The usages in Chromium have been updated to pass a descriptor.

Bug: dawn:1451
Change-Id: I1f08141759dc7b8e0e805aa8efc9a8db51162876
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/94941
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>

include/dawn/wire/WireClient.h

diff --git a/include/dawn/wire/WireClient.h b/include/dawn/wire/WireClient.h
index 9b425b6..93cc199 100644
--- a/include/dawn/wire/WireClient.h
+++ b/include/dawn/wire/WireClient.h
@@ -70,10 +70,8 @@
 
     const volatile char* HandleCommands(const volatile char* commands, size_t size) override;
 
-    // TODO(dawn:1451): Remove the defaulting of descriptor once the callers are updated to provide
-    // one.
     ReservedTexture ReserveTexture(WGPUDevice device,
-                                   const WGPUTextureDescriptor* descriptor = nullptr);
+                                   const WGPUTextureDescriptor* descriptor);
     ReservedSwapChain ReserveSwapChain(WGPUDevice device);
     ReservedDevice ReserveDevice();
     ReservedInstance ReserveInstance();

src/dawn/wire/client/Client.cpp

diff --git a/src/dawn/wire/client/Client.cpp b/src/dawn/wire/client/Client.cpp
index 9b9fc1a..57f3c57 100644
--- a/src/dawn/wire/client/Client.cpp
+++ b/src/dawn/wire/client/Client.cpp
@@ -82,20 +82,6 @@
 }
 
 ReservedTexture Client::ReserveTexture(WGPUDevice device, const WGPUTextureDescriptor* descriptor) {
-    // Make a fake descriptor so that data returned by wgpu::Texture getters isn't garbage.
-    // TODO(dawn:1451): Remove this defaulting once the descriptor is required for ReserveTexture.
-    WGPUTextureDescriptor defaultDescriptor = {};
-    if (descriptor == nullptr) {
-        defaultDescriptor.size = {1, 1, 1};
-        defaultDescriptor.mipLevelCount = 1;
-        defaultDescriptor.sampleCount = 1;
-        defaultDescriptor.dimension = WGPUTextureDimension_1D;
-        defaultDescriptor.format = WGPUTextureFormat_RGBA8Unorm;
-        defaultDescriptor.usage = 0;
-
-        descriptor = &defaultDescriptor;
-    }
-
     Texture* texture = Make<Texture>(descriptor);
 
     ReservedTexture result;