commit 431c7a4f66824f3b98a07707d62f0782a7b2d5fd
author Brandon Jones <bajones@chromium.org> Fri Jun 24 17:30:29 2022 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Jun 24 17:30:29 2022 +0000
tree 9ab627a24e88de623f68bd07bf872e5d15a50ac8
parent c5f7e8f0bc9983a9010c5353932601b40bd45ae7

Add maxInterStageShaderVariables Limits

Will statically report the base limit of 16 for now. Important to note
that this is not validated properly within Tint at this point, and the
current constant associated with this limit is actually 15.

Bug: dawn:1448
Change-Id: I74a5815cc34439ccc3b6ff9cd0afbc56590148fe
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/94661
Commit-Queue: Brandon Jones <bajones@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Austin Eng <enga@chromium.org>

dawn.json

diff --git a/dawn.json b/dawn.json
index f6cac03..095bcfc 100644
--- a/dawn.json
+++ b/dawn.json
@@ -1237,6 +1237,7 @@
             {"name": "max vertex attributes", "type": "uint32_t", "default": "WGPU_LIMIT_U32_UNDEFINED"},
             {"name": "max vertex buffer array stride", "type": "uint32_t", "default": "WGPU_LIMIT_U32_UNDEFINED"},
             {"name": "max inter stage shader components", "type": "uint32_t", "default": "WGPU_LIMIT_U32_UNDEFINED"},
+            {"name": "max inter stage shader variables", "type": "uint32_t", "default": "WGPU_LIMIT_U32_UNDEFINED"},
             {"name": "max color attachments", "type": "uint32_t", "default": "WGPU_LIMIT_U32_UNDEFINED"},
             {"name": "max compute workgroup storage size", "type": "uint32_t", "default": "WGPU_LIMIT_U32_UNDEFINED"},
             {"name": "max compute invocations per workgroup", "type": "uint32_t", "default": "WGPU_LIMIT_U32_UNDEFINED"},

src/dawn/native/Limits.cpp

diff --git a/src/dawn/native/Limits.cpp b/src/dawn/native/Limits.cpp
index f6717e7..ef285b2 100644
--- a/src/dawn/native/Limits.cpp
+++ b/src/dawn/native/Limits.cpp
@@ -51,6 +51,7 @@
     X(Maximum,                         maxVertexAttributes,    16,    16) \
     X(Maximum,                  maxVertexBufferArrayStride,  2048,  2048) \
     X(Maximum,               maxInterStageShaderComponents,    60,    60) \
+    X(Maximum,               maxInterStageShaderVariables,     16,    16) \
     X(Maximum,                         maxColorAttachments,     8,     8) \
     X(Maximum,           maxComputeInvocationsPerWorkgroup,   256,   256) \
     X(Maximum,                    maxComputeWorkgroupSizeX,   256,   256) \

src/dawn/native/d3d12/AdapterD3D12.cpp

diff --git a/src/dawn/native/d3d12/AdapterD3D12.cpp b/src/dawn/native/d3d12/AdapterD3D12.cpp
index 6d79d21..12394d6 100644
--- a/src/dawn/native/d3d12/AdapterD3D12.cpp
+++ b/src/dawn/native/d3d12/AdapterD3D12.cpp
@@ -301,11 +301,14 @@
     // D3D12 has no documented limit on the size of a storage buffer binding.
     limits->v1.maxStorageBufferBindingSize = 4294967295;
 
+    // Using base limits for:
     // TODO(crbug.com/dawn/685):
-    // LIMITS NOT SET:
     // - maxInterStageShaderComponents
     // - maxVertexBufferArrayStride
 
+    // TODO(crbug.com/dawn/1448):
+    // - maxInterStageShaderVariables
+
     return {};
 }
 

src/dawn/native/metal/BackendMTL.mm

diff --git a/src/dawn/native/metal/BackendMTL.mm b/src/dawn/native/metal/BackendMTL.mm
index e2ee07f..f9e7b53 100644
--- a/src/dawn/native/metal/BackendMTL.mm
+++ b/src/dawn/native/metal/BackendMTL.mm
@@ -619,11 +619,14 @@
         limits->v1.maxUniformBufferBindingSize = maxBufferSize;
         limits->v1.maxStorageBufferBindingSize = maxBufferSize;
 
-        // TODO(crbug.com/dawn/685):
         // Using base limits for:
+        // TODO(crbug.com/dawn/685):
         // - maxBindGroups
         // - maxVertexBufferArrayStride
 
+        // TODO(crbug.com/dawn/1448):
+        // - maxInterStageShaderVariables
+
         return {};
     }
 

src/dawn/native/vulkan/AdapterVk.cpp

diff --git a/src/dawn/native/vulkan/AdapterVk.cpp b/src/dawn/native/vulkan/AdapterVk.cpp
index 39abd6a..5e399ae 100644
--- a/src/dawn/native/vulkan/AdapterVk.cpp
+++ b/src/dawn/native/vulkan/AdapterVk.cpp
@@ -339,6 +339,10 @@
         }
     }
 
+    // Using base limits for:
+    // TODO(crbug.com/dawn/1448):
+    // - maxInterStageShaderVariables
+
     return {};
 }