commit 3276917be8cb8a6b61d9fd5ae86d052a88b6f4e6
author Jon Ashburn <jon@lunarg.com> Tue Jan 20 15:06:59 2015 -0700
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Feb 04 17:58:09 2015 -0700
tree b6831a140c73fa7663563713c051a5147de1d0ff
parent 542cd096e3d34d219e65527328cad45a6bcb7ba9

memory alloc: Remove MEMORY_ALLOC_FLAGS  add MEMORY_TYPE

demos/cube.c

diff --git a/demos/cube.c b/demos/cube.c
index 54237e8..e482ffd 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -473,7 +473,7 @@
         .allocationSize = 0,
         .alignment = 0,
         .memProps = XGL_MEMORY_PROPERTY_GPU_ONLY,
-        .flags = 0,
+        .memType = XGL_MEMORY_TYPE_IMAGE,
         .heapCount = 0,
         .memPriority = XGL_MEMORY_PRIORITY_NORMAL,
     };
@@ -744,7 +744,7 @@
             .allocationSize = 0,
             .alignment = 0,
             .memProps = XGL_MEMORY_PROPERTY_GPU_ONLY,
-            .flags = 0,
+            .memType = XGL_MEMORY_TYPE_IMAGE,
             .heapCount = 0,
             .pHeaps = 0,
             .memPriority = XGL_MEMORY_PRIORITY_NORMAL,
@@ -864,7 +864,7 @@
         .allocationSize = 0,
         .alignment = 0,
         .memProps = XGL_MEMORY_PROPERTY_CPU_VISIBLE_BIT,
-        .flags = 0,
+        .memType = XGL_MEMORY_TYPE_BUFFER,
         .heapCount = 0,
         .memPriority = XGL_MEMORY_PRIORITY_NORMAL,
     };

demos/tri.c

diff --git a/demos/tri.c b/demos/tri.c
index 3b21eb7..32a37a1 100644
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -291,7 +291,7 @@
         .allocationSize = 0,
         .alignment = 0,
         .memProps = XGL_MEMORY_PROPERTY_GPU_ONLY,
-        .flags = 0,
+        .memType = XGL_MEMORY_TYPE_IMAGE,
         .heapCount = 0,
         .memPriority = XGL_MEMORY_PRIORITY_NORMAL,
     };
@@ -415,7 +415,7 @@
             .allocationSize = 0,
             .alignment = 0,
             .memProps = XGL_MEMORY_PROPERTY_GPU_ONLY,
-            .flags = 0,
+            .memType = XGL_MEMORY_TYPE_IMAGE,
             .heapCount = 0,
             .memPriority = XGL_MEMORY_PRIORITY_NORMAL,
         };
@@ -550,7 +550,7 @@
         .allocationSize = 0,
         .alignment = 0,
         .memProps = XGL_MEMORY_PROPERTY_CPU_VISIBLE_BIT,
-        .flags = 0,
+        .memType = XGL_MEMORY_TYPE_BUFFER,
         .heapCount = 0,
         .pHeaps = 0,
         .memPriority = XGL_MEMORY_PRIORITY_NORMAL,
@@ -590,7 +590,7 @@
         mem_alloc.alignment = mem_reqs[i].alignment;
         mem_alloc.heapCount = mem_reqs[i].heapCount;
         mem_alloc.pHeaps = mem_reqs[i].pHeaps;
-        memcpy(mem_alloc.pHeaps, mem_reqs[i].pHeaps,
+        memcpy((void *) mem_alloc.pHeaps, mem_reqs[i].pHeaps,
                 sizeof(mem_reqs[i].pHeaps[0]) * mem_reqs[i].heapCount);
 
         err = xglAllocMemory(demo->device, &mem_alloc, &demo->vertices.mem[i]);