diff options
| author | Rene Lindsay <rene@lunarg.com> | 2016-07-07 16:00:14 -0700 |
|---|---|---|
| committer | Rene Lindsay <rene@lunarg.com> | 2016-07-07 17:42:51 -0600 |
| commit | d787e3a7918795b0e023148fd6ee6c84530e736c (patch) | |
| tree | 1d6bfb8b8c3abc6beba81c8ecbef966a4a09bcd8 | |
| parent | d5b4d2ed9b5b6066e93e2df630cc7f38937b3b3c (diff) | |
| download | usermoji-d787e3a7918795b0e023148fd6ee6c84530e736c.tar.xz | |
demos: Remove VkCommandBufferInheritanceInfo
VkCommandBufferInheritanceInfo is only required for secondary buffers.
Remove from cube and tri.
Change-Id: I0000000000000decaf15bad00000000000000028
| -rw-r--r-- | demos/cube.c | 25 | ||||
| -rw-r--r-- | demos/tri.c | 24 |
2 files changed, 4 insertions, 45 deletions
diff --git a/demos/cube.c b/demos/cube.c index b4f3cdcc..5b262888 100644 --- a/demos/cube.c +++ b/demos/cube.c @@ -535,22 +535,11 @@ static void demo_set_image_layout(struct demo *demo, VkImage image, err = vkAllocateCommandBuffers(demo->device, &cmd, &demo->cmd); assert(!err); - - VkCommandBufferInheritanceInfo cmd_buf_hinfo = { - .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO, - .pNext = NULL, - .renderPass = VK_NULL_HANDLE, - .subpass = 0, - .framebuffer = VK_NULL_HANDLE, - .occlusionQueryEnable = VK_FALSE, - .queryFlags = 0, - .pipelineStatistics = 0, - }; VkCommandBufferBeginInfo cmd_buf_info = { .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, .pNext = NULL, .flags = 0, - .pInheritanceInfo = &cmd_buf_hinfo, + .pInheritanceInfo = NULL, }; err = vkBeginCommandBuffer(demo->cmd, &cmd_buf_info); assert(!err); @@ -597,21 +586,11 @@ static void demo_set_image_layout(struct demo *demo, VkImage image, } static void demo_draw_build_cmd(struct demo *demo, VkCommandBuffer cmd_buf) { - VkCommandBufferInheritanceInfo cmd_buf_hinfo = { - .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO, - .pNext = NULL, - .renderPass = VK_NULL_HANDLE, - .subpass = 0, - .framebuffer = VK_NULL_HANDLE, - .occlusionQueryEnable = VK_FALSE, - .queryFlags = 0, - .pipelineStatistics = 0, - }; const VkCommandBufferBeginInfo cmd_buf_info = { .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, .pNext = NULL, .flags = 0, - .pInheritanceInfo = &cmd_buf_hinfo, + .pInheritanceInfo = NULL, }; const VkClearValue clear_values[2] = { [0] = {.color.float32 = {0.2f, 0.2f, 0.2f, 0.2f}}, diff --git a/demos/tri.c b/demos/tri.c index 95228509..35d33f2b 100644 --- a/demos/tri.c +++ b/demos/tri.c @@ -377,21 +377,11 @@ static void demo_set_image_layout(struct demo *demo, VkImage image, err = vkAllocateCommandBuffers(demo->device, &cmd, &demo->setup_cmd); assert(!err); - VkCommandBufferInheritanceInfo cmd_buf_hinfo = { - .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO, - .pNext = NULL, - .renderPass = VK_NULL_HANDLE, - .subpass = 0, - .framebuffer = VK_NULL_HANDLE, - .occlusionQueryEnable = VK_FALSE, - .queryFlags = 0, - .pipelineStatistics = 0, - }; VkCommandBufferBeginInfo cmd_buf_info = { .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, .pNext = NULL, .flags = 0, - .pInheritanceInfo = &cmd_buf_hinfo, + .pInheritanceInfo = NULL, }; err = vkBeginCommandBuffer(demo->setup_cmd, &cmd_buf_info); assert(!err); @@ -438,21 +428,11 @@ static void demo_set_image_layout(struct demo *demo, VkImage image, } static void demo_draw_build_cmd(struct demo *demo) { - const VkCommandBufferInheritanceInfo cmd_buf_hinfo = { - .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO, - .pNext = NULL, - .renderPass = VK_NULL_HANDLE, - .subpass = 0, - .framebuffer = VK_NULL_HANDLE, - .occlusionQueryEnable = VK_FALSE, - .queryFlags = 0, - .pipelineStatistics = 0, - }; const VkCommandBufferBeginInfo cmd_buf_info = { .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, .pNext = NULL, .flags = 0, - .pInheritanceInfo = &cmd_buf_hinfo, + .pInheritanceInfo = NULL, }; const VkClearValue clear_values[2] = { [0] = {.color.float32 = {0.2f, 0.2f, 0.2f, 0.2f}}, |