[pull] main from gpuweb:main

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.github/ISSUE_TEMPLATE/1-browser.md

@@ -0,0 +1,26 @@
+---
+name: Browser/implementation bug
+about: 'For bugs in a WebGPU implementation, please file against the relevant browser/implementation instead'
+title: ''
+labels: 'invalid'
+assignees: ''
+
+---
+
+**Please do not file browser/implementation bugs on this GitHub repository.**
+Instead, file a bug against the relevant browser.
+
+Chrome (or Dawn/Tint):
+  Known issues:
+    https://issues.chromium.org/savedsearches/6760928
+  To file a new issue:
+    https://issues.chromium.org/issues/new?noWizard=true&component=1456980
+
+WebKit:
+  https://bugs.webkit.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&component=WebGPU
+
+Firefox:
+  https://bugzilla.mozilla.org/buglist.cgi?product=Core&component=Graphics%3A%20WebGPU
+
+See also:
+  [Implementation Status](https://github.com/gpuweb/gpuweb/wiki/Implementation-Status) wiki page

.github/ISSUE_TEMPLATE/2-question.md

@@ -0,0 +1,11 @@
+---
+name: Question about WebGPU
+about: 'Question? Please open a GitHub "Discussion" instead'
+title: ''
+labels: 'invalid'
+assignees: ''
+
+---
+
+If you have a Q&A style question about using WebGPU, please use a GitHub "Discussion":
+https://github.com/gpuweb/gpuweb/discussions

.github/ISSUE_TEMPLATE/3-webgpu.md

@@ -0,0 +1,8 @@
+---
+name: WebGPU API spec issue (not WGSL)
+about: 'API standardization/specification issue'
+title: ''
+labels: 'api'
+assignees: ''
+
+---

.github/ISSUE_TEMPLATE/4-wgsl.md

@@ -0,0 +1,8 @@
+---
+name: WGSL spec issue
+about: 'WebGPU Shading Language standardization/specification issue'
+title: ''
+labels: 'wgsl'
+assignees: ''
+
+---

.github/ISSUE_TEMPLATE/5-other.md

@@ -0,0 +1,8 @@
+---
+name: Misc, reference docs, wiki, etc.
+about: 'Something other than WebGPU/WGSL spec - reference docs, wiki, GitHub infra, etc.'
+title: ''
+labels: ''
+assignees: ''
+
+---

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,2 @@
+# "webgpu.md" is the catch-all template, we don't need a "blank issue" button
+blank_issues_enabled: false

.github/workflows/build-push-custom-image.yml

@@ -51,7 +51,8 @@ jobs:
       - name: Build and push Docker image
         uses: docker/[email protected]
         with:
-          context: tools/custom-action
+          context: .
+          file: tools/custom-action/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}

.github/workflows/build-validate-publish.yml

@@ -10,13 +10,13 @@ name: build-validate-publish
 on:
   pull_request:
     paths-ignore: [ "tools/custom-action/Dockerfile" ]
-    
+
   push:
     branches: [main]
     paths-ignore:
       - "tools/custom-action/Dockerfile"
       - "tools/custom-action/entrypoint.sh"
-      
+
   # Allows admins to trigger the workflow manually from GitHub's UI.
   workflow_dispatch:
 

.github/workflows/preview-pull-request.yml

@@ -53,7 +53,7 @@ jobs:
         uses: ./tools/custom-action/
         with:
           check-repo-clean: 'OFF'
-        
+
       # Adjusts Bikeshed specs
       - name: Adjust Bikeshed
         if: ${{ github.event.workflow_run.event == 'pull_request' && env.PR }}

.github/workflows/publish-TR-webgpu.yml

@@ -34,5 +34,4 @@ jobs:
           W3C_ECHIDNA_TOKEN: ${{ secrets.ECHIDNA_TOKEN_WEBGPU }}
           W3C_WG_DECISION_URL: https://lists.w3.org/Archives/Public/public-gpu/2021Apr/0004.html
           W3C_BUILD_OVERRIDE: |
-            group: gpuwg
-            status: WD
+            status: CRD

.github/workflows/publish-TR-wgsl.yml

@@ -34,5 +34,4 @@ jobs:
           W3C_ECHIDNA_TOKEN: ${{ secrets.ECHIDNA_TOKEN_WGSL }}
           W3C_WG_DECISION_URL: https://lists.w3.org/Archives/Public/public-gpu/2021Apr/0004.html
           W3C_BUILD_OVERRIDE: |
