commit 0ecfece609ec769acd3da4f4fde55ab1f0a12769
author Corentin Wallez <cwallez@chromium.org> Wed Jun 30 09:57:04 2021 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jun 30 09:57:04 2021 +0000
tree c6d25bb4bde564fad3de0abd67b5fb467a5edfb0
parent d3ebb17e7308a28ce1545ec71bdd1c859c0deb61

Metal: make (robustness AND tint) => vertex pulling

Tint's vertex pulling transform supports the whole GPUVertexState so
we can enable it by default when robustness is necessary.

Adds a suppression for failing tests on Metal Intel.

Bug: dawn:805
Bug: dawn:966
Change-Id: Id7b2c6df2291671164647f65fc50c61e27de90b9
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/56382
Auto-Submit: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Ben Clayton <bclayton@google.com>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>

src/dawn_native/metal/DeviceMTL.mm

diff --git a/src/dawn_native/metal/DeviceMTL.mm b/src/dawn_native/metal/DeviceMTL.mm
index ea7e09c..0c39232 100644
--- a/src/dawn_native/metal/DeviceMTL.mm
+++ b/src/dawn_native/metal/DeviceMTL.mm
@@ -127,10 +127,6 @@
     MaybeError Device::Initialize() {
         InitTogglesFromDriver();
 
-        if (!IsRobustnessEnabled()) {
-            ForceSetToggle(Toggle::MetalEnableVertexPulling, false);
-        }
-
         mCommandQueue.Acquire([*mMtlDevice newCommandQueue]);
 
         if (GetAdapter()->GetSupportedExtensions().IsEnabled(Extension::TimestampQuery)) {
@@ -189,6 +185,12 @@
             SetToggle(Toggle::DisableBaseInstance, !haveBaseVertexBaseInstance);
         }
 
+        // Vertex buffer robustness is implemented by using programmable vertex pulling. Enable
+        // that code path if it isn't explicitly disabled.
+        if (IsToggleEnabled(Toggle::UseTintGenerator) && IsRobustnessEnabled()) {
+            SetToggle(Toggle::MetalEnableVertexPulling, true);
+        }
+
         // TODO(crbug.com/dawn/846): tighten this workaround when the driver bug is fixed.
         SetToggle(Toggle::AlwaysResolveIntoZeroLevelAndLayer, true);
 

src/tests/end2end/DrawIndexedIndirectTests.cpp

diff --git a/src/tests/end2end/DrawIndexedIndirectTests.cpp b/src/tests/end2end/DrawIndexedIndirectTests.cpp
index 44b8c07..147d512 100644
--- a/src/tests/end2end/DrawIndexedIndirectTests.cpp
+++ b/src/tests/end2end/DrawIndexedIndirectTests.cpp
@@ -125,6 +125,10 @@
     DAWN_TEST_UNSUPPORTED_IF(IsOpenGL());
     DAWN_TEST_UNSUPPORTED_IF(IsOpenGLES());
 
+    // TODO(crbug.com/dawn/966): Fails on Metal Intel, likely because [[builtin(vertex_index)]]
+    // doesn't take into account BaseVertex, which breaks programmable vertex pulling.
+    DAWN_SUPPRESS_TEST_IF(IsMetal() && IsIntel());
+
     RGBA8 filled(0, 255, 0, 255);
     RGBA8 notFilled(0, 0, 0, 0);
 
@@ -150,6 +154,10 @@
     // TODO(crbug.com/dawn/789): Test is failing after a roll on SwANGLE on Windows only.
     DAWN_SUPPRESS_TEST_IF(IsANGLE() && IsWindows());
 
+    // TODO(crbug.com/dawn/966): Fails on Metal Intel, likely because [[builtin(vertex_index)]]
+    // doesn't take into account BaseVertex, which breaks programmable vertex pulling.
+    DAWN_SUPPRESS_TEST_IF(IsMetal() && IsIntel());
+
     RGBA8 filled(0, 255, 0, 255);
     RGBA8 notFilled(0, 0, 0, 0);