Merge branch 'main' into add-dual-source-blending

Jiawei-Shao · Jiawei-Shao · commit 66f5a8a816be · 2024-06-07T11:09:19.000+08:00
diff --git a/spec/index.bs b/spec/index.bs
@@ -105,6 +105,7 @@ spec: WGSL; urlPrefix: https://gpuweb.github.io/gpuweb/wgsl/#
         text: @binding; url: attribute-binding
         text: @group; url: attribute-group
         text: line break; url: line-break
+        text: 64-bit unsigned integer; url: 64-bit-integer
         for: address spaces
             text: workgroup; url: address-spaces-workgroup
         for: builtin
@@ -13198,7 +13199,7 @@ When beginning a render pass, {{GPURenderPassDescriptor}}.{{GPURenderPassDescrip
 must be set to be able to use occlusion queries during the pass. An occlusion query is begun
 and ended by calling {{GPURenderPassEncoder/beginOcclusionQuery()}} and
 {{GPURenderPassEncoder/endOcclusionQuery()}} in pairs that cannot be nested, and resolved into a
-{{GPUBuffer}} as 64-bit unsigned integer by {{GPUCommandEncoder}}.{{GPUCommandEncoder/resolveQuerySet()}}.
+{{GPUBuffer}} as a [=64-bit unsigned integer=] by {{GPUCommandEncoder}}.{{GPUCommandEncoder/resolveQuerySet()}}.
 
 ## Timestamp Query ## {#timestamp}
 
@@ -13207,7 +13208,7 @@ Timestamp queries allow applications to write timestamps to a {{GPUQuerySet}}, u
 - {{GPUComputePassDescriptor}}.{{GPUComputePassDescriptor/timestampWrites}}
 - {{GPURenderPassDescriptor}}.{{GPURenderPassDescriptor/timestampWrites}}
 
-and then resolve timestamp values (in nanoseconds as a 64-bit unsigned integer) into
+and then resolve timestamp values (in nanoseconds as a [=64-bit unsigned integer=]) into
 a {{GPUBuffer}}, using {{GPUCommandEncoder}}.{{GPUCommandEncoder/resolveQuerySet()}}.
 
 Timestamp values are implementation defined and may not increase monotonically. The physical device
diff --git a/wgsl/index.bs b/wgsl/index.bs
@@ -10293,6 +10293,20 @@ host-shared buffer, then:
 Note: Recall that [=i32=] uses twos-complement representation, so the sign bit
 is in bit position 31.
 
+<dfn>64-bit integer</dfn> layout: Some features of the WebGPU API write 64-bit
+unsigned integer values into buffers. When such a value |V| appears at byte
+offset |k| of a host-shared buffer, then:
+   * Byte |k| contains bits 0 through 7 of |V|
+   * Byte |k|+1 contains bits 8 through 15 of |V|
+   * Byte |k|+2 contains bits 16 through 23 of |V|
+   * Byte |k|+3 contains bits 24 through 31 of |V|
+   * Byte |k|+4 contains bits 32 through 39 of |V|
+   * Byte |k|+5 contains bits 40 through 47 of |V|
+   * Byte |k|+6 contains bits 48 through 55 of |V|
+   * Byte |k|+7 contains bits 56 through 63 of |V|
+
+Note: WGSL does not have a [=type/concrete=] [=64-bit integer=] type.
+
 A value |V| of type [=f32=] is represented in [[!IEEE-754|IEEE-754]] binary32 format.
 It has one sign bit, 8 exponent bits, and 23 fraction bits.
 When |V| is placed at byte offset |k| of host-shared buffer, then:
