Support GPUTextureDescriptor.size.depth for 2d-array textures

Deprecates GPUTextureDescriptor.arrayLayerCount.

Bug: 1069302
Change-Id: I2f3c327c793e6e9cba1df7f3d5e3ae07cda0b3a1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2143379
Commit-Queue: Kai Ninomiya <kainino@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#758039}

third_party/blink/renderer/modules/webgpu/gpu_texture.cc

@@ -14,7 +14,8 @@ namespace blink {
 
 namespace {
 
-WGPUTextureDescriptor AsDawnType(const GPUTextureDescriptor* webgpu_desc) {
+WGPUTextureDescriptor AsDawnType(const GPUTextureDescriptor* webgpu_desc,
+                                 GPUDevice* device) {
   DCHECK(webgpu_desc);
 
   WGPUTextureDescriptor dawn_desc = {};
@@ -23,7 +24,17 @@ WGPUTextureDescriptor AsDawnType(const GPUTextureDescriptor* webgpu_desc) {
   dawn_desc.dimension =
       AsDawnEnum<WGPUTextureDimension>(webgpu_desc->dimension());
   dawn_desc.size = AsDawnType(&webgpu_desc->size());
-  dawn_desc.arrayLayerCount = webgpu_desc->arrayLayerCount();
+
+  if (webgpu_desc->hasArrayLayerCount()) {
+    device->AddConsoleWarning("arrayLayerCount is deprecated: use size.depth");
+    dawn_desc.arrayLayerCount = webgpu_desc->arrayLayerCount();
+  } else {
+    if (dawn_desc.dimension == WGPUTextureDimension_2D) {
+      dawn_desc.arrayLayerCount = dawn_desc.size.depth;
+      dawn_desc.size.depth = 1;
+    }
+  }
+
   dawn_desc.format = AsDawnEnum<WGPUTextureFormat>(webgpu_desc->format());
   dawn_desc.mipLevelCount = webgpu_desc->mipLevelCount();
   dawn_desc.sampleCount = webgpu_desc->sampleCount();
@@ -72,7 +83,7 @@ GPUTexture* GPUTexture::Create(GPUDevice* device,
     return nullptr;
   }
 
-  WGPUTextureDescriptor dawn_desc = AsDawnType(webgpu_desc);
+  WGPUTextureDescriptor dawn_desc = AsDawnType(webgpu_desc, device);
 
   return MakeGarbageCollected<GPUTexture>(
       device,

third_party/blink/renderer/modules/webgpu/gpu_texture_descriptor.idl

@@ -6,7 +6,8 @@
 
 dictionary GPUTextureDescriptor : GPUObjectDescriptorBase {
     required GPUExtent3D size;
-    unsigned long arrayLayerCount = 1;
+    // TODO(crbug.com/1069302): arrayLayerCount is deprecated; remove it.
+    unsigned long arrayLayerCount;
     unsigned long mipLevelCount = 1;
     unsigned long sampleCount = 1;
     GPUTextureDimension dimension = "2d";