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/init.cpp b/tests/init.cpp
index 129423a..4dd620c 100644
--- a/tests/init.cpp
+++ b/tests/init.cpp
@@ -159,15 +159,12 @@
XGL_MEMORY_ALLOC_INFO alloc_info = {};
XGL_GPU_MEMORY gpu_mem;
XGL_UINT8 *pData;
- XGL_UINT localHeap[1] = {0};
alloc_info.sType = XGL_STRUCTURE_TYPE_MEMORY_ALLOC_INFO;
alloc_info.allocationSize = 1024 * 1024; // 1MB
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;
+ alloc_info.memType = XGL_MEMORY_TYPE_OTHER;
// TODO: Try variety of memory priorities
@@ -221,14 +218,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.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);
mem_info.memPriority = XGL_MEMORY_PRIORITY_NORMAL;
mem_info.memType = XGL_MEMORY_TYPE_OTHER;
err = xglAllocMemory(device(), &mem_info, &event_mem);
@@ -355,18 +348,13 @@
XGL_MEMORY_ALLOC_INFO mem_info;
XGL_GPU_MEMORY query_mem;
- XGL_UINT heapInfo[mem_req.heapCount];
-
memset(&mem_info, 0, sizeof(mem_info));
mem_info.sType = XGL_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.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.memType = XGL_MEMORY_TYPE_OTHER;
+ mem_info.memPriority = XGL_MEMORY_PRIORITY_NORMAL;
// TODO: Should this be pinned? Or maybe a separate test with pinned.
err = xglAllocMemory(device(), &mem_info, &query_mem);
ASSERT_XGL_SUCCESS(err);
@@ -642,16 +630,12 @@
XGL_MEMORY_ALLOC_INFO mem_info = {};
XGL_GPU_MEMORY image_mem;
- XGL_UINT heapInfo[mem_req.heapCount];
mem_info.sType = XGL_STRUCTURE_TYPE_MEMORY_ALLOC_INFO;
mem_info.pNext = &img_alloc;
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.memProps = XGL_MEMORY_PROPERTY_SHAREABLE_BIT;
- mem_info.memPriority = XGL_MEMORY_PRIORITY_NORMAL;
mem_info.memType = XGL_MEMORY_TYPE_IMAGE;
+ mem_info.memPriority = XGL_MEMORY_PRIORITY_NORMAL;
err = xglAllocMemory(device(), &mem_info, &image_mem);
ASSERT_XGL_SUCCESS(err);