Update to 1.0.0

16 files changed, 42 insertions, 39 deletions

diff --git a/include/qonos/qonos.h b/include/qonos/qonos.h
index f3d0e46..d620e9b 100644
--- a/include/qonos/qonos.h
+++ b/include/qonos/qonos.h
@@ -144,7 +144,7 @@ typedef struct QoShaderModuleCreateInfo_ {
 #define QO_DESCRIPTOR_SET_ALLOCATE_INFO_DEFAULTS \
     .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO, \
     .descriptorPool = VK_NULL_HANDLE, \
-    .setLayoutCount = 1
+    .descriptorSetCount = 1
 
 #define QO_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO_DEFAULTS \
     .sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO, \
@@ -203,7 +203,7 @@ typedef struct QoShaderModuleCreateInfo_ {
 #define QO_COMMAND_BUFFER_ALLOCATE_INFO_DEFAULTS \
     .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, \
     .level = VK_COMMAND_BUFFER_LEVEL_PRIMARY, \
-    .bufferCount = 1
+    .commandBufferCount = 1
 
 #define QO_COMMAND_BUFFER_BEGIN_INFO_DEFAULTS \
     .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO
diff --git a/src/framework/test/t_phase_setup.c b/src/framework/test/t_phase_setup.c
index 1ab303f..75cb26e 100644
--- a/src/framework/test/t_phase_setup.c
+++ b/src/framework/test/t_phase_setup.c
@@ -278,7 +278,7 @@ t_setup_vulkan(void)
             .sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO,
             .pApplicationInfo = &(VkApplicationInfo) {
                 .pApplicationName = "crucible",
-                .apiVersion = VK_API_VERSION,
+                .apiVersion = VK_MAKE_VERSION(1, 0, 0),
             },
         }, &test_alloc_cb, &t->vk.instance);
     t_cleanup_push_vk_instance(t->vk.instance, &test_alloc_cb);
diff --git a/src/qonos/qonos.c b/src/qonos/qonos.c
index 3d73f47..6d28f75 100644
--- a/src/qonos/qonos.c
+++ b/src/qonos/qonos.c
@@ -247,7 +247,7 @@ __qoAllocateDescriptorSet(VkDevice dev, const VkDescriptorSetAllocateInfo *info)
     VkDescriptorSet set;
     VkResult result;
 
-    t_assert(info->setLayoutCount == 1);
+    t_assert(info->descriptorSetCount == 1);
     t_assert(info->pSetLayouts != NULL);
 
     result = vkAllocateDescriptorSets(dev, info, &set);
