Half-formed new validation rule structure for createBindGroupLayout

Justin Fan · Justin Fan · commit 2cc86e5f4374 · 2019-09-18T17:25:05.000-07:00
diff --git a/spec/index.bs b/spec/index.bs
@@ -778,53 +778,6 @@ interface GPUBindGroupLayout : GPUObjectBase {
 };
 </script>
 
-A {{GPUBindGroupLayout}} object has the following internal slots:
-
-<dl dfn-type=attribute dfn-for="GPUBindGroupLayout">
-	: <dfn>\[[bindingsMap]]</dfn> of a Map of `unsigned long` {{GPUBindGroupLayoutBinding/binding}} keys to <dfn dfn for ="layout binding">layout binding</dfn> values.
-	::
-        The [=layout binding=] objects this {{GPUBindGroupLayout}} describes.
-
-</dl>
-
-An internal [=layout binding=] object has the following slots:
-
-<dl dfn-type=attribute dfn-for="layout binding">
-    : <dfn>\[[binding]]</dfn> of type unsigned long.
-    ::
-        The unique identifier for this [=layout binding=] in shader stages.
-
-    : <dfn>\[[visibility]]</dfn> of type {{GPUShaderStageFlags}}.
-    ::
-        The bitset representing from which shader stages this [=layout binding=]'s resource will be accessible.
-
-    : <dfn>\[[type]]</dfn> of type {{GPUBindingType}}.
-    ::
-        The type of shader resource this [=layout binding=] describes.
-
-    : <dfn>\[[hasDynamicOffsets]]</dfn> of type boolean.
-    ::
-        If `true`, indicates that this [=layout binding=] has dynamic offsets.
-
-        Ignored if {{layout binding/[[type]]}} is not {{GPUBindingType/uniform-buffer}}, {{GPUBindingType/storage-buffer}}, or {{GPUBindingType/readonly-storage-buffer}}.
-    
-    : <dfn>\[[textureDimension]]</dfn> of type {{GPUTextureViewDimension}}.
-    ::
-        The dimensionality of the texture resource described by this [=layout binding=].
-
-        Ignored if {{layout binding/[[type]]}} is not {{GPUBindingType/sampled-texture}} or {{GPUBindingType/storage-texture}}.
-
-    : <dfn>\[[textureComponentType]]</dfn> of type {{GPUTextureComponentType}}.
-    ::
-        The data type of the texture resource described by this [=layout binding=].
-
-        Ignored if {{layout binding/[[type]]}} is not {{GPUBindingType/sampled-texture}} or {{GPUBindingType/storage-texture}}.
-
-    : <dfn>\[[multisampled]]</dfn> of type boolean.
-    ::
-        If `true`, indicates that the texture resource described by this [=layout binding=] will be multisampled.
-</dl>
-
 ### Creation ### {#bind-group-layout-creation}
 
 A {{GPUBindGroupLayout}} is created via {{GPUDevice/createBindGroupLayout()|GPUDevice.createBindGroupLayout()}}.
@@ -845,12 +798,12 @@ dictionary GPUBindGroupLayoutBinding {
     GPUTextureViewDimension textureDimension = "2d";
     GPUTextureComponentType textureComponentType = "float";
     boolean multisampled = false;
-    boolean hasDynamicOffsets = false;
+    boolean hasDynamicOffset = false;
 };
 </script>
 
   * {{GPUBindGroupLayoutBinding/binding}}:
-    A unique identifier for a resource binding in a {{GPUBindGroupLayoutBinding}}, a corresponding {{GPUBindGroupBinding}}, and shader stages.
+    A unique identifier for a resource binding within a {{GPUBindGroupLayoutBinding}}, a corresponding {{GPUBindGroupBinding}}, and shader stages.
 
   * {{GPUBindGroupLayoutBinding/visibility}}: 
     A bitset of the members of {{GPUShaderStage}}. Each set bit indicates that a {{GPUBindGroupLayoutBinding}}'s resource will be accessible from the 
