commit b49f90b8dc01567f7397264122c4295762431baa
author Zhaoming Jiang <zhaoming.jiang@intel.com> Wed Jul 17 02:39:44 2024 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jul 17 02:39:44 2024 +0000
tree c6742a2df0e335a250ef0e18bb8386e5c5f02e64
parent c97efdfa8e6eaae7f0aaadf24f51f191a9ed1136

Dawn: always report valid subgroups limits if adapter supported

This CL make Dawn always report valid min/max subgroup size if required
and the adapter support subgroups feature, instead of requiring unsafe
APIs allowed. This change allow the OT webpages query these limits
without starting Chrome with toggle enable-unsafe-webgpu.

Bug: 349125474
Change-Id: Ie3ac0af2ad28dce735e64266b888501652fe7c63
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/198634
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Zhaoming Jiang <zhaoming.jiang@intel.com>

src/dawn/native/Adapter.cpp

diff --git a/src/dawn/native/Adapter.cpp b/src/dawn/native/Adapter.cpp
index 7492f07..bb0232c 100644
--- a/src/dawn/native/Adapter.cpp
+++ b/src/dawn/native/Adapter.cpp
@@ -108,12 +108,13 @@
 
     // TODO(349125474): Deprecate DawnExperimentalSubgroupLimits.
     if (auto* subgroupLimits = unpacked.Get<DawnExperimentalSubgroupLimits>()) {
-        if (!mTogglesState.IsEnabled(Toggle::AllowUnsafeAPIs)) {
-            // If AllowUnsafeAPIs is not enabled, return the default-initialized
+        if (!mSupportedFeatures.IsEnabled(wgpu::FeatureName::Subgroups)) {
+            // If subgroups features are not supported, return the default-initialized
             // DawnExperimentalSubgroupLimits object, where minSubgroupSize and
             // maxSubgroupSize are WGPU_LIMIT_U32_UNDEFINED.
             *subgroupLimits = DawnExperimentalSubgroupLimits{};
         } else {
+            // If adapter supports subgroups features, always return the valid subgroup limits.
             *subgroupLimits = mPhysicalDevice->GetLimits().experimentalSubgroupLimits;
         }
     }