commit 723462910ef2f9ed0255b74399c835020a75a0b1
author Mark Lobodzinski <mark@lunarg.com> Thu Jul 02 16:49:40 2015 -0600
committer Mark Lobodzinski <mark@lunarg.com> Thu Jul 02 16:49:40 2015 -0600
tree 82dd37488bce5aeaf750bd8ad284cc95eb34e957
parent 25756afafa15c0f9ed27b0dc438f466317fcdf33

vulkan.h: V115 -- Reintroduce memory heaps & types.  Bug #14082.

Reworked memory properties and types and added support for multiple
heaps.

tests/init.cpp

diff --git a/tests/init.cpp b/tests/init.cpp
index a501938..8255ee3 100644
--- a/tests/init.cpp
+++ b/tests/init.cpp
@@ -146,8 +146,7 @@
 
     alloc_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO;
     alloc_info.allocationSize = 1024 * 1024; // 1MB
-    alloc_info.memProps = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;
-
+    alloc_info.memoryTypeIndex = 0;
 
     err = vkAllocMemory(device(), &alloc_info, &gpu_mem);
     ASSERT_VK_SUCCESS(err);
@@ -156,7 +155,7 @@
     ASSERT_VK_SUCCESS(err);
 
     memset(pData, 0x55, alloc_info.allocationSize);
-    EXPECT_EQ(0x55, pData[0]) << "Memory read not same a write";
+    EXPECT_EQ(0x55, pData[0]) << "Memory read not same as write";
 
     err = vkUnmapMemory(device(), gpu_mem);
     ASSERT_VK_SUCCESS(err);
@@ -198,7 +197,11 @@
         memset(&mem_info, 0, sizeof(mem_info));
         mem_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO;
         mem_info.allocationSize = mem_req.size;
-        mem_info.memProps = 0;
+        mem_info.memoryTypeIndex = 0;
+
+        err = m_device->gpu().set_memory_type(mem_req.memoryTypeBits, &mem_info, 0);
+        ASSERT_VK_SUCCESS(err);
+
         err = vkAllocMemory(device(), &mem_info, &event_mem);
         ASSERT_VK_SUCCESS(err);
 
@@ -287,7 +290,11 @@
         mem_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO;
         // TODO: Is a simple multiple all that's needed here?
         mem_info.allocationSize = mem_req.size * MAX_QUERY_SLOTS;
-        mem_info.memProps = 0;
+        mem_info.memoryTypeIndex = 0;
+
+        err = m_device->gpu().set_memory_type(mem_req.memoryTypeBits, &mem_info, 0);
+        ASSERT_VK_SUCCESS(err);
+
         err = vkAllocMemory(device(), &mem_info, &query_mem);
         ASSERT_VK_SUCCESS(err);
 
@@ -478,7 +485,11 @@
         mem_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO;
         mem_info.pNext = NULL;
         mem_info.allocationSize = mem_req.size;
-        mem_info.memProps = 0;
+        mem_info.memoryTypeIndex = 0;
+
+        err = m_device->gpu().set_memory_type(mem_req.memoryTypeBits, &mem_info, 0);
+        ASSERT_VK_SUCCESS(err);
+
         err = vkAllocMemory(device(), &mem_info, &image_mem);
         ASSERT_VK_SUCCESS(err);