commit 542cd096e3d34d219e65527328cad45a6bcb7ba9
author Jon Ashburn <jon@lunarg.com> Tue Jan 20 13:55:32 2015 -0700
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Feb 04 17:58:09 2015 -0700
tree 1c072869cc7e6319ead805af3ec31ecade15d582
parent 5567c814df1715b6d3aa4b02977ee5aebf4a12ed

memory alloc:  Remove memory_heap flags replace with memory_property flags

Conflicts:
	include/xgl.h
	tests/image_tests.cpp
	tests/init.cpp
	tests/xgltestbinding.h

tests/init.cpp

diff --git a/tests/init.cpp b/tests/init.cpp
index df9b233..82d5f33 100644
--- a/tests/init.cpp
+++ b/tests/init.cpp
@@ -164,13 +164,12 @@
     alloc_info.sType = XGL_STRUCTURE_TYPE_MEMORY_ALLOC_INFO;
     alloc_info.allocationSize = 1024 * 1024; // 1MB
     alloc_info.alignment = 0;
+    alloc_info.memProps = XGL_MEMORY_PROPERTY_SHAREABLE_BIT |
+                          XGL_MEMORY_PROPERTY_CPU_VISIBLE_BIT;
     alloc_info.heapCount = 1;
     alloc_info.pHeaps = localHeap;
 
 
-    // TODO: Pick heap properties indicated by heap info
-    alloc_info.flags = XGL_MEMORY_HEAP_CPU_VISIBLE_BIT;
-
     // TODO: Try variety of memory priorities
     alloc_info.memPriority = XGL_MEMORY_PRIORITY_NORMAL;
 
@@ -227,6 +226,7 @@
     mem_info.sType = XGL_STRUCTURE_TYPE_MEMORY_ALLOC_INFO;
     mem_info.allocationSize = mem_req.size;
     mem_info.alignment = mem_req.alignment;
+    mem_info.memProps = XGL_MEMORY_PROPERTY_SHAREABLE_BIT;
     mem_info.heapCount = mem_req.heapCount;
     mem_info.pHeaps = heapInfo;
     memcpy(heapInfo, mem_req.pHeaps, sizeof(XGL_UINT)*mem_info.heapCount);
@@ -366,6 +366,7 @@
     mem_info.heapCount = mem_req.heapCount;
     mem_info.pHeaps = heapInfo;
     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?
@@ -653,6 +654,7 @@
     mem_info.heapCount = mem_req.heapCount;
     mem_info.pHeaps = heapInfo;
     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;
     err = xglAllocMemory(device(), &mem_info, &image_mem);