@@ -297,7 +297,7 @@ __qoAllocateCommandBuffer(VkDevice dev, VkCommandPool pool,
     VkResult result;
 
     assert(info->commandPool == pool);
-    assert(info->bufferCount == 1);
+    assert(info->commandBufferCount == 1);
 
     result = vkAllocateCommandBuffers(dev, info, &cmd);
 
diff --git a/src/tests/func/cmd-buffer/secondary.c b/src/tests/func/cmd-buffer/secondary.c
index fdcd318..c38440b 100644
--- a/src/tests/func/cmd-buffer/secondary.c
+++ b/src/tests/func/cmd-buffer/secondary.c
@@ -119,8 +119,11 @@ make_secondary_cmd_buffer(VkRenderPass pass, VkPipeline pipeline,
 
     qoBeginCommandBuffer(secondary,
         .flags = usage_flags | VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT,
-        .renderPass = pass,
-        .framebuffer = t_framebuffer);
+        .pInheritanceInfo = (&(VkCommandBufferInheritanceInfo) {
+            .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO,
+            .renderPass = pass,
+            .framebuffer = t_framebuffer,
+        }));
 
     vkCmdBindPipeline(secondary, VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline);
 
diff --git a/src/tests/func/compute-local-id.c b/src/tests/func/compute-local-id.c
index d86024d..2cb04aa 100644
--- a/src/tests/func/compute-local-id.c
+++ b/src/tests/func/compute-local-id.c
@@ -30,7 +30,7 @@ common_init(VkShaderModule cs, const uint32_t ssbo_size)
 
     set_layout = qoCreateDescriptorSetLayout(t_device,
             .bindingCount = 2,
-            .pBinding = (VkDescriptorSetLayoutBinding[]) {
+            .pBindings = (VkDescriptorSetLayoutBinding[]) {
                 {
                     .binding = 0,
                     .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
diff --git a/src/tests/func/compute-num-workgroups.c b/src/tests/func/compute-num-workgroups.c
index 65741f4..b5283ec 100644
--- a/src/tests/func/compute-num-workgroups.c
+++ b/src/tests/func/compute-num-workgroups.c
@@ -40,7 +40,7 @@ common_init(CTX *ctx)
 
     set_layout = qoCreateDescriptorSetLayout(t_device,
             .bindingCount = 2,
-            .pBinding = (VkDescriptorSetLayoutBinding[]) {
+            .pBindings = (VkDescriptorSetLayoutBinding[]) {
                 {
                     .binding = 0,
                     .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
diff --git a/src/tests/func/compute.c b/src/tests/func/compute.c
index 60a5627..4107d14 100644
--- a/src/tests/func/compute.c
+++ b/src/tests/func/compute.c
@@ -30,7 +30,7 @@ test(void)
 
     set_layout = qoCreateDescriptorSetLayout(t_device,
             .bindingCount = 2,
-            .pBinding = (VkDescriptorSetLayoutBinding[]) {
+            .pBindings = (VkDescriptorSetLayoutBinding[]) {
                 {
                     .binding = 0,
                     .descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
diff --git a/src/tests/func/copy/copy-buffer.c b/src/tests/func/copy/copy-buffer.c
index db6a8e4..917e8c2 100644
--- a/src/tests/func/copy/copy-buffer.c
+++ b/src/tests/func/copy/copy-buffer.c
@@ -56,9 +56,10 @@ test_large_copy(void)
     VkCommandBuffer cmdBuffer = qoAllocateCommandBuffer(t_device, t_cmd_pool);
     qoBeginCommandBuffer(cmdBuffer);
 
-    vkCmdPipelineBarrier(cmdBuffer, 0, VK_PIPELINE_STAGE_TRANSFER_BIT, false, 2,
-        (const void * []) {
-            &(VkBufferMemoryBarrier) {
+    vkCmdPipelineBarrier(cmdBuffer, 0, VK_PIPELINE_STAGE_TRANSFER_BIT, false,
+                         0, NULL, 2,
+        (VkBufferMemoryBarrier[]) {
+            {
                 .sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER,
                 .srcAccessMask = VK_ACCESS_HOST_WRITE_BIT,
                 .dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT,
@@ -66,7 +67,7 @@ test_large_copy(void)
                 .offset = 0,
                 .size = buffer_size,
             },
-            &(VkBufferMemoryBarrier) {
+            {
                 .sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER,
                 .srcAccessMask = VK_ACCESS_HOST_WRITE_BIT,
                 .dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT,
@@ -74,7 +75,7 @@ test_large_copy(void)
                 .offset = 0,
                 .size = buffer_size,
             },
-        });
+        }, 0, NULL);
 
     vkCmdCopyBuffer(cmdBuffer, buffer1, buffer2, 1,
         &(VkBufferCopy) {
@@ -83,17 +84,16 @@ test_large_copy(void)
             .size = buffer_size,
         });
 
-    vkCmdPipelineBarrier(cmdBuffer, VK_PIPELINE_STAGE_TRANSFER_BIT, 0, true, 1,
-        (const void * []) {
-            &(VkBufferMemoryBarrier) {
-                .sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER,
-                .srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT,
-                .dstAccessMask = VK_ACCESS_HOST_READ_BIT,
-                .buffer = buffer2,
-                .offset = 0,
-                .size = buffer_size,
-            },
-        });
+    vkCmdPipelineBarrier(cmdBuffer, VK_PIPELINE_STAGE_TRANSFER_BIT, 0, true,
+                         0, NULL, 1,
+        &(VkBufferMemoryBarrier) {
+            .sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER,
+            .srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT,
+            .dstAccessMask = VK_ACCESS_HOST_READ_BIT,
+            .buffer = buffer2,
+            .offset = 0,
+            .size = buffer_size,
+        }, 0, NULL);
 
     qoEndCommandBuffer(cmdBuffer);
     qoQueueSubmit(t_queue, 1, &cmdBuffer, VK_NULL_HANDLE);
diff --git a/src/tests/func/desc/dynamic.c b/src/tests/func/desc/dynamic.c
index ecc4b84..a6bb811 100644
--- a/src/tests/func/desc/dynamic.c
+++ b/src/tests/func/desc/dynamic.c
@@ -149,7 +149,7 @@ test(void)
 
     VkDescriptorSetLayout set_layout = qoCreateDescriptorSetLayout(t_device,
             .bindingCount = 2,
-            .pBinding = (VkDescriptorSetLayoutBinding[]) {
+            .pBindings = (VkDescriptorSetLayoutBinding[]) {
                 {
                     .binding = 0,
                     .descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
diff --git a/src/tests/func/event.c b/src/tests/func/event.c
index 9471269..c6a686a 100644
--- a/src/tests/func/event.c
+++ b/src/tests/func/event.c
@@ -171,7 +171,7 @@ test_event_wait_preset(void)
 	    vkCmdWaitEvents(cmd_buffer, 1, &event_a,
 			    VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT,
 			    VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT,
-			    0, NULL);
+			    0, NULL, 0, NULL, 0, NULL);
 	    vkCmdSetEvent(cmd_buffer, event_b,
 			  VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT);
     }
@@ -201,7 +201,7 @@ test_event_wait_set_later(void)
     vkCmdWaitEvents(cmd_buffer, 1, &event_a,
 		    VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT,
 		    VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT,
-		    0, NULL);
+		    0, NULL, 0, NULL, 0, NULL);
     vkCmdSetEvent(cmd_buffer, event_b,
 		  VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT);
     qoEndCommandBuffer(cmd_buffer);
diff --git a/src/tests/func/first.c b/src/tests/func/first.c
index c6a461e..f02b6e9 100644
--- a/src/tests/func/first.c
+++ b/src/tests/func/first.c
@@ -135,7 +135,7 @@ test(void)
 
     set_layout[0] = qoCreateDescriptorSetLayout(t_device,
             .bindingCount = 2,
-            .pBinding = (VkDescriptorSetLayoutBinding[]) {
+            .pBindings = (VkDescriptorSetLayoutBinding[]) {
                 {
                     .binding = 0,
                     .descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
@@ -154,7 +154,7 @@ test(void)
 
     set_layout[1] = qoCreateDescriptorSetLayout(t_device,
             .bindingCount = 1,
-            .pBinding = (VkDescriptorSetLayoutBinding[]) {
+            .pBindings = (VkDescriptorSetLayoutBinding[]) {
                 {
                     .binding = 0,
                     .descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
@@ -175,7 +175,7 @@ test(void)
         &(VkDescriptorSetAllocateInfo) {
             .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO,
             .descriptorPool = VK_NULL_HANDLE,
-            .setLayoutCount = 2,
+            .descriptorSetCount = 2,
             .pSetLayouts = set_layout,
         }, set);
     t_assert(result == VK_SUCCESS);
diff --git a/src/tests/func/miptree/miptree.c b/src/tests/func/miptree/miptree.c
index 082528f..f5c3d53 100644
--- a/src/tests/func/miptree/miptree.c
+++ b/src/tests/func/miptree/miptree.c
@@ -791,7 +791,7 @@ copy_color_images_with_draw(const test_data_t *data,
         const uint32_t width = extents[i].width;
         const uint32_t height = extents[i].height;
 
-        vkCmdSetViewport(cmd, 1,
+        vkCmdSetViewport(cmd, 0, 1,
             &(VkViewport) {
                 .x = 0,
                 .y = 0,
@@ -1079,7 +1079,7 @@ init_draw_data(test_draw_data_t *draw_data)
 
     VkDescriptorSetLayout set_layout = qoCreateDescriptorSetLayout(t_device,
         .bindingCount = 1,
-        .pBinding = (VkDescriptorSetLayoutBinding[]) {
+        .pBindings = (VkDescriptorSetLayoutBinding[]) {
             {
                 .binding = 0,
                 .descriptorType = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE,
diff --git a/src/tests/func/query/timestamp.c b/src/tests/func/query/timestamp.c
index d4be2ce..5730467 100644
--- a/src/tests/func/query/timestamp.c
+++ b/src/tests/func/query/timestamp.c
@@ -31,7 +31,7 @@ get_timestamp(void)
         &(VkQueryPoolCreateInfo) {
             .sType = VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO,
             .queryType = VK_QUERY_TYPE_TIMESTAMP,
-            .entryCount = 2,
+            .queryCount = 2,
         }, NULL, &pool);
 
     VkCommandBuffer cmdBuffer = qoAllocateCommandBuffer(t_device, t_cmd_pool);
diff --git a/src/tests/func/ssbo/interleave.c b/src/tests/func/ssbo/interleave.c
index aaf8339..3e4c0fb 100644
--- a/src/tests/func/ssbo/interleave.c
+++ b/src/tests/func/ssbo/interleave.c
@@ -35,7 +35,7 @@ test(void)
 {
     VkDescriptorSetLayout set_layout = qoCreateDescriptorSetLayout(t_device,
         .bindingCount = 1,
-        .pBinding = (VkDescriptorSetLayoutBinding[]) {
+        .pBindings = (VkDescriptorSetLayoutBinding[]) {
             {
                 .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
                 .descriptorCount = 1,
diff --git a/src/tests/stress/lots-of-surface-state.c b/src/tests/stress/lots-of-surface-state.c
index a0e4b37..13528e7 100644
--- a/src/tests/stress/lots-of-surface-state.c
+++ b/src/tests/stress/lots-of-surface-state.c
@@ -63,7 +63,7 @@ test_lots_of_surface_state(VkShaderModule vs, VkShaderModule fs,
     //  Create the descriptor set layout.
     VkDescriptorSetLayout set_layout = qoCreateDescriptorSetLayout(t_device,
             .bindingCount = 1,
-            .pBinding = (VkDescriptorSetLayoutBinding[]) {
+            .pBindings = (VkDescriptorSetLayoutBinding[]) {
                 {
                     .binding = 0,
                     .descriptorType = use_dynamic_offsets ?
@@ -215,7 +215,7 @@ test_lots_of_surface_state(VkShaderModule vs, VkShaderModule fs,
             &(VkDescriptorSetAllocateInfo) {
                 .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO,
                 .descriptorPool = VK_NULL_HANDLE,
-                .setLayoutCount = 1024,
+                .descriptorSetCount = 1024,
                 .pSetLayouts = layouts,
             }, set);
         t_assert(result == VK_SUCCESS);
diff --git a/src/util/cru_vk_image.c b/src/util/cru_vk_image.c
index 57ba2d2..e2ff334 100644
--- a/src/util/cru_vk_image.c
+++ b/src/util/cru_vk_image.c
@@ -144,7 +144,7 @@ copy(cru_vk_image_t *self, enum copy_direction dir)
     r = vkAllocateCommandBuffers(dev, &(VkCommandBufferAllocateInfo) {
             .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO,
             .commandPool = cmd_pool,
-            .bufferCount = 1,
+            .commandBufferCount = 1,
         },
         &cmd);
     if (r != VK_SUCCESS)