Merge arrayLayerCount into size.depth (gpuweb#613)

kainino0x · web-flow · commit 7531dda46a6f · 2020-03-16T12:58:59.000-07:00
diff --git a/spec/index.bs b/spec/index.bs
@@ -1322,7 +1322,6 @@ GPUTexture includes GPUObjectBase;
 <script type=idl>
 dictionary GPUTextureDescriptor : GPUObjectDescriptorBase {
     required GPUExtent3D size;
-    GPUIntegerCoordinate arrayLayerCount = 1;
     GPUIntegerCoordinate mipLevelCount = 1;
     GPUSize32 sampleCount = 1;
     GPUTextureDimension dimension = "2d";
@@ -1386,7 +1385,7 @@ internal slots of a texture internal object once we have one. -->
       - If |texture|.{{GPUTextureDescriptor/dimension}} is {{GPUTextureDimension/"1d"}},
         defaults to {{GPUTextureViewDimension/"1d"}}.
       - If |texture|.{{GPUTextureDescriptor/dimension}} is {{GPUTextureDimension/"2d"}}:
-          - If |texture|.{{GPUTextureDescriptor/arrayLayerCount}} is greater than 1
+          - If |texture|.{{GPUTextureDescriptor/size}}.[=Extent3D/depth=] is greater than 1
             and {{GPUTextureViewDescriptor/arrayLayerCount}} is 0,
             defaults to {{GPUTextureViewDimension/"2d-array"}}.
           - Otherwise, defaults to {{GPUTextureViewDimension/"2d"}}.
@@ -1397,7 +1396,7 @@ internal slots of a texture internal object once we have one. -->
     If 0, defaults to |texture|.{{GPUTextureDescriptor/mipLevelCount}} &minus; {{GPUTextureViewDescriptor/baseMipLevel}}.
 
   * {{GPUTextureViewDescriptor/arrayLayerCount}}:
-    If 0, defaults to |texture|.{{GPUTextureDescriptor/arrayLayerCount}} &minus; {{GPUTextureViewDescriptor/baseArrayLayer}}.
+    If 0, defaults to |texture|.{{GPUTextureDescriptor/size}}.[=Extent3D/depth=] &minus; {{GPUTextureViewDescriptor/baseArrayLayer}}.
 
 </div>
 
@@ -2646,7 +2645,7 @@ GPUQueue includes GPUObjectBase;
 </script>
 
  - {{GPUQueue/copyImageBitmapToTexture()}}:
-   - For now, `copySize.z` must be `1`.
+   - For now, {{GPUQueue/copyImageBitmapToTexture(source, destination, copySize)/copySize}}.[=Extent3D/depth=] must be `1`.
 
 {{GPUQueue/submit(commandBuffers)}} does nothing and produces an error if any of the following is true:
 
@@ -2839,15 +2838,35 @@ dictionary GPUExtent3DDict {
 typedef (sequence<GPUIntegerCoordinate> or GPUExtent3DDict) GPUExtent3D;
 </script>
 
+An <dfn dfn>Extent3D</dfn> is a {{GPUExtent3D}}.
+[=Extent3D=] is a spec namespace for the following definitions:
+<!-- This is silly, but provides convenient syntax for the spec. -->
+
+<div algorithm="GPUExtent3D accessors" dfn-for=Extent3D>
+    For a given {{GPUExtent3D}} value |extent|, depending on its type, the syntax:
+
+      * |extent|.<dfn dfn>width</dfn> refers to
+        either {{GPUExtent3DDict}}.{{GPUExtent3DDict/width}}
+        or the first item of the sequence.
+      * |extent|.<dfn dfn>height</dfn> refers to
+        either {{GPUExtent3DDict}}.{{GPUExtent3DDict/height}}
+        or the second item of the sequence.
+      * |extent|.<dfn dfn>depth</dfn> refers to
+        either {{GPUExtent3DDict}}.{{GPUExtent3DDict/depth}}
+        or the third item of the sequence.
+</div>
+
 <script type=idl>
 typedef sequence<(GPUBuffer or ArrayBuffer)> GPUMappedBuffer;
 </script>
 
 {{GPUMappedBuffer}} is always a sequence of 2 elements, of types {{GPUBuffer}}
 and {{ArrayBuffer}}, respectively.
 
-# Temporary usages of non-exported dfns ## {#temp-dfn-usages}
+# Temporary usages of non-exported dfns # {#temp-dfn-usages}
 
 Eventually all of these should disappear but they are useful to avoid warning while building the specification.
 
 [=vertex buffer=]
+[=Extent3D/width=]
+[=Extent3D/height=]
