commit 75db74098c838587c71ee2c3278ea69bbd4bf910
author Tony Barbour <tony@LunarG.com> Thu Mar 09 14:51:36 2017 -0700
committer Tony Barbour <tony@LunarG.com> Fri Mar 10 13:24:44 2017 -0700
tree 585fd39c7aff66157c0642184b752fd5a14d46fb
parent 882ee5882c77f927e10b5ea8bb5d6b757cd8ac30

tests: Clean up resources in InvalidQueueFamilyIndex

Change-Id: I7112b233f0c228d3ee33276d2651cf17ead02192

tests/layer_validation_tests.cpp

diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index 0008c75..99f0684 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -9273,16 +9273,17 @@
     m_errorMonitor->VerifyFound();
 
     if (m_device->queue_props.size() > 2) {
+        VkBuffer ib2;
         m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT, "which was not created allowing concurrent");
 
         // Create buffer shared to queue families 1 and 2, but submitted on queue family 0
         buffCI.queueFamilyIndexCount = 2;
         qfi[0] = 1;
         qfi[1] = 2;
-        vkCreateBuffer(m_device->device(), &buffCI, NULL, &ib);
+        vkCreateBuffer(m_device->device(), &buffCI, NULL, &ib2);
         VkDeviceMemory mem;
         VkMemoryRequirements mem_reqs;
-        vkGetBufferMemoryRequirements(m_device->device(), ib, &mem_reqs);
+        vkGetBufferMemoryRequirements(m_device->device(), ib2, &mem_reqs);
 
         VkMemoryAllocateInfo alloc_info = {};
         alloc_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
@@ -9290,17 +9291,19 @@
         bool pass = false;
         pass = m_device->phy().set_memory_type(mem_reqs.memoryTypeBits, &alloc_info, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT);
         if (!pass) {
-            vkDestroyBuffer(m_device->device(), ib, NULL);
+            vkDestroyBuffer(m_device->device(), ib2, NULL);
             return;
         }
         vkAllocateMemory(m_device->device(), &alloc_info, NULL, &mem);
-        vkBindBufferMemory(m_device->device(), ib, mem, 0);
+        vkBindBufferMemory(m_device->device(), ib2, mem, 0);
 
         m_commandBuffer->begin();
-        vkCmdFillBuffer(m_commandBuffer->handle(), ib, 0, 16, 5);
+        vkCmdFillBuffer(m_commandBuffer->handle(), ib2, 0, 16, 5);
         m_commandBuffer->end();
         QueueCommandBuffer(false);
         m_errorMonitor->VerifyFound();
+        vkDestroyBuffer(m_device->device(), ib2, NULL);
+        vkFreeMemory(m_device->device(), mem, NULL);
     }
 
     vkDestroyBuffer(m_device->device(), ib, NULL);