From f48700bc452c394c0d397a072e477d14c8ee5dca Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Tue, 10 Nov 2015 16:21:09 +0800 Subject: 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 | 12 ++++++------ demos/tri.c | 12 ++++++------ include/vulkan/vulkan.h | 6 +++--- layers/param_checker.cpp | 4 ++-- layers/screenshot.cpp | 4 ++-- vk_helper.py | 5 ----- 6 files changed, 19 insertions(+), 24 deletions(-) diff --git a/demos/cube.c b/demos/cube.c index 9cb5666e..318101cc 100644 --- a/demos/cube.c +++ b/demos/cube.c @@ -472,7 +472,7 @@ static void demo_set_image_layout( 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 @@ static void demo_prepare_depth(struct demo *demo) 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 @@ static void demo_prepare_texture_image(struct demo *demo, 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 @@ void demo_prepare_cube_data_buffer(struct demo *demo) 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 @@ static void demo_prepare_descriptor_set(struct demo *demo) 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 @@ static void demo_prepare(struct demo *demo) 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, diff --git a/demos/tri.c b/demos/tri.c index f51f9378..01adb9f1 100644 --- a/demos/tri.c +++ b/demos/tri.c @@ -316,7 +316,7 @@ static void demo_set_image_layout( if (demo->setup_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, @@ -709,7 +709,7 @@ static void demo_prepare_depth(struct demo *demo) .flags = 0, }; VkMemoryAllocateInfo mem_alloc = { - .sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO, + .sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO, .pNext = NULL, .allocationSize = 0, .memoryTypeIndex = 0, @@ -803,7 +803,7 @@ static void demo_prepare_texture_image(struct demo *demo, .flags = 0, }; VkMemoryAllocateInfo mem_alloc = { - .sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO, + .sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO, .pNext = NULL, .allocationSize = 0, .memoryTypeIndex = 0, @@ -994,7 +994,7 @@ static void demo_prepare_vertices(struct demo *demo) .flags = 0, }; VkMemoryAllocateInfo mem_alloc = { - .sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO, + .sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO, .pNext = NULL, .allocationSize = 0, .memoryTypeIndex = 0, @@ -1366,7 +1366,7 @@ static void demo_prepare_descriptor_set(struct demo *demo) 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, @@ -1434,7 +1434,7 @@ static void demo_prepare(struct demo *demo) 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, diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h index 5f45cef5..734199ea 100644 --- a/include/vulkan/vulkan.h +++ b/include/vulkan/vulkan.h @@ -137,7 +137,7 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO = 2, VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO = 3, VK_STRUCTURE_TYPE_SUBMIT_INFO = 4, - VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO = 5, + VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO = 5, VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE = 6, VK_STRUCTURE_TYPE_BIND_SPARSE_INFO = 7, VK_STRUCTURE_TYPE_FENCE_CREATE_INFO = 8, @@ -166,13 +166,13 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO = 31, VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO = 32, VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO = 33, - VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOC_INFO = 34, + VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO = 34, VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET = 35, VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET = 36, VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO = 37, VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO = 38, VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO = 39, - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOC_INFO = 40, + VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO = 40, VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO = 41, VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO = 42, VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER = 43, diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp index 369420df..1afa5dc1 100644 --- a/layers/param_checker.cpp +++ b/layers/param_checker.cpp @@ -2179,7 +2179,7 @@ bool PreAllocateMemory( { if(pAllocateInfo != nullptr) { - if(pAllocateInfo->sType != VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO) + if(pAllocateInfo->sType != VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO) { log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", "vkAllocateMemory parameter, VkStructureType pAllocateInfo->sType, is an invalid enumerator"); @@ -4854,7 +4854,7 @@ bool PreCreateCommandBuffer( { if(pCreateInfo != nullptr) { - if(pCreateInfo->sType != VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOC_INFO) + if(pCreateInfo->sType != VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO) { log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", "vkAllocateCommandBuffers parameter, VkStructureType pCreateInfo->sType, is an invalid enumerator"); diff --git a/layers/screenshot.cpp b/layers/screenshot.cpp index 56011561..b627c44d 100644 --- a/layers/screenshot.cpp +++ b/layers/screenshot.cpp @@ -165,13 +165,13 @@ static void writePPM( const char *filename, VkImage image1) (VK_IMAGE_USAGE_TRANSFER_DST_BIT|VK_IMAGE_USAGE_STORAGE_BIT), }; VkMemoryAllocateInfo memAllocInfo = { - VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO, + VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO, NULL, 0, // allocationSize, queried later 0 // memoryTypeIndex, queried later }; const VkCommandBufferAllocateInfo allocCommandBufferInfo = { - VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOC_INFO, + VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, NULL, deviceMap[device]->commandPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY, diff --git a/vk_helper.py b/vk_helper.py index 6da41445..1a4df6da 100755 --- a/vk_helper.py +++ b/vk_helper.py @@ -371,11 +371,6 @@ def get_struct_name_from_struct_type(struct_type): struct_name += caps_struct_name[char_idx].lower() char_idx += 1 - if struct_name.endswith("AllocInfo"): - struct_name = struct_name[:-9] + "AllocateInfo" - if struct_name.endswith("RasterStateCreateInfo"): - struct_name = struct_name[:-21] + "RasterizationStateCreateInfo" - return struct_name # class for writing common file elements -- cgit v1.2.3