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/image_tests.cpp

diff --git a/tests/image_tests.cpp b/tests/image_tests.cpp
index 3ad0965..b0e5620 100644
--- a/tests/image_tests.cpp
+++ b/tests/image_tests.cpp
@@ -232,6 +232,7 @@
         XGL_UINT heapInfo[mem_req[i].heapCount];
         mem_info.pHeaps = heapInfo;
         memcpy(heapInfo, mem_req[i].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;