commit 3276917be8cb8a6b61d9fd5ae86d052a88b6f4e6
author Jon Ashburn <jon@lunarg.com> Tue Jan 20 15:06:59 2015 -0700
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Feb 04 17:58:09 2015 -0700
tree b6831a140c73fa7663563713c051a5147de1d0ff
parent 542cd096e3d34d219e65527328cad45a6bcb7ba9

memory alloc: Remove MEMORY_ALLOC_FLAGS  add MEMORY_TYPE

tests/init.cpp

diff --git a/tests/init.cpp b/tests/init.cpp
index 82d5f33..60cca3e 100644
--- a/tests/init.cpp
+++ b/tests/init.cpp
@@ -166,6 +166,7 @@
     alloc_info.alignment = 0;
     alloc_info.memProps = XGL_MEMORY_PROPERTY_SHAREABLE_BIT |
                           XGL_MEMORY_PROPERTY_CPU_VISIBLE_BIT;
+    alloc_info.memType = XGL_MEMORY_TYPE_OTHER,
     alloc_info.heapCount = 1;
     alloc_info.pHeaps = localHeap;
 
@@ -231,7 +232,7 @@
     mem_info.pHeaps = heapInfo;
     memcpy(heapInfo, mem_req.pHeaps, sizeof(XGL_UINT)*mem_info.heapCount);
     mem_info.memPriority = XGL_MEMORY_PRIORITY_NORMAL;
-    mem_info.flags = XGL_MEMORY_ALLOC_SHAREABLE_BIT;
+    mem_info.memType = XGL_MEMORY_TYPE_OTHER;
     err = xglAllocMemory(device(), &mem_info, &event_mem);
     ASSERT_XGL_SUCCESS(err);
 
@@ -368,10 +369,8 @@
     memcpy(heapInfo, mem_req.pHeaps, sizeof(XGL_UINT)*mem_info.heapCount);
     mem_info.memProps = XGL_MEMORY_PROPERTY_SHAREABLE_BIT;
     mem_info.memPriority = XGL_MEMORY_PRIORITY_NORMAL;
-
-    // TODO: are the flags right?
+    mem_info.memType = XGL_MEMORY_TYPE_OTHER;
     // TODO: Should this be pinned? Or maybe a separate test with pinned.
-    mem_info.flags = XGL_MEMORY_ALLOC_SHAREABLE_BIT;
     err = xglAllocMemory(device(), &mem_info, &query_mem);
     ASSERT_XGL_SUCCESS(err);
 
@@ -656,7 +655,7 @@
     memcpy(heapInfo, mem_req.pHeaps, sizeof(XGL_UINT)*mem_info.heapCount);
     mem_info.memProps = XGL_MEMORY_PROPERTY_SHAREABLE_BIT;
     mem_info.memPriority = XGL_MEMORY_PRIORITY_NORMAL;
-    mem_info.flags = XGL_MEMORY_ALLOC_SHAREABLE_BIT;
+    mem_info.memType = XGL_MEMORY_TYPE_IMAGE;
     err = xglAllocMemory(device(), &mem_info, &image_mem);
     ASSERT_XGL_SUCCESS(err);