commit e5753d2fb87e4e12c2a03111ce2b736b43094e52
author Corentin Wallez <cwallez@chromium.org> Fri Mar 20 09:14:30 2020 +0000
committer Commit Bot service account <commit-bot@chromium.org> Fri Mar 20 09:14:30 2020 +0000
tree 5feb1b63fbe1279436d0cb8bf827889f1db7d848
parent 69c5dd70e79640285e31763bdc37cf8ef7b03890

Enable (and fix) the DeviceLost tests on Metal

They were failing because services of the Metal backend like the
MapRequestTracker thought that work was still pending since the device
only waited for previous commands to complete, and not also pending
commands.

Bug: dawn:68
Change-Id: I917ecefe90707b0c89f7e9b4b7379a98ed3956d7
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/17320
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Kai Ninomiya <kainino@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 f91fd95..c3d2faf 100644
--- a/src/dawn_native/metal/DeviceMTL.mm
+++ b/src/dawn_native/metal/DeviceMTL.mm
@@ -298,7 +298,12 @@
         while (GetCompletedCommandSerial() != mLastSubmittedSerial) {
             usleep(100);
         }
-        Tick();
+
+        // Artificially increase the serials so work that was pending knows it can complete.
+        mCompletedSerial++;
+        mLastSubmittedSerial++;
+
+        DAWN_TRY(TickImpl());
         return {};
     }
 

src/tests/end2end/DeviceLostTests.cpp

diff --git a/src/tests/end2end/DeviceLostTests.cpp b/src/tests/end2end/DeviceLostTests.cpp
index b06377c..410a5c6 100644
--- a/src/tests/end2end/DeviceLostTests.cpp
+++ b/src/tests/end2end/DeviceLostTests.cpp
@@ -471,4 +471,4 @@
     device.LoseForTesting();
 }
 
-DAWN_INSTANTIATE_TEST(DeviceLostTest, D3D12Backend(), VulkanBackend());
+DAWN_INSTANTIATE_TEST(DeviceLostTest, D3D12Backend(), MetalBackend(), VulkanBackend());