aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2016-05-16 23:02:27 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-05-16 23:02:27 +0000
commit64a14998467dae667cfc1bee8fc4023ced4ad06d (patch)
treee927b18d02ee263c584a2cd514c48196296e0846
parentf093f4b9e448947e887868ffc0d23b45c31ee9b0 (diff)
parent05bee84ebd97de9bac8af6d54f11c4157c7b5844 (diff)
downloaddeqp-64a14998467dae667cfc1bee8fc4023ced4ad06d.tar.gz
Merge "Revert "Touch watchdog during object cleanup in max_concurrent tests"" into nyc-dev
-rw-r--r--external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp10
1 files changed, 0 insertions, 10 deletions
diff --git a/external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp
index 29221cac4..e86d42aaa 100644
--- a/external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp
@@ -2119,16 +2119,6 @@ tcu::TestStatus createMaxConcurrentTest (Context& context, typename Object::Para
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");