@@ -882,63 +835,85 @@ enum GPUBindingType {
 </script>
 
   * {{GPUBindGroupLayoutBinding/textureDimension}}, {{GPUBindGroupLayoutBinding/multisampled}}:
-    The dimensions and multi-sampling properties of texture bindings.
+    Describes the dimensionality of texture view bindings, and indicates if they are multisampled.
 
     Note: This allows Metal-based implementations to back the respective bind
     groups with `MTLArgumentBuffer` objects that are more efficient to bind at
     run-time.
 
-  * {{GPUBindGroupLayoutBinding/hasDynamicOffsets}}:
+  * {{GPUBindGroupLayoutBinding/hasDynamicOffset}}:
     For {{GPUBindingType/uniform-buffer}}, {{GPUBindingType/storage-buffer}}, and {{GPUBindingType/readonly-storage-buffer}} bindings, 
-    indicates that the binding has dynamic offsets. One offset must be passed to 
+    indicates that the binding has a dynamic offset. One offset must be passed to 
     setBindGroup for each dynamic binding in increasing order of
     {{GPUBindGroupLayoutBinding/binding}} number.
 
+A {{GPUBindGroupLayout}} object has the following internal slots:
+
+<dl dfn-type=attribute dfn-for="GPUBindGroupLayout">
+	: <dfn>\[[bindings]]</dfn> of type sequence<{{GPUBindGroupLayoutBinding}}>.
+	::
+        The [=layout binding=] objects this {{GPUBindGroupLayout}} describes.
+
+</dl>
+
 ### {{GPUDevice/createBindGroupLayout()|GPUDevice.createBindGroupLayout(GPUBindGroupLayoutDescriptor)}} ### {#GPUDevice-createBindGroupLayout}
 
 <div algorithm="GPUDevice.createBindGroupLayout(descriptor)">
+
 The <dfn-type="method" dfn-for="GPUDevice">createBindGroupLayout(|descriptor|)</dfn> method is used to create {{GPUBindGroupLayout}}s.
 
+1. If the device is lost, [=return an invalid GPUBindGroupLayout=].
 1. Let |layout| be a new valid {{GPUBindGroupLayout}} object.
 1. For each {{GPUBindGroupLayoutBinding}} |bindingDescriptor| in |descriptor|.{{GPUBindGroupLayoutDescriptor/bindings}}:
-    1. Let |layoutBinding| be a new internal [=layout binding=] object.
+    1. Ensure |bindingDescriptor|.{{GPUBindGroupLayoutBinding/binding}} does not violate [=binding validation=].
     1. If |bindingDescriptor|.{{GPUBindGroupLayoutBinding/type}} is {{GPUBindingType/uniform-buffer}}:
-        1. Set |layoutBinding|.{{layout binding/[[hasDynamicOffsets]]}} to the value of |bindingDescriptor|.{{GPUBindGroupLayoutBinding/hasDynamicOffsets}}.
+        1. Ensure [=uniform buffer validation=] is not violated.
+        1. If |bindingDescriptor|.{{GPUBindGroupLayoutBinding/dynamic}} is `true`, ensure [=dynamic uniform buffer validation=] is not violated.
     1. If |bindingDescriptor|.{{GPUBindGroupLayoutBinding/type}} is {{GPUBindingType/storage-buffer}} or {{GPUBindingType/readonly-storage-buffer}}:
-        1. Set |layoutBinding|.{{layout binding/[[hasDynamicOffsets]]}} to the value of |bindingDescriptor|.{{GPUBindGroupLayoutBinding/hasDynamicOffsets}}.
-    1. If |bindingDescriptor|.{{GPUBindGroupLayoutBinding/type}} is {{GPUBindingType/sampled-texture}} or {{GPUBindingType/storage-texture}}:
-        1. Set |layoutBinding|.{{layout binding/[[textureDimension]]}} to the value of |bindingDescriptor|.{{GPUBindGroupLayoutBinding/textureDimension}}.
-        1. Set |layoutBinding|.{{layout binding/[[textureComponentType]]}} to the value of |bindingDescriptor|.{{GPUBindGroupLayoutBinding/textureComponentType}}.
-        1. Set |layoutBinding|.{{layout binding/[[multisampled]]}} to the value of |bindingDescriptor|.{{GPUBindGroupLayoutBinding/multisampled}}.
-    1. Set |layoutBinding|.{{layout binding/[[binding]]}} to the value of |bindingDescriptor|.{{GPUBindGroupLayoutBinding/binding}}.
-    1. Set |layoutBinding|.{{layout binding/[[visibility]]}} to the value of |bindingDescriptor|.{{GPUBindGroupLayoutBinding/visibility}}.
-    1. Set |layoutBinding|.{{layout binding/[[type]]}} to the value of |bindingDescriptor|.{{GPUBindGroupLayoutBinding/type}}.
-    1. Insert |layoutBinding| into |layout|.{{GPUBindGroupLayout/[[bindingsMap]]}} with a key of |layoutBinding|.{{layout binding/[[binding]]}}.
+        1. Ensure [=storage buffer validation=] is not violated.
+        1. If |bindingDescriptor|.{{GPUBindGroupLayoutBinding/dynamic}} is `true`, ensure [=dynamic storage buffer validation=] is not violated.
+    1. If |bindingDescriptor|.{{GPUBindGroupLayoutBinding/type}} is {{GPUBindingType/sampled-texture}}
+        , ensure [=sampled texture validation=] is not violated.
+    1. If |bindingDescriptor|.{{GPUBindGroupLayoutBinding/type}} is {{GPUBindingType/storage-texture}}
+        , ensure [=storage texture validation=] is not violated.
+    1. If |bindingDescriptor|.{{GPUBindGroupLayoutBinding/type}} is {{GPUBindingType/sampler}}
+        , ensure [=sampler validation=] is not violated.
+    1. Insert |bindingDescriptor| into |layout|.{{GPUBindGroupLayout/[[bindings]]}}.
 1. Return |layout|.
 
-<b>Validation</b>
-* The device must not be lost.
-* Each |bindingDescriptor|.{{GPUBindGroupLayoutBinding/binding}} in |descriptor| must be unique.
-* There must be {{GPULimits/maxUniformBuffersPerShaderStage|GPULimits.maxUniformBuffersPerShaderStage}} or 
+<b>Validation Conditions</b>
+
+<dl dfn-for="createBindGroupLayout(descriptor)">
+If any of the following conditions are violated:
+    1. Generate a {{GPUValidationError}} in the current scope with appropriate error message.
+    1. Create a new invalid {{GPUBindGroupLayout}} and return the result.
+
+<dfn>binding validation</dfn>: Each |bindingDescriptor|.{{GPUBindGroupLayoutBinding/binding}} in |descriptor| must be unique.
+
+<dfn>uniform buffer validation</dfn>: There must be {{GPULimits/maxUniformBuffersPerShaderStage|GPULimits.maxUniformBuffersPerShaderStage}} or 
     fewer |bindingDescriptor|s of type {{GPUBindingType/uniform-buffer}} visible on each shader stage in |descriptor|.
-    * There must be {{GPULimits/maxDynamicUniformBuffersPerPipelineLayout|GPULimits.maxDynamicUniformBuffersPerPipelineLayout}} or
-        fewer |bindingDescriptor|s of type {{GPUBindingType/uniform-buffer}} with {{GPUBindGroupLayoutBinding/hasDynamicOffsets}} set to `true` 
-        visible across <b>all</b> shader stages in |descriptor|.
-* There must be {{GPULimits/maxStorageBuffersPerPipelineLayout|GPULimits.maxStorageBuffersPerPipelineLayout}} or 
-    fewer |bindingDescriptor|s of type {{GPUBindingType/storage-buffer}} visible across <b>all</b> shader stages in |descriptor|.
-    * There must be {{GPULimits/maxDynamicStorageBuffersPerPipelineLayout|GPULimits.maxDynamicStorageBuffersPerPipelineLayout}} or
-        fewer |bindingDescriptor|s of type {{GPUBindingType/storage-buffer}} with {{GPUBindGroupLayoutBinding/hasDynamicOffsets}} set to `true` 
-        visible across <b>all</b> shader stages in |descriptor|.
-* There must be {{GPULimits/maxSampledTexturesPerShaderStage|GPULimits.maxSampledTexturesPerShaderStage}} or 
+
+<dfn>dynamic uniform buffer validation</dfn>: There must be {{GPULimits/maxDynamicUniformBuffersPerPipelineLayout|GPULimits.maxDynamicUniformBuffersPerPipelineLayout}} or
+        fewer |bindingDescriptor|s of type {{GPUBindingType/uniform-buffer}} with {{GPUBindGroupLayoutBinding/hasDynamicOffset}} set to `true` in
+        |descriptor| that are visible to any shader stage.
+
+<dfn>storage buffer validation</dfn>: There must be {{GPULimits/maxStorageBuffersPerPipelineLayout|GPULimits.maxStorageBuffersPerPipelineLayout}} or 
+    fewer |bindingDescriptor|s of type {{GPUBindingType/storage-buffer}} in |descriptor| that are visible to any shader stage.
+
+<dfn>dynamic storage buffer validation</dfn>: There must be {{GPULimits/maxDynamicStorageBuffersPerPipelineLayout|GPULimits.maxDynamicStorageBuffersPerPipelineLayout}} or
+        fewer |bindingDescriptor|s of type {{GPUBindingType/storage-buffer}} with {{GPUBindGroupLayoutBinding/hasDynamicOffset}} set to `true` 
+        in |descriptor| that are visible to any shader stage.
+
+<dfn>sampled texture validation</dfn>: There must be {{GPULimits/maxSampledTexturesPerShaderStage|GPULimits.maxSampledTexturesPerShaderStage}} or 
     fewer |bindingDescriptor|s of type {{GPUBindingType/sampled-texture}} visible on each shader stage in |descriptor|.
-* There must be {{GPULimits/maxStorageTexturesPerShaderStage|GPULimits.maxStorageTexturesPerShaderStage}} or 
+
+<dfn>storage texture validation</dfn>: There must be {{GPULimits/maxStorageTexturesPerShaderStage|GPULimits.maxStorageTexturesPerShaderStage}} or 
     fewer |bindingDescriptor|s of type {{GPUBindingType/storage-texture}} visible on each shader stage in |descriptor|.
-* There must be {{GPULimits/maxSamplersPerShaderStage|GPULimits.maxSamplersPerShaderStage}}  or 
+
+<dfn>sampler validation</dfn>: There must be {{GPULimits/maxSamplersPerShaderStage|GPULimits.maxSamplersPerShaderStage}} or 
     fewer |bindingDescriptor|s of type {{GPUBindingType/sampler}} visible on each shader stage in |descriptor|.
 
-At any point in the algorithm, if any of the above conditions are violated, run the following steps:
-    1. Generate a {{GPUValidationError}} in the current scope with appropriate error message.
-    1. Create a new invalid {{GPUBindGroupLayout}} and return the result.
+</dl>
 </div>
 
 ## GPUBindGroup ## {#bind-groups}
