Rename GPUVertexFormat members to match GPUTextureFormat (#1322)

kainino0x · web-flow · commit 551b7b59edca · 2021-02-16T11:24:13.000-05:00
* Rename GPUVertexFormat members to match GPUTextureFormat See recent discussion on #206 * try out some new names, not sold on them * less is more * Remove stale line * I deleted the wrong thing... * update bikeshed to try to fix build? * upgrade better * try --skip-manifest * add a dry run with line numbers for errors * temporarily enable (buggy) --line-numbers * undo * fix merge
diff --git a/spec/index.bs b/spec/index.bs
@@ -3981,7 +3981,7 @@ configuring each of the [=render stages=].
                         from |vertexBuffer| starting at offset |attributeOffset|.
                     1. Convert the |data| into a shader-visible format.
                         <div class="example">
-                            An attribute of type {{GPUVertexFormat/"uchar2norm"}} will be converted from
+                            An attribute of type {{GPUVertexFormat/"unorm8x2"}} will be converted from
                             2 bytes of fixed-point unsigned 8-bit integers into 2 floating-point values
                             as `vec2<f32>` in WGSL.
                         </div>
@@ -4519,54 +4519,47 @@ format passed to {{GPURenderEncoderBase/setIndexBuffer()}} when rendering.
 
 #### Vertex Formats #### {#vertex-formats}
 
-The name of the format specifies the data type of the component, the number of
-values, and whether the data is normalized.
-
-  * `uchar` = unsigned 8-bit value
-  * `char` = signed 8-bit value
-  * `ushort` = unsigned 16-bit value
-  * `short` = signed 16-bit value
-  * `half` = half-precision 16-bit floating point value
-  * `float` = 32-bit floating point value
-  * `uint` = unsigned 32-bit integer value
-  * `int` = signed 32-bit integer value
+The name of the format specifies the order of components, bits per component,
+and data type for the component.
 
-If no number of values is given in the name, a single value is provided.
-If the format has the `-bgra` suffix, it means the values are arranged as
-blue, green, red and alpha values.
+  * `unorm` = unsigned normalized
+  * `snorm` = signed normalized
+  * `uint` = unsigned int
+  * `sint` = signed int
+  * `float` = floating point
 
 <script type=idl>
 enum GPUVertexFormat {
-    "uchar2",
-    "uchar4",
-    "char2",
-    "char4",
-    "uchar2norm",
-    "uchar4norm",
-    "char2norm",
-    "char4norm",
-    "ushort2",
-    "ushort4",
-    "short2",
-    "short4",
-    "ushort2norm",
-    "ushort4norm",
-    "short2norm",
-    "short4norm",
-    "half2",
-    "half4",
-    "float",
-    "float2",
-    "float3",
-    "float4",
-    "uint",
-    "uint2",
-    "uint3",
-    "uint4",
-    "int",
-    "int2",
-    "int3",
-    "int4"
+    "uint8x2",
+    "uint8x4",
+    "sint8x2",
+    "sint8x4",
+    "unorm8x2",
+    "unorm8x4",
+    "snorm8x2",
+    "snorm8x4",
+    "uint16x2",
+    "uint16x4",
+    "sint16x2",
+    "sint16x4",
+    "unorm16x2",
+    "unorm16x4",
+    "snorm16x2",
+    "snorm16x4",
+    "float16x2",
+    "float16x4",
+    "float32x1",
+    "float32x2",
+    "float32x3",
+    "float32x4",
+    "uint32x1",
+    "uint32x2",
+    "uint32x3",
+    "uint32x4",
+    "sint32x1",
+    "sint32x2",
+    "sint32x3",
+    "sint32x4",
 };
 </script>
 
