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

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

Browse Source 
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>
This commit is contained in:
Corentin Wallez 2022-06-28 15:55:16 +00:00 committed by Dawn LUCI CQ
parent d23f296a9a
commit 3fa3e5667b
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/dawn/wire/WireClient.h
View File

@ -70,10 +70,8 @@ class DAWN_WIRE_EXPORT WireClient : public CommandHandler {
const volatile char* HandleCommands(const volatile char* commands, size_t size) override; 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, ReservedTexture ReserveTexture(WGPUDevice device,
const WGPUTextureDescriptor* descriptor = nullptr); const WGPUTextureDescriptor* descriptor);
ReservedSwapChain ReserveSwapChain(WGPUDevice device); ReservedSwapChain ReserveSwapChain(WGPUDevice device);
ReservedDevice ReserveDevice(); ReservedDevice ReserveDevice();
ReservedInstance ReserveInstance(); ReservedInstance ReserveInstance();

14
src/dawn/wire/client/Client.cpp
View File

@ -82,20 +82,6 @@ void Client::DestroyAllObjects() {
} }
ReservedTexture Client::ReserveTexture(WGPUDevice device, const WGPUTextureDescriptor* descriptor) { 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); Texture* texture = Make<Texture>(descriptor);
ReservedTexture result; ReservedTexture result;