Merge "Revert "Touch watchdog during object cleanup in max_concurrent tests"" into nyc-dev
am: 64a1499846
* commit '64a14998467dae667cfc1bee8fc4023ced4ad06d':
Revert "Touch watchdog during object cleanup in max_concurrent tests"
Change-Id: Ia3109b4880cef7cf35110443a9d8df56c114837e
diff --git a/external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp
index 29221ca..e86d42a 100644
--- a/external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp
@@ -2119,16 +2119,6 @@
context.getTestContext().touchWatchdog();
}
- // Destroy objects one by one and touch watchdog periodically as
- // cleaning up resources is very costly on certain implementations.
- for (deUint32 ndx = 0; ndx < numObjects; ndx++)
- {
- objects[ndx].clear();
-
- if ((ndx > 0) && ((ndx % watchdogInterval) == 0))
- context.getTestContext().touchWatchdog();
- }
-
objects.clear();
return tcu::TestStatus::pass("Ok");