memory alloc: Remove alignment from alloc_info structure

Conflicts:
	icd/intel/mem.c

diff --git a/demos/cube.c b/demos/cube.c
index e482ffd..aabfecc 100644 (file)
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -471,7 +471,6 @@ static void demo_prepare_depth(struct demo *demo)
         .sType = XGL_STRUCTURE_TYPE_MEMORY_ALLOC_INFO,
         .pNext = &img_alloc,
         .allocationSize = 0,
-        .alignment = 0,
         .memProps = XGL_MEMORY_PROPERTY_GPU_ONLY,
         .memType = XGL_MEMORY_TYPE_IMAGE,
         .heapCount = 0,
@@ -520,7 +519,6 @@ static void demo_prepare_depth(struct demo *demo)
     img_alloc.samples = img_reqs.samples;
     for (XGL_UINT i = 0; i < num_allocations; i ++) {
         mem_alloc.allocationSize = mem_reqs[i].size;
-        mem_alloc.alignment = mem_reqs[i].alignment;
         mem_alloc.heapCount = mem_reqs[i].heapCount;
         XGL_UINT heapInfo[mem_reqs[i].heapCount];
         mem_alloc.pHeaps = (const XGL_UINT *) heapInfo;
@@ -742,7 +740,6 @@ static void demo_prepare_textures(struct demo *demo)
             .sType = XGL_STRUCTURE_TYPE_MEMORY_ALLOC_INFO,
             .pNext = &img_alloc,
             .allocationSize = 0,
-            .alignment = 0,
             .memProps = XGL_MEMORY_PROPERTY_GPU_ONLY,
             .memType = XGL_MEMORY_TYPE_IMAGE,
             .heapCount = 0,
@@ -800,7 +797,6 @@ static void demo_prepare_textures(struct demo *demo)
         img_alloc.samples = img_reqs.samples;
         for (XGL_UINT j = 0; j < num_allocations; j ++) {
             mem_alloc.allocationSize = mem_reqs[j].size;
-            mem_alloc.alignment = mem_reqs[j].alignment;
             mem_alloc.heapCount = mem_reqs[j].heapCount;
             XGL_UINT heapInfo[mem_reqs[j].heapCount];
             mem_alloc.pHeaps = (const XGL_UINT *)heapInfo;
@@ -862,7 +858,6 @@ void demo_prepare_cube_data_buffer(struct demo *demo)
         .sType = XGL_STRUCTURE_TYPE_MEMORY_ALLOC_INFO,
         .pNext = &buf_alloc,
         .allocationSize = 0,
-        .alignment = 0,
         .memProps = XGL_MEMORY_PROPERTY_CPU_VISIBLE_BIT,
         .memType = XGL_MEMORY_TYPE_BUFFER,
         .heapCount = 0,
@@ -921,7 +916,6 @@ void demo_prepare_cube_data_buffer(struct demo *demo)
     buf_alloc.usage = buf_reqs.usage;
     for (XGL_UINT i = 0; i < num_allocations; i ++) {
         alloc_info.allocationSize = mem_reqs[i].size;
-        alloc_info.alignment = mem_reqs[i].alignment;
         alloc_info.heapCount = mem_reqs[i].heapCount;
         XGL_UINT heapInfo[mem_reqs[i].heapCount];
         alloc_info.pHeaps = (const XGL_UINT *)heapInfo;

diff --git a/demos/tri.c b/demos/tri.c
index 32a37a1..9529735 100644 (file)
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -289,7 +289,6 @@ static void demo_prepare_depth(struct demo *demo)
         .sType = XGL_STRUCTURE_TYPE_MEMORY_ALLOC_INFO,
         .pNext = &img_alloc,
         .allocationSize = 0,
-        .alignment = 0,
         .memProps = XGL_MEMORY_PROPERTY_GPU_ONLY,
         .memType = XGL_MEMORY_TYPE_IMAGE,
         .heapCount = 0,
@@ -339,7 +338,6 @@ static void demo_prepare_depth(struct demo *demo)
     img_alloc.samples = img_reqs.samples;
     for (XGL_UINT i = 0; i < num_allocations; i ++) {
         mem_alloc.allocationSize = mem_reqs[i].size;
-        mem_alloc.alignment = mem_reqs[i].alignment;
         mem_alloc.heapCount = mem_reqs[i].heapCount;
         XGL_UINT heapInfo[mem_reqs[i].heapCount];
         mem_alloc.pHeaps = (const XGL_UINT *)heapInfo;
@@ -413,7 +411,6 @@ static void demo_prepare_textures(struct demo *demo)
             .sType = XGL_STRUCTURE_TYPE_MEMORY_ALLOC_INFO,
             .pNext = &img_alloc,
             .allocationSize = 0,
-            .alignment = 0,
             .memProps = XGL_MEMORY_PROPERTY_GPU_ONLY,
             .memType = XGL_MEMORY_TYPE_IMAGE,
             .heapCount = 0,
@@ -470,7 +467,6 @@ static void demo_prepare_textures(struct demo *demo)
         img_alloc.samples = img_reqs.samples;
         for (XGL_UINT j = 0; j < num_allocations; j ++) {
             mem_alloc.allocationSize = mem_reqs[j].size;
-            mem_alloc.alignment = mem_reqs[j].alignment;
             mem_alloc.heapCount = mem_reqs[j].heapCount;
             XGL_UINT heapInfo[mem_reqs[j].heapCount];
             mem_alloc.pHeaps = (const XGL_UINT *)heapInfo;
@@ -548,7 +544,6 @@ static void demo_prepare_vertices(struct demo *demo)
         .sType = XGL_STRUCTURE_TYPE_MEMORY_ALLOC_INFO,
         .pNext = &buf_alloc,
         .allocationSize = 0,
-        .alignment = 0,
         .memProps = XGL_MEMORY_PROPERTY_CPU_VISIBLE_BIT,
         .memType = XGL_MEMORY_TYPE_BUFFER,
         .heapCount = 0,
@@ -587,7 +582,6 @@ static void demo_prepare_vertices(struct demo *demo)
     buf_alloc.usage = buf_reqs.usage;
     for (XGL_UINT i = 0; i < num_allocations; i ++) {
         mem_alloc.allocationSize = mem_reqs[i].size;
-        mem_alloc.alignment = mem_reqs[i].alignment;
         mem_alloc.heapCount = mem_reqs[i].heapCount;
         mem_alloc.pHeaps = mem_reqs[i].pHeaps;
         memcpy((void *) mem_alloc.pHeaps, mem_reqs[i].pHeaps,

diff --git a/include/xgl.h b/include/xgl.h
index 6f4659b..f8f6a7a 100644 (file)
--- a/include/xgl.h
+++ b/include/xgl.h
@@ -1318,7 +1318,6 @@ typedef struct _XGL_MEMORY_ALLOC_INFO
     XGL_STRUCTURE_TYPE                      sType;                      // Must be XGL_STRUCTURE_TYPE_MEMORY_ALLOC_INFO
     XGL_VOID*                               pNext;                      // Pointer to next structure
     XGL_GPU_SIZE                            allocationSize;             // Size of memory allocation
-    XGL_GPU_SIZE                            alignment;
     XGL_UINT                                heapCount;
     const XGL_UINT*                         pHeaps;
     XGL_MEMORY_PRIORITY                     memPriority;