commit 461b8cd45a19abd8290371cee1ceb570f5cb949f
author Shrek Shao <shrekshao@google.com> Mon Apr 14 20:17:36 2025 -0700
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Apr 14 20:17:36 2025 -0700
tree 88b356e1334af8045e30e7b2603dcaeb66b7f2e8
parent 2c1bb840c6bc209e5cbaf57b7cbdf0b66a2c60e9

[Fixit] Fix MaxDynamicBuffers suppressions to use maxStorageBuffersInVertexStage

Bug: dawn:2295
Change-Id: Icdd7ffb6b1e011b5c75561c4a3f4b832674ddbb3
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/235875
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Commit-Queue: Kai Ninomiya <kainino@chromium.org>
Auto-Submit: Shrek Shao <shrekshao@google.com>

src/dawn/tests/end2end/MaxLimitTests.cpp

diff --git a/src/dawn/tests/end2end/MaxLimitTests.cpp b/src/dawn/tests/end2end/MaxLimitTests.cpp
index f165cf8..6d85b7f 100644
--- a/src/dawn/tests/end2end/MaxLimitTests.cpp
+++ b/src/dawn/tests/end2end/MaxLimitTests.cpp
@@ -265,13 +265,14 @@
 TEST_P(MaxLimitTests, MaxDynamicBuffers) {
     // TODO(https://anglebug.com/8177) Causes assertion failure in ANGLE.
     DAWN_SUPPRESS_TEST_IF(IsANGLE() && IsWindows());
-    // TODO(crbug.com/dawn/2295): diagnose this failure on Pixel 4 OpenGLES
-    DAWN_SUPPRESS_TEST_IF(IsOpenGLES() && IsAndroid() && IsQualcomm());
-    // TODO(crbug.com/dawn/2295): diagnose this failure on Pixel 6 OpenGLES
-    DAWN_SUPPRESS_TEST_IF(IsOpenGLES() && IsAndroid() && IsARM());
 
     wgpu::Limits limits = GetSupportedLimits();
 
+    DAWN_TEST_UNSUPPORTED_IF(GetSupportedLimits().maxStorageBuffersInFragmentStage <
+                             limits.maxStorageBuffersPerShaderStage);
+    DAWN_TEST_UNSUPPORTED_IF(GetSupportedLimits().maxStorageBuffersInVertexStage <
+                             limits.maxStorageBuffersPerShaderStage);
+
     std::vector<wgpu::BindGroupLayoutEntry> bglEntries;
     std::vector<wgpu::BindGroupEntry> bgEntries;