commit 31eacb90f11b21cc986e046e228fb706e823adba
author Natasha Lee <natlee@microsoft.com> Tue Mar 17 15:03:18 2020 +0000
committer Commit Bot service account <commit-bot@chromium.org> Tue Mar 17 15:03:18 2020 +0000
tree 584ce0a38b740d0f4069f4a1af536011374d84a4
parent 1f0596818df46f4e7b1a324f63c4e292ce96c7ba

LoseForTesting can only be called once

Bug: chromium:1061878, dawn:68
Change-Id: Ieb35bdefc22299f828fe21e43d85fefabf500e27
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/17140
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Natasha Lee <natlee@microsoft.com>

src/dawn_native/Device.cpp

diff --git a/src/dawn_native/Device.cpp b/src/dawn_native/Device.cpp
index 6e41e56..81fdee4 100644
--- a/src/dawn_native/Device.cpp
+++ b/src/dawn_native/Device.cpp
@@ -196,6 +196,10 @@
     }
 
     void DeviceBase::LoseForTesting() {
+        if (mLossStatus == LossStatus::AlreadyLost) {
+            return;
+        }
+
         mLossStatus = LossStatus::BeingLost;
         // Assert that errors are device loss so that we can continue with destruction
         AssertAndIgnoreDeviceLossError(WaitForIdleForDestruction());

src/tests/end2end/DeviceLostTests.cpp

diff --git a/src/tests/end2end/DeviceLostTests.cpp b/src/tests/end2end/DeviceLostTests.cpp
index 10afcd2..b06377c 100644
--- a/src/tests/end2end/DeviceLostTests.cpp
+++ b/src/tests/end2end/DeviceLostTests.cpp
@@ -459,4 +459,16 @@
     EXPECT_EQ(fence.GetCompletedValue(), 2u);
 }
 
+// Test that LostForTesting can only be called on one time
+TEST_P(DeviceLostTest, LoseForTestingOnce) {
+    // First LoseForTesting call should occur normally
+    SetCallbackAndLoseForTesting();
+
+    // Second LoseForTesting call should result in no callbacks. The LoseForTesting will return
+    // without doing anything when it sees that device has already been lost.
+    device.SetDeviceLostCallback(ToMockDeviceLostCallback, this);
+    EXPECT_CALL(*mockDeviceLostCallback, Call(_, this)).Times(0);
+    device.LoseForTesting();
+}
+
 DAWN_INSTANTIATE_TEST(DeviceLostTest, D3D12Backend(), VulkanBackend());