commit 97dcd04bbcbc1129dbaccc2ef871f6889640d6cd
author Mark Lobodzinski <mark@lunarg.com> Thu Apr 16 08:52:00 2015 -0500
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Thu Apr 16 09:29:25 2015 -0600
tree 153eb3bc5b100e5605879d5550d17b77e04a5fc5
parent 11f74376aa025d0b853c5926fc785a4a1701dc02

vulkan.h: V74.  Unify memory pools.  Bug #13633.

Simplify the memory API to use one pool for both image and buffer resources.

tests/init.cpp

diff --git a/tests/init.cpp b/tests/init.cpp
index ecd3522..5599446 100644
--- a/tests/init.cpp
+++ b/tests/init.cpp
@@ -192,7 +192,6 @@
     alloc_info.allocationSize = 1024 * 1024; // 1MB
     alloc_info.memProps = VK_MEMORY_PROPERTY_SHAREABLE_BIT |
                           VK_MEMORY_PROPERTY_CPU_VISIBLE_BIT;
-    alloc_info.memType = VK_MEMORY_TYPE_OTHER;
 
 
     // TODO: Try variety of memory priorities
@@ -251,7 +250,6 @@
     mem_info.allocationSize = mem_req.size;
     mem_info.memProps = VK_MEMORY_PROPERTY_SHAREABLE_BIT;
     mem_info.memPriority = VK_MEMORY_PRIORITY_NORMAL;
-    mem_info.memType = VK_MEMORY_TYPE_OTHER;
     err = vkAllocMemory(device(), &mem_info, &event_mem);
     ASSERT_VK_SUCCESS(err);
 
@@ -381,7 +379,6 @@
     // TODO: Is a simple multiple all that's needed here?
     mem_info.allocationSize = mem_req.size * MAX_QUERY_SLOTS;
     mem_info.memProps = VK_MEMORY_PROPERTY_SHAREABLE_BIT;
-    mem_info.memType = VK_MEMORY_TYPE_OTHER;
     mem_info.memPriority = VK_MEMORY_PRIORITY_NORMAL;
     // TODO: Should this be pinned? Or maybe a separate test with pinned.
     err = vkAllocMemory(device(), &mem_info, &query_mem);
@@ -630,27 +627,13 @@
         subresource.mipLevel++;
     }
 
-    VkMemoryAllocImageInfo img_alloc = {
-        .sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_IMAGE_INFO,
-        .pNext = NULL,
-
-    };
     VkMemoryRequirements mem_req;
-    VkImageMemoryRequirements img_reqs;
-    size_t img_reqs_size = sizeof(VkImageMemoryRequirements);
     data_size = sizeof(mem_req);
     err = vkGetObjectInfo(image, VK_INFO_TYPE_MEMORY_REQUIREMENTS,
                            &data_size, &mem_req);
     ASSERT_VK_SUCCESS(err);
     ASSERT_EQ(data_size, sizeof(mem_req));
     ASSERT_NE(0, mem_req.size) << "vkGetObjectInfo (Event): Failed - expect images to require memory";
-    err = vkGetObjectInfo(image, VK_INFO_TYPE_IMAGE_MEMORY_REQUIREMENTS,
-                           &img_reqs_size, &img_reqs);
-    ASSERT_VK_SUCCESS(err);
-    ASSERT_EQ(img_reqs_size, sizeof(VkImageMemoryRequirements));
-    img_alloc.usage = img_reqs.usage;
-    img_alloc.formatClass = img_reqs.formatClass;
-    img_alloc.samples = img_reqs.samples;
     //        VkResult VKAPI vkAllocMemory(
     //            VkDevice                                  device,
     //            const VkMemoryAllocInfo*                pAllocInfo,
@@ -659,10 +642,9 @@
     VkGpuMemory image_mem;
 
     mem_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO;
-    mem_info.pNext = &img_alloc;
+    mem_info.pNext = NULL;
     mem_info.allocationSize = mem_req.size;
     mem_info.memProps = VK_MEMORY_PROPERTY_SHAREABLE_BIT;
-    mem_info.memType = VK_MEMORY_TYPE_IMAGE;
     mem_info.memPriority = VK_MEMORY_PRIORITY_NORMAL;
     err = vkAllocMemory(device(), &mem_info, &image_mem);
     ASSERT_VK_SUCCESS(err);