memory alloc: Remove last heaps from memory alloc and requirements
Also reorder memory_alloc_info struct as memPriority added back in as last
member in struct.
Conflicts:
demos/cube.c
demos/tri.c
icd/intel/buf.c
icd/intel/event.c
icd/intel/img.c
icd/intel/mem.c
icd/intel/pipeline.c
icd/intel/query.c
include/xgl.h
tests/image_tests.cpp
tests/init.cpp
tests/render_tests.cpp
tests/xgltestbinding.cpp
tests/xgltestbinding.h
diff --git a/tests/blit_tests.cpp b/tests/blit_tests.cpp
index 015b6e5..937db9a 100644
--- a/tests/blit_tests.cpp
+++ b/tests/blit_tests.cpp
@@ -741,13 +741,10 @@
ASSERT_NE(0, mem_req.size) << "xglGetObjectInfo (Event): Failed - expect events to require memory";
- XGL_UINT heapInfo[mem_req.heapCount];
memset(&mem_info, 0, sizeof(mem_info));
mem_info.sType = XGL_STRUCTURE_TYPE_MEMORY_ALLOC_INFO;
mem_info.allocationSize = mem_req.size;
- mem_info.heapCount = mem_req.heapCount;
- mem_info.pHeaps = heapInfo;
- memcpy(heapInfo, mem_req.pHeaps, sizeof(XGL_UINT)*mem_info.heapCount);
+ mem_info.memType = mem_req.memType;
mem_info.memPriority = XGL_MEMORY_PRIORITY_NORMAL;
mem_info.memProps = XGL_MEMORY_PROPERTY_SHAREABLE_BIT;
err = xglAllocMemory(dev_.obj(), &mem_info, &event_mem);