demos: Updated tri to use staging buffer for texture

diff --git a/demos/tri.c b/demos/tri.c
index 57ef9fe..edaadfc 100644 (file)
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -394,7 +394,126 @@ static void demo_prepare_textures(struct demo *demo)
     XGL_RESULT err;
     uint32_t i;
 
+    XGL_CMD_BUFFER staging_cmd_buf;
+    XGL_CMD_BUFFER_CREATE_INFO  cmd_buf_create_info = {
+        .sType = XGL_STRUCTURE_TYPE_CMD_BUFFER_CREATE_INFO,
+        .pNext = NULL,
+        .queueType = XGL_QUEUE_TYPE_GRAPHICS,
+        .flags = 0
+    };
+
+    err = xglCreateCommandBuffer(demo->device, &cmd_buf_create_info, &staging_cmd_buf);
+    assert(!err);
+
     for (i = 0; i < DEMO_TEXTURE_COUNT; i++) {
+        const XGL_IMAGE_CREATE_INFO staging_image_create_info = {
+            .sType = XGL_STRUCTURE_TYPE_IMAGE_CREATE_INFO,
+            .pNext = NULL,
+            .imageType = XGL_IMAGE_2D,
+            .format = tex_format,
+            .extent = { tex_width, tex_height, 1 },
+            .mipLevels = 1,
+            .arraySize = 1,
+            .samples = 1,
+            .tiling = XGL_LINEAR_TILING,
+            .usage = XGL_IMAGE_USAGE_TRANSFER_SOURCE_BIT,
+            .flags = 0,
+        };
+        XGL_MEMORY_ALLOC_IMAGE_INFO img_alloc = {
+            .sType = XGL_STRUCTURE_TYPE_MEMORY_ALLOC_IMAGE_INFO,
+            .pNext = NULL,
+        };
+        XGL_MEMORY_ALLOC_INFO mem_alloc = {
+            .sType = XGL_STRUCTURE_TYPE_MEMORY_ALLOC_INFO,
+            .pNext = &img_alloc,
+            .allocationSize = 0,
+            .memProps = XGL_MEMORY_PROPERTY_GPU_ONLY,
+            .memType = XGL_MEMORY_TYPE_IMAGE,
+            .memPriority = XGL_MEMORY_PRIORITY_NORMAL,
+        };
+
+        XGL_MEMORY_REQUIREMENTS *mem_reqs;
+        size_t mem_reqs_size = sizeof(XGL_MEMORY_REQUIREMENTS);
+        XGL_IMAGE_MEMORY_REQUIREMENTS img_reqs;
+        size_t img_reqs_size = sizeof(XGL_IMAGE_MEMORY_REQUIREMENTS);
+        XGL_IMAGE staging_image;
+        XGL_GPU_MEMORY *staging_mem;
+        uint32_t staging_num_allocations = 0;
+        XGL_MEMORY_REF  memRefs[16];
+        uint32_t numRefs = 0;
+        uint32_t num_allocations = 0;
+        size_t num_alloc_size = sizeof(num_allocations);
+
+        err = xglCreateImage(demo->device, &staging_image_create_info,
+                &staging_image);
+        assert(!err);
+
+        err = xglGetObjectInfo(staging_image,
+                    XGL_INFO_TYPE_MEMORY_ALLOCATION_COUNT,
+                    &num_alloc_size, &staging_num_allocations);
+        assert(!err && num_alloc_size == sizeof(num_allocations));
+        mem_reqs = malloc(staging_num_allocations * sizeof(XGL_MEMORY_REQUIREMENTS));
+        staging_mem = malloc(staging_num_allocations * sizeof(XGL_GPU_MEMORY));
+        err = xglGetObjectInfo(staging_image,
+                    XGL_INFO_TYPE_MEMORY_REQUIREMENTS,
+                    &mem_reqs_size, mem_reqs);
+        assert(!err && mem_reqs_size == staging_num_allocations * sizeof(XGL_MEMORY_REQUIREMENTS));
+        err = xglGetObjectInfo(staging_image,
+                        XGL_INFO_TYPE_IMAGE_MEMORY_REQUIREMENTS,
+                        &img_reqs_size, &img_reqs);
+        assert(!err && img_reqs_size == sizeof(XGL_IMAGE_MEMORY_REQUIREMENTS));
+        img_alloc.usage = img_reqs.usage;
+        img_alloc.formatClass = img_reqs.formatClass;
+        img_alloc.samples = img_reqs.samples;
+        mem_alloc.memProps = XGL_MEMORY_PROPERTY_CPU_VISIBLE_BIT;
+        for (uint32_t j = 0; j < staging_num_allocations; j ++) {
+            mem_alloc.allocationSize = mem_reqs[j].size;
+
+            /* allocate memory */
+            err = xglAllocMemory(demo->device, &mem_alloc,
+                        &(staging_mem[j]));
+            assert(!err);
+
+            memRefs[numRefs].mem = staging_mem[j];
+            memRefs[numRefs].flags = XGL_MEMORY_REF_READ_ONLY_BIT;
+            numRefs++;
+            assert(numRefs < 16);
+
+            /* bind memory */
+            err = xglBindObjectMemory(staging_image, j, staging_mem[j], 0);
+            assert(!err);
+        }
+        free(mem_reqs);
+        mem_reqs = NULL;
+
+        const XGL_IMAGE_SUBRESOURCE subres = {
+            .aspect = XGL_IMAGE_ASPECT_COLOR,
+            .mipLevel = 0,
+            .arraySlice = 0,
+        };
+        XGL_SUBRESOURCE_LAYOUT layout;
+        size_t layout_size = sizeof(XGL_SUBRESOURCE_LAYOUT);
+        void *data;
+        int32_t x, y;
+
+        err = xglGetImageSubresourceInfo(staging_image, &subres,
+                XGL_INFO_TYPE_SUBRESOURCE_LAYOUT, &layout_size, &layout);
+        assert(!err && layout_size == sizeof(layout));
+        /* Linear texture must be within a single memory object */
+        assert(staging_num_allocations == 1);
+
+        err = xglMapMemory(staging_mem[0], 0, &data);
+        assert(!err);
+
+        for (y = 0; y < tex_height; y++) {
+            uint32_t *row = (uint32_t *) ((char *) data + layout.rowPitch * y);
+            for (x = 0; x < tex_width; x++)
+                row[x] = tex_colors[i][(x & 1) ^ (y & 1)];
+        }
+
+        err = xglUnmapMemory(staging_mem[0]);
+        assert(!err);
+
         const XGL_SAMPLER_CREATE_INFO sampler = {
             .sType = XGL_STRUCTURE_TYPE_SAMPLER_CREATE_INFO,
             .pNext = NULL,
@@ -411,7 +530,7 @@ static void demo_prepare_textures(struct demo *demo)
             .maxLod = 0.0f,
             .borderColorType = XGL_BORDER_COLOR_OPAQUE_WHITE,
         };
-        const XGL_IMAGE_CREATE_INFO image = {
+        const XGL_IMAGE_CREATE_INFO texture_image_create_info = {
             .sType = XGL_STRUCTURE_TYPE_IMAGE_CREATE_INFO,
             .pNext = NULL,
             .imageType = XGL_IMAGE_2D,
@@ -420,28 +539,16 @@ static void demo_prepare_textures(struct demo *demo)
             .mipLevels = 1,
             .arraySize = 1,
             .samples = 1,
-            .tiling = XGL_LINEAR_TILING,
+            .tiling = XGL_OPTIMAL_TILING,
             .usage = XGL_IMAGE_USAGE_SHADER_ACCESS_READ_BIT,
             .flags = 0,
         };
-        XGL_MEMORY_ALLOC_IMAGE_INFO img_alloc = {
-            .sType = XGL_STRUCTURE_TYPE_MEMORY_ALLOC_IMAGE_INFO,
-            .pNext = NULL,
-        };
-        XGL_MEMORY_ALLOC_INFO mem_alloc = {
-            .sType = XGL_STRUCTURE_TYPE_MEMORY_ALLOC_INFO,
-            .pNext = &img_alloc,
-            .allocationSize = 0,
-            .memProps = XGL_MEMORY_PROPERTY_GPU_ONLY,
-            .memType = XGL_MEMORY_TYPE_IMAGE,
-            .memPriority = XGL_MEMORY_PRIORITY_NORMAL,
-        };
         XGL_IMAGE_VIEW_CREATE_INFO view = {
             .sType = XGL_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
             .pNext = NULL,
             .image = XGL_NULL_HANDLE,
             .viewType = XGL_IMAGE_VIEW_2D,
-            .format = image.format,
+            .format = texture_image_create_info.format,
             .channels = { XGL_CHANNEL_SWIZZLE_R,
                           XGL_CHANNEL_SWIZZLE_G,
                           XGL_CHANNEL_SWIZZLE_B,
@@ -450,20 +557,13 @@ static void demo_prepare_textures(struct demo *demo)
             .minLod = 0.0f,
         };
 
-        XGL_MEMORY_REQUIREMENTS *mem_reqs;
-        size_t mem_reqs_size = sizeof(XGL_MEMORY_REQUIREMENTS);
-        XGL_IMAGE_MEMORY_REQUIREMENTS img_reqs;
-        size_t img_reqs_size = sizeof(XGL_IMAGE_MEMORY_REQUIREMENTS);
-        uint32_t num_allocations = 0;
-        size_t num_alloc_size = sizeof(num_allocations);
-
         /* create sampler */
         err = xglCreateSampler(demo->device, &sampler,
                 &demo->textures[i].sampler);
         assert(!err);
 
         /* create image */
-        err = xglCreateImage(demo->device, &image,
+        err = xglCreateImage(demo->device, &texture_image_create_info,
                 &demo->textures[i].image);
         assert(!err);
 
@@ -485,6 +585,7 @@ static void demo_prepare_textures(struct demo *demo)
         img_alloc.usage = img_reqs.usage;
         img_alloc.formatClass = img_reqs.formatClass;
         img_alloc.samples = img_reqs.samples;
+        mem_alloc.memProps = XGL_MEMORY_PROPERTY_GPU_ONLY;
         for (uint32_t j = 0; j < num_allocations; j ++) {
             mem_alloc.allocationSize = mem_reqs[j].size;
 
@@ -493,47 +594,95 @@ static void demo_prepare_textures(struct demo *demo)
                         &(demo->textures[i].mem[j]));
             assert(!err);
 
+            memRefs[numRefs].mem = demo->textures[i].mem[j];
+            memRefs[numRefs].flags = 0;
+            numRefs++;
+            assert(numRefs < 16);
+
             /* bind memory */
             err = xglBindObjectMemory(demo->textures[i].image, j,
                     demo->textures[i].mem[j], 0);
             assert(!err);
         }
+        free(mem_reqs);
+        mem_reqs = NULL;
 
         /* create image view */
         view.image = demo->textures[i].image;
         err = xglCreateImageView(demo->device, &view,
-                &demo->textures[i].view);
+                                 &demo->textures[i].view);
         assert(!err);
-    }
 
-    for (i = 0; i < DEMO_TEXTURE_COUNT; i++) {
-        const XGL_IMAGE_SUBRESOURCE subres = {
-            .aspect = XGL_IMAGE_ASPECT_COLOR,
-            .mipLevel = 0,
-            .arraySlice = 0,
+        /* Copy staging texture to usable texture */
+        XGL_CMD_BUFFER_BEGIN_INFO cmd_buf_begin_info = {
+            .sType = XGL_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO,
+            .pNext = NULL,
+            .flags = 0
         };
-        XGL_SUBRESOURCE_LAYOUT layout;
-        size_t layout_size = sizeof(XGL_SUBRESOURCE_LAYOUT);
-        void *data;
-        int32_t x, y;
 
-        err = xglGetImageSubresourceInfo(demo->textures[i].image, &subres,
-                XGL_INFO_TYPE_SUBRESOURCE_LAYOUT, &layout_size, &layout);
-        assert(!err && layout_size == sizeof(layout));
-        assert(demo->textures[i].num_mem == 1);
+        err = xglResetCommandBuffer(staging_cmd_buf);
+        assert(!err);
 
-        err = xglMapMemory(demo->textures[i].mem[0], 0, &data);
+        err = xglBeginCommandBuffer(staging_cmd_buf, &cmd_buf_begin_info);
         assert(!err);
 
-        for (y = 0; y < tex_height; y++) {
-            uint32_t *row = (uint32_t *) ((char *) data + layout.rowPitch * y);
-            for (x = 0; x < tex_width; x++)
-                row[x] = tex_colors[i][(x & 1) ^ (y & 1)];
-        }
+        XGL_IMAGE_COPY copy_region = {
+            .srcSubresource = { XGL_IMAGE_ASPECT_COLOR, 0, 0 },
+            .srcOffset = { 0, 0, 0 },
+            .destSubresource = { XGL_IMAGE_ASPECT_COLOR, 0, 0 },
+            .destOffset = { 0, 0, 0 },
+            .extent = { tex_width, tex_height, 1 },
+        };
+        xglCmdCopyImage(staging_cmd_buf, staging_image, demo->textures[i].image, 1, &copy_region);
+
+        XGL_IMAGE_MEMORY_BARRIER image_memory_barrier = {
+            .sType = XGL_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
+            .pNext = NULL,
+            .outputMask = XGL_MEMORY_OUTPUT_COPY_BIT,
+            .inputMask = XGL_MEMORY_INPUT_SHADER_READ_BIT | XGL_MEMORY_INPUT_COPY_BIT,
+            .oldLayout = XGL_IMAGE_LAYOUT_GENERAL,
+            .newLayout = XGL_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL,
+            .image = staging_image,
+            .subresourceRange = { XGL_IMAGE_ASPECT_COLOR, 0, 1, 0, 0 }
+        };
+        XGL_IMAGE_MEMORY_BARRIER *pmemory_barrier = &image_memory_barrier;
 
-        err = xglUnmapMemory(demo->textures[i].mem[0]);
+        XGL_SET_EVENT set_events[] = { XGL_SET_EVENT_GPU_COMMANDS_COMPLETE };
+        XGL_PIPELINE_BARRIER pipeline_barrier;
+        pipeline_barrier.sType = XGL_STRUCTURE_TYPE_PIPELINE_BARRIER;
+        pipeline_barrier.eventCount = 1;
+        pipeline_barrier.pEvents = set_events;
+        pipeline_barrier.waitEvent = XGL_WAIT_EVENT_TOP_OF_PIPE;
+        pipeline_barrier.memBarrierCount = 1;
+        pipeline_barrier.ppMemBarriers = (const void **)&pmemory_barrier;
+
+        // write barrier to the command buffer
+        xglCmdPipelineBarrier(staging_cmd_buf, &pipeline_barrier);
+
+        err = xglEndCommandBuffer(staging_cmd_buf);
         assert(!err);
+
+        const XGL_CMD_BUFFER cmd_bufs[] = { staging_cmd_buf };
+
+        err = xglQueueSubmit(demo->queue, 1, cmd_bufs,
+                             numRefs, memRefs, XGL_NULL_HANDLE);
+        assert(!err);
+
+        err = xglQueueWaitIdle(demo->queue);
+        assert(!err);
+
+        /* clean up staging resources */
+        for (uint32_t j = 0; j < staging_num_allocations; j ++) {
+            xglBindObjectMemory(staging_image, j, XGL_NULL_HANDLE, 0);
+            xglFreeMemory(staging_mem[j]);
+        }
+
+        free(staging_mem);
+        xglDestroyObject(staging_image);
     }
+
+    xglDestroyObject(staging_cmd_buf);
+
 }
 
 static void demo_prepare_vertices(struct demo *demo)