commit 69f40128cce0970d10aaa30ea8c6b56a7dda3f36
author Chia-I Wu <olv@lunarg.com> Mon Oct 26 21:10:41 2015 +0800
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Mon Nov 02 14:02:05 2015 -0700
tree 3449895e33791c54cd544120637a0d931cc85491
parent 763a749795bb4827efbbf19cbc87b959511496dd

bug 12921: Memory callback (WIP)

The per-object allocator is ignored for now.

https://cvs.khronos.org/bugzilla/show_bug.cgi?id=12921

tests/image_tests.cpp

diff --git a/tests/image_tests.cpp b/tests/image_tests.cpp
index 37b72e2..34afc93 100644
--- a/tests/image_tests.cpp
+++ b/tests/image_tests.cpp
@@ -97,12 +97,11 @@
         inst_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
         inst_info.pNext = NULL;
         inst_info.pAppInfo = &app_info;
-        inst_info.pAllocCb = NULL;
         inst_info.enabledLayerNameCount = 0;
         inst_info.ppEnabledLayerNames = NULL;
         inst_info.enabledExtensionNameCount = 0;
         inst_info.ppEnabledExtensionNames = NULL;
-        err = vkCreateInstance(&inst_info, &this->inst);
+        err = vkCreateInstance(&inst_info, NULL, &this->inst);
         ASSERT_VK_SUCCESS(err);
         err = vkEnumeratePhysicalDevices(this->inst, &this->gpu_count, NULL);
         ASSERT_VK_SUCCESS(err);
@@ -117,7 +116,7 @@
 
     virtual void TearDown() {
         delete this->m_device;
-        vkDestroyInstance(this->inst);
+        vkDestroyInstance(this->inst, NULL);
     }
 };
 
@@ -212,7 +211,7 @@
     //        VkDevice                                  device,
     //        const VkImageCreateInfo*                pCreateInfo,
     //        VkImage*                                  pImage);
-    err = vkCreateImage(device(), &imageCreateInfo, &m_image);
+    err = vkCreateImage(device(), &imageCreateInfo, NULL, &m_image);
     ASSERT_VK_SUCCESS(err);
 
     VkMemoryRequirements mem_req;
@@ -231,7 +230,7 @@
     ASSERT_TRUE(pass);
 
     /* allocate memory */
-    err = vkAllocMemory(device(), &mem_info, &m_image_mem);
+    err = vkAllocMemory(device(), &mem_info, NULL, &m_image_mem);
     ASSERT_VK_SUCCESS(err);
 
     /* bind memory */
@@ -242,8 +241,8 @@
 void VkImageTest::DestroyImage()
 {
     // All done with image object and memory, clean up
-    vkDestroyImage(device(), m_image);
-    vkFreeMemory(device(), m_image_mem);
+    vkDestroyImage(device(), m_image, NULL);
+    vkFreeMemory(device(), m_image_mem, NULL);
 }
 
 void VkImageTest::CreateImageView(VkImageViewCreateInfo *pCreateInfo,
@@ -251,13 +250,13 @@
 {
     VkResult err;
     pCreateInfo->image = this->m_image;
-    err = vkCreateImageView(device(), pCreateInfo, pView);
+    err = vkCreateImageView(device(), pCreateInfo, NULL, pView);
     ASSERT_VK_SUCCESS(err);
 }
 
 void VkImageTest::DestroyImageView(VkImageView imageView)
 {
-    vkDestroyImageView(device(), imageView);
+    vkDestroyImageView(device(), imageView, NULL);
 }
 
 TEST_F(VkImageTest, CreateImageViewTest) {