commit 0e168bb0a436ad905ee2e34c0cf39cfc903095bf
author Courtney Goeltzenleuchter <courtney@LunarG.com> Mon Jun 22 16:26:54 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Jun 24 15:38:03 2015 -0600
tree b413f55d6a07773c1b1eb8fe056b32c7bceac8ad
parent 07199211d2f0bcc073f06fe0f0dc2a308309c001

tests: Must now destroy object then free mem

tests/init.cpp

diff --git a/tests/init.cpp b/tests/init.cpp
index cb0c445..8fb380c 100644
--- a/tests/init.cpp
+++ b/tests/init.cpp
@@ -223,13 +223,13 @@
     // TODO: Test actual synchronization with command buffer event.
 
     // All done with event memory, clean up
+    err = vkDestroyObject(device(), VK_OBJECT_TYPE_EVENT, event);
+    ASSERT_VK_SUCCESS(err);
+
     if (mem_req.size) {
         err = vkFreeMemory(device(), event_mem);
         ASSERT_VK_SUCCESS(err);
     }
-
-    err = vkDestroyObject(device(), VK_OBJECT_TYPE_EVENT, event);
-    ASSERT_VK_SUCCESS(err);
 }
 
 #define MAX_QUERY_SLOTS 10
@@ -321,14 +321,14 @@
 
     }
 
+    err = vkDestroyObject(device(), VK_OBJECT_TYPE_QUERY_POOL, query_pool);
+    ASSERT_VK_SUCCESS(err);
+
     if (mem_req.size) {
         // All done with QueryPool memory, clean up
         err = vkFreeMemory(device(), query_mem);
         ASSERT_VK_SUCCESS(err);
     }
-
-    err = vkDestroyObject(device(), VK_OBJECT_TYPE_QUERY_POOL, query_pool);
-    ASSERT_VK_SUCCESS(err);
 }
 
 void getQueue(vk_testing::Device *device, uint32_t queue_node_index, const char *qname)
@@ -546,12 +546,12 @@
     // TODO: Test image memory.
 
     // All done with image memory, clean up
+    ASSERT_VK_SUCCESS(vkDestroyObject(device(), VK_OBJECT_TYPE_IMAGE_VIEW, view));
+    ASSERT_VK_SUCCESS(vkDestroyObject(device(), VK_OBJECT_TYPE_IMAGE, image));
+
     if (mem_req.size) {
         ASSERT_VK_SUCCESS(vkFreeMemory(device(), image_mem));
     }
-
-    ASSERT_VK_SUCCESS(vkDestroyObject(device(), VK_OBJECT_TYPE_IMAGE_VIEW, view));
-    ASSERT_VK_SUCCESS(vkDestroyObject(device(), VK_OBJECT_TYPE_IMAGE, image));
 }
 
 TEST_F(VkTest, CreateImage) {