-            group: gpuwg
-            status: WD
+            status: CRD

.gitignore

@@ -2,7 +2,29 @@ out/
 spec/index.html
 spec/index.pre.html
 spec/webgpu.idl
-wgsl/grammar/
+wgsl/grammar/**
+!wgsl/grammar/bindings
+!wgsl/grammar/bindings/c
+!wgsl/grammar/bindings/c/tree-sitter-wgsl.pc.in
+!wgsl/grammar/bindings/go
+!wgsl/grammar/bindings/go/binding.go
+!wgsl/grammar/bindings/python
+!wgsl/grammar/bindings/python/tree_sitter_wgsl
+!wgsl/grammar/bindings/python/tree_sitter_wgsl/__init__.py
+!wgsl/grammar/bindings/rust
+!wgsl/grammar/bindings/rust/build.rs
+!wgsl/grammar/src
+!wgsl/grammar/src/scanner.c
+!wgsl/grammar/.gitignore
+!wgsl/grammar/binding.gyp
+!wgsl/grammar/Cargo.toml
+!wgsl/grammar/go.mod
+!wgsl/grammar/Makefile
+!wgsl/grammar/package.json
+!wgsl/grammar/Package.swift
+!wgsl/grammar/pyproject.toml
+!wgsl/grammar/README.md
+!wgsl/grammar/setup.py
 wgsl/index.html
 wgsl/index.pre.html
 wgsl/index.bs.pre

.vscode/settings.json

@@ -9,6 +9,9 @@
     "files.associations": {
         "*.bs.include": "bikeshed",
     },
+    "files.eol": "\n",
+    "files.trimTrailingWhitespace": true,
+    "files.insertFinalNewline": true,
     "[bikeshed]": {
         "editor.detectIndentation": false,
         "editor.indentSize": 4,

correspondence/img/.gitignore

@@ -0,0 +1 @@
+

correspondence/index.bs

@@ -2,7 +2,7 @@
 Title: WebGPU Correspondence Reference
 Shortname: webgpu-correspondence
 Level: None
-Status: LD
+Status: UD
 Group: webgpu
 URL: https://gpuweb.github.io/gpuweb/correspondence/
 !Participate: <a href="https://github.com/gpuweb/gpuweb/issues/new">File an issue</a> (<a href="https://github.com/gpuweb/gpuweb/issues">open issues</a>)
@@ -151,6 +151,17 @@ User agents are not required to use these formulas and may expose whatever they
         <td>When not using argument buffers, `maxStorageBuffersPerShaderStage`
 
             Issue: When using argument buffers: ?
+    <tr>
+        <th>`maxBindGroupsPlusVertexBuffers`
+        <td>[#2749](https://github.com/gpuweb/gpuweb/issues/2749)
+        <td>No limit. Choose e.g. `max(default, maxBindGroups + maxVertexBuffers)`.
+        <td>*Strategy-dependent.* When using argument buffers, `Maximum number of _____ you can access, per stage, from an argument buffer`
+        <td>No limit. Choose e.g. `max(default, maxBindGroups + maxVertexBuffers)`.
+    <tr>
+        <th>`maxBindingsPerBindGroup`
+        <td>[#3279](https://github.com/gpuweb/gpuweb/issues/3279),
+            [#3864](https://github.com/gpuweb/gpuweb/issues/3864)
+        <td colspan=3>Limit is arbitrary to allow implementations to treat binding space as an array.
     <tr>
         <th>`maxSamplersPerShaderStage`
         <td>[#409](https://github.com/gpuweb/gpuweb/issues/409)
@@ -166,12 +177,14 @@ User agents are not required to use these formulas and may expose whatever they
     <tr>
         <th>`maxStorageTexturesPerShaderStage`
         <td>[#409](https://github.com/gpuweb/gpuweb/issues/409)
-        <td>`maxPerStageDescriptorStorageImages`
+        <td>*Strategy-dependent.* Choose a value &le; `maxPerStageDescriptorStorageImages`
+            while adhering to [[#vulkan-maxFragmentCombinedOutputResources]].
         <td rowspan=2>*Strategy-dependent.* Allocate `Maximum number of Unordered Access Views in all descriptor tables across all stages` (guaranteed to be 64) across stages across these two limits. For example, 32 for each shader stage, split as 16 textures and 16 buffers per shader stage.
     <tr>
         <th>`maxStorageBuffersPerShaderStage`
         <td>[#409](https://github.com/gpuweb/gpuweb/issues/409)
-        <td>`maxPerStageDescriptorStorageBuffers`
+        <td>*Strategy-dependent.* Choose a value &le; `maxPerStageDescriptorStorageBuffers`
+            while adhering to [[#vulkan-maxFragmentCombinedOutputResources]].
         <td rowspan=3>*Strategy-dependent.* Allocate `Maximum number of entries in the buffer argument table, per graphics or kernel function` across these three limits.
     <tr>
         <th>`maxUniformBuffersPerShaderStage`
@@ -218,25 +231,29 @@ User agents are not required to use these formulas and may expose whatever they
         <td>`maxVertexInputBindingStride`
         <td>*No documented limit?*
         <td>2048 B = `D3D12_SO_BUFFER_MAX_STRIDE_IN_BYTES`
-    <tr>
-        <th>`maxInterStageShaderComponents`
-        <td>[#1962](https://github.com/gpuweb/gpuweb/issues/1962)
-        <td>`min(maxVertexOutputComponents, maxFragmentInputComponents)`
-        <td>`Maximum number of input components to a fragment function, declared with the stage_in qualifier`, subtract 4 for non-Apple GPUs
-        <td>120 = `maxInterStageShaderVariables * 4`
     <tr>
         <th>`maxInterStageShaderVariables`
-        <td>[#1962](https://github.com/gpuweb/gpuweb/issues/1962)
+        <td>[#1962](https://github.com/gpuweb/gpuweb/issues/1962#issuecomment-1136316791)
         <td>`min(maxVertexOutputComponents // 4, maxFragmentInputComponents // 4)`
-        <td>`Maximum number of inputs (scalars or vectors) to a fragment function, declared with the stage_in qualifier`, subtract 2 for non-Apple GPUs
+        <td>Min of:
+
+            - `Maximum scalar or vector inputs to a fragment function`, subtract 2 for non-Apple GPUs
+            - `(Maximum number of input components to a fragment function) / 4`, subtract 1 for non-Apple GPUs
         <td>30 = `min(D3D12_VS_OUTPUT_REGISTER_COUNT - 1, D3D12_PS_INPUT_REGISTER_COUNT - 2)`
     <tr>
         <th>`maxColorAttachments`
         <td>[#2820](https://github.com/gpuweb/gpuweb/issues/2820)
-        <td>`min(maxColorAttachments, maxFragmentOutputAttachments, maxFragmentCombinedOutputResources)`
-        <td>`Maximum number of color render targets per render
-    pass descriptor`
+        <td>*Strategy-dependent.* Choose a value &le; `min(maxColorAttachments, maxFragmentOutputAttachments)`
+            while adhering to [[#vulkan-maxFragmentCombinedOutputResources]].
+        <td>`Maximum number of color render targets per render pass descriptor`
         <td>8 = `D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT`
+    <tr>
+        <th>`maxColorAttachmentBytesPerSample`
+        <td>[#2965](https://github.com/gpuweb/gpuweb/issues/2965)
+        <td><p class=issue>*No documented limit?*
+        <td>Mostly `Maximum total render target size, per pixel, when using multiple color render targets`,
+            but it's [a bit more complicated than that](https://github.com/gpuweb/gpuweb/issues/2965#issuecomment-1223792432)
+        <td><p class=issue>*No documented limit?*
     <tr>
         <th>`maxComputeWorkgroupStorageSize`
         <td>[#1863](https://github.com/gpuweb/gpuweb/issues/1863)
@@ -271,3 +288,16 @@ User agents are not required to use these formulas and may expose whatever they
         <td><p class=issue>*No documented limit?*
         <td>65535 = `D3D12_CS_DISPATCH_MAX_THREAD_GROUPS_PER_DIMENSION`
 </table>
+
+## Vulkan `maxFragmentCombinedOutputResources` ## {#vulkan-maxFragmentCombinedOutputResources}
+
+Choose `maxStorageBuffersPerShaderStage`, `maxStorageTexturesPerShaderStage`, and `maxColorAttachments`
+such that their sum is &le; Vulkan's `maxFragmentCombinedOutputResources`.
+
+<p class=advisement>
+Warning:
+`maxFragmentCombinedOutputResources` is incorrectly reported on many
+[Intel, AMD, NVIDIA](https://github.com/gpuweb/gpuweb/issues/4018#issuecomment-1499725189), and
+[Imagination](https://github.com/gpuweb/gpuweb/issues/3631#issuecomment-1498747606) drivers.
+On these drivers, the combined limit may need to be ignored.
+</p>