commit c1f5e4068eab0504d4b68f78f88c55312ef96328
author Chia-I Wu <olv@lunarg.com> Tue Nov 10 16:21:09 2015 +0800
committer Jon Ashburn <jon@lunarg.com> Wed Nov 11 08:59:08 2015 -0700
tree d17a99a8099da29fadeea221ba69511f644248e2
parent 84acb4d5c993b4c153bc715854af29a871240348

MR640: Alloc -> Allocate naming fixes

Drop a workaround in get_struct_name_from_struct_type in vk_helper.py.

s/VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO/VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO/g
s/VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOC_INFO/VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO/g
s/VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOC_INFO/VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO/g

https://gitlab.khronos.org/vulkan/vulkan/merge_requests/640

demos/cube.c

diff --git a/demos/cube.c b/demos/cube.c
index 9cb5666..318101c 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -472,7 +472,7 @@
 
     if (demo->cmd == VK_NULL_HANDLE) {
         const VkCommandBufferAllocateInfo cmd = {
-            .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOC_INFO,
+            .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO,
             .pNext = NULL,
             .commandPool = demo->cmd_pool,
             .level = VK_COMMAND_BUFFER_LEVEL_PRIMARY,
@@ -936,7 +936,7 @@
                     demo->depth.image, &mem_reqs);
     assert(!err);
 
-    demo->depth.mem_alloc.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO;
+    demo->depth.mem_alloc.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
     demo->depth.mem_alloc.pNext = NULL;
     demo->depth.mem_alloc.allocationSize = mem_reqs.size;
     demo->depth.mem_alloc.memoryTypeIndex = 0;
@@ -1064,7 +1064,7 @@
 
     vkGetImageMemoryRequirements(demo->device, tex_obj->image, &mem_reqs);
 
-    tex_obj->mem_alloc.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO;
+    tex_obj->mem_alloc.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
     tex_obj->mem_alloc.pNext = NULL;
     tex_obj->mem_alloc.allocationSize = mem_reqs.size;
     tex_obj->mem_alloc.memoryTypeIndex = 0;
@@ -1263,7 +1263,7 @@
 
     vkGetBufferMemoryRequirements(demo->device, demo->uniform_data.buf, &mem_reqs);
 
-    demo->uniform_data.mem_alloc.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO;
+    demo->uniform_data.mem_alloc.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
     demo->uniform_data.mem_alloc.pNext = NULL;
     demo->uniform_data.mem_alloc.allocationSize = mem_reqs.size;
     demo->uniform_data.mem_alloc.memoryTypeIndex = 0;
@@ -1620,7 +1620,7 @@
     uint32_t i;
 
     VkDescriptorSetAllocateInfo alloc_info = {
-        .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOC_INFO,
+        .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO,
         .pNext = NULL,
         .descriptorPool = demo->desc_pool,
         .setLayoutCount = 1,
@@ -1696,7 +1696,7 @@
     assert(!err);
 
     const VkCommandBufferAllocateInfo cmd = {
-        .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOC_INFO,
+        .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO,
         .pNext = NULL,
         .commandPool = demo->cmd_pool,
         .level = VK_COMMAND_BUFFER_LEVEL_PRIMARY,