diff options
| author | Chia-I Wu <olv@lunarg.com> | 2015-10-27 18:04:07 +0800 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-11-02 14:54:39 -0700 |
| commit | a8fe78a9564106610d2de75d8a5a523caa296281 (patch) | |
| tree | 0d153abe2641325f89167aa971649c35f2b7171a | |
| parent | 6fdb231a8f1d522ead164d75a31904a479a4e38a (diff) | |
| download | usermoji-a8fe78a9564106610d2de75d8a5a523caa296281.tar.xz | |
bug 14921 part 1: sed renames
Workaround header bug (ALLOC_INFO vs AllocateInfo) in vk_helper.py. This
affects the debug extensions as well.
s/NONDISP/NON_DISPATCHABLE/g
s/CmdBuffer/CommandBuffer/g
s/cmdBuffer/commandBuffer/g
s/CMD_BUFFER/COMMAND_BUFFER/g
s/AllocMemory/AllocateMemory/g
s/AllocDescriptorSets/AllocateDescriptorSets/g
s/AllocCommandBuffers/AllocateCommandBuffers/g
s/VkAllocCallbacks/VkAllocationCallbacks/g
s/VkSystemAllocScope/VkSystemAllocationScope/g
s/allocScope/allocationScope/g
s/allocType/allocationType/g
s/pfnAlloc\b/pfnAllocation/g
s/pfnRealloc\b/pfnReallocation/g
s/VK_SYSTEM_ALLOC_/VK_SYSTEM_ALLOCATION_/g
s/extName/extensionName/g
s/implVersion/implementationVersion/g
s/pAppInfo/pApplicationInfo/g
s/pMem\b/pMemory/g
s/VkMemoryAllocInfo/VkMemoryAllocateInfo/g
s/VkDescriptorSetAllocInfo/VkDescriptorSetAllocateInfo/g
s/CmdPool/CommandPool/g
s/cmdPool/commandPool/g
s/CMD_POOL/COMMAND_POOL/g
s/VkCommandBufferAllocInfo/VkCommandBufferAllocateInfo/g
s/maxTessellationGenLevel/maxTessellationGenerationLevel/g
s/maxFragmentDualSourceAttachments/maxFragmentDualSrcAttachments/g
s/destSubpass/dstSubpass/g
s/destStageMask/dstStageMask/g
s/dualSourceBlend/dualSrcBlend/g
s/destBlendColor/dstBlendColor/g
s/destBlendAlpha/dstBlendAlpha/g
s/VK_FORMAT_NUM/VK_FORMAT_RANGE_SIZE/g
s/VK_DYNAMIC_STATE_NUM/VK_DYNAMIC_STATE_RANGE_SIZE/g
s/pAppName/pApplicationName/g
s/appVersion/applicationVersion/g
s/numLevels/levelCount/g
s/numLayers/layerCount/g
s/destOffset/dstOffset/g
s/destSubresource/dstSubresource/g
s/VK_IMAGE_LAYOUT_TRANSFER_SOURCE_OPTIMAL/VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL/g
s/VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL/VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL/g
s/VK_IMAGE_USAGE_TRANSFER_SOURCE_BIT/VK_IMAGE_USAGE_TRANSFER_SRC_BIT/g
s/VK_IMAGE_USAGE_TRANSFER_DESTINATION_BIT/VK_IMAGE_USAGE_TRANSFER_DST_BIT/g
s/destBuffer/dstBuffer/g
s/destQueueFamilyIndex/dstQueueFamilyIndex/g
s/destSet/dstSet/g
s/destBinding/dstBinding/g
s/destArrayElement/dstArrayElement/g
s/VK_BLEND_DEST_COLOR/VK_BLEND_DST_COLOR/g
s/VK_BLEND_ONE_MINUS_DEST_COLOR/VK_BLEND_ONE_MINUS_DST_COLOR/g
s/VK_BLEND_DEST_ALPHA/VK_BLEND_DST_ALPHA/g
s/VK_BLEND_ONE_MINUS_DEST_ALPHA/VK_BLEND_ONE_MINUS_DST_ALPHA/g
s/VK_FORMAT_FEATURE_BLIT_SOURCE_BIT/VK_FORMAT_FEATURE_BLIT_SRC_BIT/g
s/VK_FORMAT_FEATURE_BLIT_DESTINATION_BIT/VK_FORMAT_FEATURE_BLIT_DST_BIT/g
s/VK_BUFFER_USAGE_TRANSFER_SOURCE_BIT/VK_BUFFER_USAGE_TRANSFER_SRC_BIT/g
s/VK_BUFFER_USAGE_TRANSFER_DESTINATION_BIT/VK_BUFFER_USAGE_TRANSFER_DST_BIT/g
s/VK_COMPARE_OP_LESS_EQUAL/VK_COMPARE_OP_LESS_OR_EQUAL/g
s/VK_COMPARE_OP_GREATER_EQUAL/VK_COMPARE_OP_GREATER_OR_EQUAL/g
s/VkPipelineRasterStateCreateInfo/VkPipelineRasterizationStateCreateInfo/g
s/rasterSamples/rasterizationSamples/g
s/pRasterState/pRasterizationState/g
s/VK_FRONT_FACE_CCW/VK_FRONT_FACE_COUNTER_CLOCKWISE/g
s/VK_FRONT_FACE_CW/VK_FRONT_FACE_CLOCKWISE/g
s/VK_PRIMITIVE_TOPOLOGY_LINE_LIST_ADJ/VK_PRIMITIVE_TOPOLOGY_LINE_LIST_WITH_ADJACENCY/g
s/VK_PRIMITIVE_TOPOLOGY_LINE_STRIP_ADJ/VK_PRIMITIVE_TOPOLOGY_LINE_STRIP_WITH_ADJACENCY/g
s/VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST_ADJ/VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST_WITH_ADJACENCY/g
s/VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP_ADJ/VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP_WITH_ADJACENCY/g
s/VK_STENCIL_OP_INC_CLAMP/VK_STENCIL_OP_INCREMENT_AND_CLAMP/g
s/VK_STENCIL_OP_DEC_CLAMP/VK_STENCIL_OP_DECREMENT_AND_CLAMP/g
s/VK_STENCIL_OP_INC_WRAP/VK_STENCIL_OP_INCREMENT_AND_WRAP/g
s/VK_STENCIL_OP_DEC_WRAP/VK_STENCIL_OP_DECREMENT_AND_WRAP/g
s/VK_LOGIC_OP_NOOP/VK_LOGIC_OP_NO_OP/g
s/VK_LOGIC_OP_EQUIV\b/VK_LOGIC_OP_EQUIVALENT/g
s/memBarrierCount/memoryBarrierCount/g
s/ppMemBarriers/ppMemoryBarriers/g
s/destImage/dstImage/g
s/destImageLayout/dstImageLayout/g
s/destCache/dstCache/g
s/memOffset/memoryOffset/g
s/vk_print_vkmemoryallocinfo/vk_print_vkmemoryallocateinfo/g
s/pAllocInfo/pAllocateInfo/g
s/memRangeCount/memoryRangeCount/g
s/pMemRanges/pMemoryRanges/g
s/VK_IMAGE_TYPE_NUM/VK_IMAGE_TYPE_RANGE_SIZE/g
s/VK_PIPELINE_BIND_POINT_NUM/VK_PIPELINE_BIND_POINT_RANGE_SIZE/g
s/vk_size_vkdescriptorsetallocinfo/vk_size_vkdescriptorsetallocateinfo/g
s/remap_cmdbuffers/remap_commandbuffers/g
s/remap_cmdpool/remap_commandpool/g
s/add_to_cmdbuffers_map/add_to_commandbuffers_map/g
https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14921
a
49 files changed, 2631 insertions, 2625 deletions
diff --git a/demos/cube.c b/demos/cube.c index be5d1b5f..33583bb8 100644 --- a/demos/cube.c +++ b/demos/cube.c @@ -106,7 +106,7 @@ struct texture_object { VkImage image; VkImageLayout imageLayout; - VkMemoryAllocInfo mem_alloc; + VkMemoryAllocateInfo mem_alloc; VkDeviceMemory mem; VkImageView view; int32_t tex_width, tex_height; @@ -302,7 +302,7 @@ VkBool32 dbgFunc( typedef struct _SwapchainBuffers { VkImage image; - VkCmdBuffer cmd; + VkCommandBuffer cmd; VkImageView view; } SwapchainBuffers; @@ -350,13 +350,13 @@ struct demo { VkSwapchainKHR swapchain; SwapchainBuffers *buffers; - VkCmdPool cmd_pool; + VkCommandPool cmd_pool; struct { VkFormat format; VkImage image; - VkMemoryAllocInfo mem_alloc; + VkMemoryAllocateInfo mem_alloc; VkDeviceMemory mem; VkImageView view; } depth; @@ -365,12 +365,12 @@ struct demo { struct { VkBuffer buf; - VkMemoryAllocInfo mem_alloc; + VkMemoryAllocateInfo mem_alloc; VkDeviceMemory mem; VkDescriptorBufferInfo buffer_info; } uniform_data; - VkCmdBuffer cmd; // Buffer for initialization commands + VkCommandBuffer cmd; // Buffer for initialization commands VkPipelineLayout pipeline_layout; VkDescriptorSetLayout desc_layout; VkPipelineCache pipelineCache; @@ -437,7 +437,7 @@ static void demo_flush_init_cmd(struct demo *demo) err = vkEndCommandBuffer(demo->cmd); assert(!err); - const VkCmdBuffer cmd_bufs[] = { demo->cmd }; + const VkCommandBuffer cmd_bufs[] = { demo->cmd }; VkFence nullFence = VK_NULL_HANDLE; VkSubmitInfo submit_info = { .sType = VK_STRUCTURE_TYPE_SUBMIT_INFO, @@ -470,19 +470,19 @@ static void demo_set_image_layout( VkResult U_ASSERT_ONLY err; if (demo->cmd == VK_NULL_HANDLE) { - const VkCmdBufferAllocInfo cmd = { - .sType = VK_STRUCTURE_TYPE_CMD_BUFFER_ALLOC_INFO, + const VkCommandBufferAllocateInfo cmd = { + .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOC_INFO, .pNext = NULL, - .cmdPool = demo->cmd_pool, - .level = VK_CMD_BUFFER_LEVEL_PRIMARY, + .commandPool = demo->cmd_pool, + .level = VK_COMMAND_BUFFER_LEVEL_PRIMARY, .bufferCount = 1, }; - err = vkAllocCommandBuffers(demo->device, &cmd, &demo->cmd); + err = vkAllocateCommandBuffers(demo->device, &cmd, &demo->cmd); assert(!err); - VkCmdBufferBeginInfo cmd_buf_info = { - .sType = VK_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO, + VkCommandBufferBeginInfo cmd_buf_info = { + .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, .pNext = NULL, .flags = 0, .renderPass = VK_NULL_HANDLE, @@ -504,7 +504,7 @@ static void demo_set_image_layout( .subresourceRange = { aspectMask, 0, 1, 0, 0 } }; - if (new_image_layout == VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL) { + if (new_image_layout == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL) { /* Make sure anything that was copying from this image has completed */ image_memory_barrier.inputMask = VK_MEMORY_INPUT_TRANSFER_BIT; } @@ -522,10 +522,10 @@ static void demo_set_image_layout( vkCmdPipelineBarrier(demo->cmd, src_stages, dest_stages, 0, 1, (const void * const*)&pmemory_barrier); } -static void demo_draw_build_cmd(struct demo *demo, VkCmdBuffer cmd_buf) +static void demo_draw_build_cmd(struct demo *demo, VkCommandBuffer cmd_buf) { - const VkCmdBufferBeginInfo cmd_buf_info = { - .sType = VK_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO, + const VkCommandBufferBeginInfo cmd_buf_info = { + .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, .pNext = NULL, .flags = 0, .renderPass = VK_NULL_HANDLE, @@ -587,7 +587,7 @@ static void demo_draw_build_cmd(struct demo *demo, VkCmdBuffer cmd_buf) .oldLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, .newLayout = VK_IMAGE_LAYOUT_PRESENT_SOURCE_KHR, .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, - .destQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, + .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, .subresourceRange = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 } }; @@ -854,9 +854,9 @@ static void demo_prepare_buffers(struct demo *demo) .subresourceRange = { .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT, .baseMipLevel = 0, - .numLevels = 1, + .levelCount = 1, .baseArrayLayer = 0, - .numLayers = 1 + .layerCount = 1 }, .viewType = VK_IMAGE_VIEW_TYPE_2D, .flags = 0, @@ -904,9 +904,9 @@ static void demo_prepare_depth(struct demo *demo) .subresourceRange = { .aspectMask = VK_IMAGE_ASPECT_DEPTH_BIT, .baseMipLevel = 0, - .numLevels = 1, + .levelCount = 1, .baseArrayLayer = 0, - .numLayers = 1 + .layerCount = 1 }, .flags = 0, .viewType = VK_IMAGE_VIEW_TYPE_2D, @@ -939,7 +939,7 @@ static void demo_prepare_depth(struct demo *demo) assert(pass); /* allocate memory */ - err = vkAllocMemory(demo->device, &demo->depth.mem_alloc, + err = vkAllocateMemory(demo->device, &demo->depth.mem_alloc, NULL, &demo->depth.mem); assert(!err); @@ -1064,7 +1064,7 @@ static void demo_prepare_texture_image(struct demo *demo, assert(pass); /* allocate memory */ - err = vkAllocMemory(demo->device, &tex_obj->mem_alloc, NULL, + err = vkAllocateMemory(demo->device, &tex_obj->mem_alloc, NULL, &(tex_obj->mem)); assert(!err); @@ -1130,38 +1130,38 @@ static void demo_prepare_textures(struct demo *demo) memset(&staging_texture, 0, sizeof(staging_texture)); demo_prepare_texture_image(demo, tex_files[i], &staging_texture, - VK_IMAGE_TILING_LINEAR, VK_IMAGE_USAGE_TRANSFER_SOURCE_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT); + VK_IMAGE_TILING_LINEAR, VK_IMAGE_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT); demo_prepare_texture_image(demo, tex_files[i], &demo->textures[i], VK_IMAGE_TILING_OPTIMAL, - (VK_IMAGE_USAGE_TRANSFER_DESTINATION_BIT | VK_IMAGE_USAGE_SAMPLED_BIT), + (VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT), VK_MEMORY_PROPERTY_DEVICE_ONLY); demo_set_image_layout(demo, staging_texture.image, VK_IMAGE_ASPECT_COLOR_BIT, staging_texture.imageLayout, - VK_IMAGE_LAYOUT_TRANSFER_SOURCE_OPTIMAL); + VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL); demo_set_image_layout(demo, demo->textures[i].image, VK_IMAGE_ASPECT_COLOR_BIT, demo->textures[i].imageLayout, - VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL); + VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL); VkImageCopy copy_region = { .srcSubresource = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1 }, .srcOffset = { 0, 0, 0 }, - .destSubresource = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1 }, - .destOffset = { 0, 0, 0 }, + .dstSubresource = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1 }, + .dstOffset = { 0, 0, 0 }, .extent = { staging_texture.tex_width, staging_texture.tex_height, 1 }, }; vkCmdCopyImage(demo->cmd, - staging_texture.image, VK_IMAGE_LAYOUT_TRANSFER_SOURCE_OPTIMAL, - demo->textures[i].image, VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL, + staging_texture.image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, + demo->textures[i].image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, ©_region); demo_set_image_layout(demo, demo->textures[i].image, VK_IMAGE_ASPECT_COLOR_BIT, - VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL, + VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, demo->textures[i].imageLayout); demo_flush_init_cmd(demo); @@ -1265,7 +1265,7 @@ void demo_prepare_cube_data_buffer(struct demo *demo) &demo->uniform_data.mem_alloc.memoryTypeIndex); assert(pass); - err = vkAllocMemory(demo->device, &demo->uniform_data.mem_alloc, + err = vkAllocateMemory(demo->device, &demo->uniform_data.mem_alloc, NULL, &(demo->uniform_data.mem)); assert(!err); @@ -1554,12 +1554,12 @@ static void demo_prepare_pipeline(struct demo *demo) VkPipelineCacheCreateInfo pipelineCache; VkPipelineVertexInputStateCreateInfo vi; VkPipelineInputAssemblyStateCreateInfo ia; - VkPipelineRasterStateCreateInfo rs; + VkPipelineRasterizationStateCreateInfo rs; VkPipelineColorBlendStateCreateInfo cb; VkPipelineDepthStencilStateCreateInfo ds; VkPipelineViewportStateCreateInfo vp; VkPipelineMultisampleStateCreateInfo ms; - VkDynamicState dynamicStateEnables[VK_DYNAMIC_STATE_NUM]; + VkDynamicState dynamicStateEnables[VK_DYNAMIC_STATE_RANGE_SIZE]; VkPipelineDynamicStateCreateInfo dynamicState; VkResult U_ASSERT_ONLY err; @@ -1583,7 +1583,7 @@ static void demo_prepare_pipeline(struct demo *demo) rs.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTER_STATE_CREATE_INFO; rs.fillMode = VK_FILL_MODE_SOLID; rs.cullMode = VK_CULL_MODE_BACK_BIT; - rs.frontFace = VK_FRONT_FACE_CCW; + rs.frontFace = VK_FRONT_FACE_COUNTER_CLOCKWISE; rs.depthClampEnable = VK_FALSE; rs.rasterizerDiscardEnable = VK_FALSE; rs.depthBiasEnable = VK_FALSE; @@ -1608,7 +1608,7 @@ static void demo_prepare_pipeline(struct demo *demo) ds.sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO; ds.depthTestEnable = VK_TRUE; ds.depthWriteEnable = VK_TRUE; - ds.depthCompareOp = VK_COMPARE_OP_LESS_EQUAL; + ds.depthCompareOp = VK_COMPARE_OP_LESS_OR_EQUAL; ds.depthBoundsTestEnable = VK_FALSE; ds.back.stencilFailOp = VK_STENCIL_OP_KEEP; ds.back.stencilPassOp = VK_STENCIL_OP_KEEP; @@ -1619,7 +1619,7 @@ static void demo_prepare_pipeline(struct demo *demo) memset(&ms, 0, sizeof(ms)); ms.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO; ms.pSampleMask = NULL; - ms.rasterSamples = 1; + ms.rasterizationSamples = 1; // Two stages: vs and fs pipeline.stageCount = 2; @@ -1640,7 +1640,7 @@ static void demo_prepare_pipeline(struct demo *demo) pipeline.pVertexInputState = &vi; pipeline.pInputAssemblyState = &ia; - pipeline.pRasterState = &rs; + pipeline.pRasterizationState = &rs; pipeline.pColorBlendState = &cb; pipeline.pMultisampleState = &ms; pipeline.pViewportState = &vp; @@ -1695,14 +1695,14 @@ static void demo_prepare_descriptor_set(struct demo *demo) VkResult U_ASSERT_ONLY err; uint32_t i; - VkDescriptorSetAllocInfo alloc_info = { + VkDescriptorSetAllocateInfo alloc_info = { .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOC_INFO, .pNext = NULL, .descriptorPool = demo->desc_pool, .setLayoutCount = 1, .pSetLayouts = &demo->desc_layout }; - err = vkAllocDescriptorSets(demo->device, &alloc_info, &demo->desc_set); + err = vkAllocateDescriptorSets(demo->device, &alloc_info, &demo->desc_set); assert(!err); memset(&tex_descs, 0, sizeof(tex_descs)); @@ -1715,14 +1715,14 @@ static void demo_prepare_descriptor_set(struct demo *demo) memset(&writes, 0, sizeof(writes)); writes[0].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; - writes[0].destSet = demo->desc_set; + writes[0].dstSet = demo->desc_set; writes[0].descriptorCount = 1; writes[0].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER; writes[0].pBufferInfo = &demo->uniform_data.buffer_info; writes[1].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; - writes[1].destSet = demo->desc_set; - writes[1].destBinding = 1; + writes[1].dstSet = demo->desc_set; + writes[1].dstBinding = 1; writes[1].descriptorCount = DEMO_TEXTURE_COUNT; writes[1].descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER; writes[1].pImageInfo = tex_descs; @@ -1762,8 +1762,8 @@ static void demo_prepare(struct demo *demo) { VkResult U_ASSERT_ONLY err; - const VkCmdPoolCreateInfo cmd_pool_info = { - .sType = VK_STRUCTURE_TYPE_CMD_POOL_CREATE_INFO, + const VkCommandPoolCreateInfo cmd_pool_info = { + .sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, .pNext = NULL, .queueFamilyIndex = demo->graphics_queue_node_index, .flags = 0, @@ -1771,11 +1771,11 @@ static void demo_prepare(struct demo *demo) err = vkCreateCommandPool(demo->device, &cmd_pool_info, NULL, &demo->cmd_pool); assert(!err); - const VkCmdBufferAllocInfo cmd = { - .sType = VK_STRUCTURE_TYPE_CMD_BUFFER_ALLOC_INFO, + const VkCommandBufferAllocateInfo cmd = { + .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOC_INFO, .pNext = NULL, - .cmdPool = demo->cmd_pool, - .level = VK_CMD_BUFFER_LEVEL_PRIMARY, + .commandPool = demo->cmd_pool, + .level = VK_COMMAND_BUFFER_LEVEL_PRIMARY, .bufferCount = 1, }; @@ -1789,7 +1789,7 @@ static void demo_prepare(struct demo *demo) demo_prepare_pipeline(demo); for (uint32_t i = 0; i < demo->swapchainImageCount; i++) { - err = vkAllocCommandBuffers(demo->device, &cmd, &demo->buffers[i].cmd); + err = vkAllocateCommandBuffers(demo->device, &cmd, &demo->buffers[i].cmd); assert(!err); } @@ -2237,11 +2237,11 @@ static void demo_init_vk(struct demo *demo) err = vkEnumerateInstanceExtensionProperties(NULL, &instance_extension_count, instance_extensions); assert(!err); for (uint32_t i = 0; i < instance_extension_count; i++) { - if (!strcmp("VK_EXT_KHR_swapchain", instance_extensions[i].extName)) { + if (!strcmp("VK_EXT_KHR_swapchain", instance_extensions[i].extensionName)) { swapchainExtFound = 1; extension_names[enabled_extension_count++] = "VK_EXT_KHR_swapchain"; } - if (!strcmp(VK_DEBUG_REPORT_EXTENSION_NAME, instance_extensions[i].extName)) { + if (!strcmp(VK_DEBUG_REPORT_EXTENSION_NAME, instance_extensions[i].extensionName)) { if (demo->validate) { extension_names[enabled_extension_count++] = VK_DEBUG_REPORT_EXTENSION_NAME; } @@ -2259,8 +2259,8 @@ static void demo_init_vk(struct demo *demo) const VkApplicationInfo app = { .sType = VK_STRUCTURE_TYPE_APPLICATION_INFO, .pNext = NULL, - .pAppName = APP_SHORT_NAME, - .appVersion = 0, + .pApplicationName = APP_SHORT_NAME, + .applicationVersion = 0, .pEngineName = APP_SHORT_NAME, .engineVersion = 0, .apiVersion = VK_API_VERSION, @@ -2268,7 +2268,7 @@ static void demo_init_vk(struct demo *demo) VkInstanceCreateInfo inst_info = { .sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, .pNext = NULL, - .pAppInfo = &app, + .pApplicationInfo = &app, .enabledLayerNameCount = enabled_layer_count, .ppEnabledLayerNames = (const char *const*) ((demo->validate) ? instance_validation_layers : NULL), .enabledExtensionNameCount = enabled_extension_count, @@ -2346,7 +2346,7 @@ static void demo_init_vk(struct demo *demo) assert(!err); for (uint32_t i = 0; i < device_extension_count; i++) { - if (!strcmp("VK_EXT_KHR_device_swapchain", device_extensions[i].extName)) { + if (!strcmp("VK_EXT_KHR_device_swapchain", device_extensions[i].extensionName)) { swapchainExtFound = 1; extension_names[enabled_extension_count++] = "VK_EXT_KHR_device_swapchain"; } diff --git a/demos/tri.c b/demos/tri.c index a5c30e31..a5159a25 100644 --- a/demos/tri.c +++ b/demos/tri.c @@ -148,7 +148,7 @@ VkBool32 dbgFunc( typedef struct _SwapchainBuffers { VkImage image; - VkCmdBuffer cmd; + VkCommandBuffer cmd; VkImageView view; } SwapchainBuffers; @@ -169,7 +169,7 @@ struct demo { bool use_staging_buffer; bool use_glsl; - VkAllocCallbacks allocator; + VkAllocationCallbacks allocator; VkInstance inst; VkPhysicalDevice gpu; @@ -197,7 +197,7 @@ struct demo { VkSwapchainKHR swapchain; SwapchainBuffers *buffers; - VkCmdPool cmd_pool; + VkCommandPool cmd_pool; struct { VkFormat format; @@ -218,8 +218,8 @@ struct demo { VkVertexInputAttributeDescription vi_attrs[2]; } vertices; - VkCmdBuffer setup_cmd; // Command Buffer for initialization commands - VkCmdBuffer draw_cmd; // Command Buffer for drawing commands + VkCommandBuffer setup_cmd; // Command Buffer for initialization commands + VkCommandBuffer draw_cmd; // Command Buffer for drawing commands VkPipelineLayout pipeline_layout; VkDescriptorSetLayout desc_layout; VkPipelineCache pipelineCache; @@ -279,7 +279,7 @@ static void demo_flush_init_cmd(struct demo *demo) err = vkEndCommandBuffer(demo->setup_cmd); assert(!err); - const VkCmdBuffer cmd_bufs[] = { demo->setup_cmd }; + const VkCommandBuffer cmd_bufs[] = { demo->setup_cmd }; VkFence nullFence = {VK_NULL_HANDLE}; VkSubmitInfo submit_info = { .sType = VK_STRUCTURE_TYPE_SUBMIT_INFO, @@ -312,19 +312,19 @@ static void demo_set_image_layout( VkResult U_ASSERT_ONLY err; if (demo->setup_cmd == VK_NULL_HANDLE) { - const VkCmdBufferAllocInfo cmd = { - .sType = VK_STRUCTURE_TYPE_CMD_BUFFER_ALLOC_INFO, + const VkCommandBufferAllocateInfo cmd = { + .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOC_INFO, .pNext = NULL, - .cmdPool = demo->cmd_pool, - .level = VK_CMD_BUFFER_LEVEL_PRIMARY, + .commandPool = demo->cmd_pool, + .level = VK_COMMAND_BUFFER_LEVEL_PRIMARY, .bufferCount = 1, }; - err = vkAllocCommandBuffers(demo->device, &cmd, &demo->setup_cmd); + err = vkAllocateCommandBuffers(demo->device, &cmd, &demo->setup_cmd); assert(!err); - VkCmdBufferBeginInfo cmd_buf_info = { - .sType = VK_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO, + VkCommandBufferBeginInfo cmd_buf_info = { + .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, .pNext = NULL, .flags = 0, .renderPass = VK_NULL_HANDLE, @@ -346,7 +346,7 @@ static void demo_set_image_layout( .subresourceRange = { aspectMask, 0, 1, 0, 0 } }; - if (new_image_layout == VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL) { + if (new_image_layout == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL) { /* Make sure anything that was copying from this image has completed */ image_memory_barrier.inputMask = VK_MEMORY_INPUT_TRANSFER_BIT; } @@ -366,8 +366,8 @@ static void demo_set_image_layout( static void demo_draw_build_cmd(struct demo *demo) { - const VkCmdBufferBeginInfo cmd_buf_info = { - .sType = VK_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO, + const VkCommandBufferBeginInfo cmd_buf_info = { + .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, .pNext = NULL, .flags = 0, .renderPass = VK_NULL_HANDLE, @@ -431,7 +431,7 @@ static void demo_draw_build_cmd(struct demo *demo) .oldLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, .newLayout = VK_IMAGE_LAYOUT_PRESENT_SOURCE_KHR, .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, - .destQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, + .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, .subresourceRange = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 } }; @@ -662,9 +662,9 @@ static void demo_prepare_buffers(struct demo *demo) .subresourceRange = { .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT, .baseMipLevel = 0, - .numLevels = 1, + .levelCount = 1, .baseArrayLayer = 0, - .numLayers = 1 + .layerCount = 1 }, .viewType = VK_IMAGE_VIEW_TYPE_2D, .flags = 0, @@ -705,7 +705,7 @@ static void demo_prepare_depth(struct demo *demo) .usage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT, .flags = 0, }; - VkMemoryAllocInfo mem_alloc = { + VkMemoryAllocateInfo mem_alloc = { .sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO, .pNext = NULL, .allocationSize = 0, @@ -719,9 +719,9 @@ static void demo_prepare_depth(struct demo *demo) .subresourceRange = { .aspectMask = VK_IMAGE_ASPECT_DEPTH_BIT, .baseMipLevel = 0, - .numLevels = 1, + .levelCount = 1, .baseArrayLayer = 0, - .numLayers = 1 + .layerCount = 1 }, .flags = 0, .viewType = VK_IMAGE_VIEW_TYPE_2D, @@ -751,7 +751,7 @@ static void demo_prepare_depth(struct demo *demo) assert(pass); /* allocate memory */ - err = vkAllocMemory(demo->device, &mem_alloc, NULL, &demo->depth.mem); + err = vkAllocateMemory(demo->device, &mem_alloc, NULL, &demo->depth.mem); assert(!err); /* bind memory */ @@ -799,7 +799,7 @@ static void demo_prepare_texture_image(struct demo *demo, .usage = usage, .flags = 0, }; - VkMemoryAllocInfo mem_alloc = { + VkMemoryAllocateInfo mem_alloc = { .sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO, .pNext = NULL, .allocationSize = 0, @@ -819,7 +819,7 @@ static void demo_prepare_texture_image(struct demo *demo, assert(pass); /* allocate memory */ - err = vkAllocMemory(demo->device, &mem_alloc, NULL, &tex_obj->mem); + err = vkAllocateMemory(demo->device, &mem_alloc, NULL, &tex_obj->mem); assert(!err); /* bind memory */ @@ -889,38 +889,38 @@ static void demo_prepare_textures(struct demo *demo) memset(&staging_texture, 0, sizeof(staging_texture)); demo_prepare_texture_image(demo, tex_colors[i], &staging_texture, - VK_IMAGE_TILING_LINEAR, VK_IMAGE_USAGE_TRANSFER_SOURCE_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT); + VK_IMAGE_TILING_LINEAR, VK_IMAGE_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT); demo_prepare_texture_image(demo, tex_colors[i], &demo->textures[i], VK_IMAGE_TILING_OPTIMAL, - (VK_IMAGE_USAGE_TRANSFER_DESTINATION_BIT | VK_IMAGE_USAGE_SAMPLED_BIT), + (VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT), VK_MEMORY_PROPERTY_DEVICE_ONLY); demo_set_image_layout(demo, staging_texture.image, VK_IMAGE_ASPECT_COLOR_BIT, staging_texture.imageLayout, - VK_IMAGE_LAYOUT_TRANSFER_SOURCE_OPTIMAL); + VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL); demo_set_image_layout(demo, demo->textures[i].image, VK_IMAGE_ASPECT_COLOR_BIT, demo->textures[i].imageLayout, - VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL); + VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL); VkImageCopy copy_region = { .srcSubresource = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1 }, .srcOffset = { 0, 0, 0 }, - .destSubresource = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1 }, - .destOffset = { 0, 0, 0 }, + .dstSubresource = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1 }, + .dstOffset = { 0, 0, 0 }, .extent = { staging_texture.tex_width, staging_texture.tex_height, 1 }, }; vkCmdCopyImage(demo->setup_cmd, - staging_texture.image, VK_IMAGE_LAYOUT_TRANSFER_SOURCE_OPTIMAL, - demo->textures[i].image, VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL, + staging_texture.image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, + demo->textures[i].image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, ©_region); demo_set_image_layout(demo, demo->textures[i].image, VK_IMAGE_ASPECT_COLOR_BIT, - VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL, + VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, demo->textures[i].imageLayout); demo_flush_init_cmd(demo); @@ -990,7 +990,7 @@ static void demo_prepare_vertices(struct demo *demo) .usage = VK_BUFFER_USAGE_VERTEX_BUFFER_BIT, .flags = 0, }; - VkMemoryAllocInfo mem_alloc = { + VkMemoryAllocateInfo mem_alloc = { .sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO, .pNext = NULL, .allocationSize = 0, @@ -1017,7 +1017,7 @@ static void demo_prepare_vertices(struct demo *demo) &mem_alloc.memoryTypeIndex); assert(pass); - err = vkAllocMemory(demo->device, &mem_alloc, NULL, &demo->vertices.mem); + err = vkAllocateMemory(demo->device, &mem_alloc, NULL, &demo->vertices.mem); assert(!err); err = vkMapMemory(demo->device, demo->vertices.mem, 0, mem_alloc.allocationSize, 0, &data); @@ -1304,12 +1304,12 @@ static void demo_prepare_pipeline(struct demo *demo) VkPipelineVertexInputStateCreateInfo vi; VkPipelineInputAssemblyStateCreateInfo ia; - VkPipelineRasterStateCreateInfo rs; + VkPipelineRasterizationStateCreateInfo rs; VkPipelineColorBlendStateCreateInfo cb; VkPipelineDepthStencilStateCreateInfo ds; VkPipelineViewportStateCreateInfo vp; VkPipelineMultisampleStateCreateInfo ms; - VkDynamicState dynamicStateEnables[VK_DYNAMIC_STATE_NUM]; + VkDynamicState dynamicStateEnables[VK_DYNAMIC_STATE_RANGE_SIZE]; VkPipelineDynamicStateCreateInfo dynamicState; VkResult U_ASSERT_ONLY err; @@ -1333,7 +1333,7 @@ static void demo_prepare_pipeline(struct demo *demo) rs.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTER_STATE_CREATE_INFO; rs.fillMode = VK_FILL_MODE_SOLID; rs.cullMode = VK_CULL_MODE_BACK_BIT; - rs.frontFace = VK_FRONT_FACE_CW; + rs.frontFace = VK_FRONT_FACE_CLOCKWISE; rs.depthClampEnable = VK_FALSE; rs.rasterizerDiscardEnable = VK_FALSE; rs.depthBiasEnable = VK_FALSE; @@ -1358,7 +1358,7 @@ static void demo_prepare_pipeline(struct demo *demo) ds.sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO; ds.depthTestEnable = VK_TRUE; ds.depthWriteEnable = VK_TRUE; - ds.depthCompareOp = VK_COMPARE_OP_LESS_EQUAL; + ds.depthCompareOp = VK_COMPARE_OP_LESS_OR_EQUAL; ds.depthBoundsTestEnable = VK_FALSE; ds.back.stencilFailOp = VK_STENCIL_OP_KEEP; ds.back.stencilPassOp = VK_STENCIL_OP_KEEP; @@ -1369,7 +1369,7 @@ static void demo_prepare_pipeline(struct demo *demo) memset(&ms, 0, sizeof(ms)); ms.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO; ms.pSampleMask = NULL; - ms.rasterSamples = 1; + ms.rasterizationSamples = 1; // Two stages: vs and fs pipeline.stageCount = 2; @@ -1384,7 +1384,7 @@ static void demo_prepare_pipeline(struct demo *demo) pipeline.pVertexInputState = &vi; pipeline.pInputAssemblyState = &ia; - pipeline.pRasterState = &rs; + pipeline.pRasterizationState = &rs; pipeline.pColorBlendState = &cb; pipeline.pMultisampleState = &ms; pipeline.pViewportState = &vp; @@ -1438,14 +1438,14 @@ static void demo_prepare_descriptor_set(struct demo *demo) VkResult U_ASSERT_ONLY err; uint32_t i; - VkDescriptorSetAllocInfo alloc_info = { + VkDescriptorSetAllocateInfo alloc_info = { .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOC_INFO, .pNext = NULL, .descriptorPool = demo->desc_pool, .setLayoutCount = 1, .pSetLayouts = &demo->desc_layout }; - err = vkAllocDescriptorSets(demo->device, &alloc_info, &demo->desc_set); + err = vkAllocateDescriptorSets(demo->device, &alloc_info, &demo->desc_set); assert(!err); memset(&tex_descs, 0, sizeof(tex_descs)); @@ -1457,7 +1457,7 @@ static void demo_prepare_descriptor_set(struct demo *demo) memset(&write, 0, sizeof(write)); write.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; - write.destSet = demo->desc_set; + write.dstSet = demo->desc_set; write.descriptorCount = DEMO_TEXTURE_COUNT; write.descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER; write.pImageInfo = tex_descs; @@ -1497,8 +1497,8 @@ static void demo_prepare(struct demo *demo) { VkResult U_ASSERT_ONLY err; - const VkCmdPoolCreateInfo cmd_pool_info = { - .sType = VK_STRUCTURE_TYPE_CMD_POOL_CREATE_INFO, + const VkCommandPoolCreateInfo cmd_pool_info = { + .sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, .pNext = NULL, .queueFamilyIndex = demo->graphics_queue_node_index, .flags = 0, @@ -1506,14 +1506,14 @@ static void demo_prepare(struct demo *demo) err = vkCreateCommandPool(demo->device, &cmd_pool_info, NULL, &demo->cmd_pool); assert(!err); - const VkCmdBufferAllocInfo cmd = { - .sType = VK_STRUCTURE_TYPE_CMD_BUFFER_ALLOC_INFO, + const VkCommandBufferAllocateInfo cmd = { + .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOC_INFO, .pNext = NULL, - .cmdPool = demo->cmd_pool, - .level = VK_CMD_BUFFER_LEVEL_PRIMARY, + .commandPool = demo->cmd_pool, + .level = VK_COMMAND_BUFFER_LEVEL_PRIMARY, .bufferCount = 1, }; - err = vkAllocCommandBuffers(demo->device, &cmd, &demo->draw_cmd); + err = vkAllocateCommandBuffers(demo->device, &cmd, &demo->draw_cmd); assert(!err); demo_prepare_buffers(demo); @@ -1759,15 +1759,15 @@ void* VKAPI myalloc( void* pUserData, size_t size, size_t alignment, - VkSystemAllocScope allocScope) + VkSystemAllocationScope allocationScope) { return malloc(size); } void VKAPI myfree( void* pUserData, - void* pMem) + void* pMemory) { - free(pMem); + free(pMemory); } static void demo_init_vk(struct demo *demo) { @@ -1822,11 +1822,11 @@ static void demo_init_vk(struct demo *demo) err = vkEnumerateInstanceExtensionProperties(NULL, &instance_extension_count, instance_extensions); assert(!err); for (uint32_t i = 0; i < instance_extension_count; i++) { - if (!strcmp("VK_EXT_KHR_swapchain", instance_extensions[i].extName)) { + if (!strcmp("VK_EXT_KHR_swapchain", instance_extensions[i].extensionName)) { swapchainExtFound = 1; extension_names[enabled_extension_count++] = "VK_EXT_KHR_swapchain"; } - if (!strcmp(VK_DEBUG_REPORT_EXTENSION_NAME, instance_extensions[i].extName)) { + if (!strcmp(VK_DEBUG_REPORT_EXTENSION_NAME, instance_extensions[i].extensionName)) { if (demo->validate) { extension_names[enabled_extension_count++] = VK_DEBUG_REPORT_EXTENSION_NAME; } @@ -1844,8 +1844,8 @@ static void demo_init_vk(struct demo *demo) const VkApplicationInfo app = { .sType = VK_STRUCTURE_TYPE_APPLICATION_INFO, .pNext = NULL, - .pAppName = APP_SHORT_NAME, - .appVersion = 0, + .pApplicationName = APP_SHORT_NAME, + .applicationVersion = 0, .pEngineName = APP_SHORT_NAME, .engineVersion = 0, .apiVersion = VK_API_VERSION, @@ -1853,7 +1853,7 @@ static void demo_init_vk(struct demo *demo) VkInstanceCreateInfo inst_info = { .sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, .pNext = NULL, - .pAppInfo = &app, + .pApplicationInfo = &app, .enabledLayerNameCount = enabled_layer_count, .ppEnabledLayerNames = (const char *const*) layer_names, .enabledExtensionNameCount = enabled_extension_count, @@ -1869,7 +1869,7 @@ static void demo_init_vk(struct demo *demo) }; uint32_t gpu_count; - demo->allocator.pfnAlloc = myalloc; + demo->allocator.pfnAllocation = myalloc; demo->allocator.pfnFree = myfree; err = vkCreateInstance(&inst_info, &demo->allocator, &demo->inst); @@ -1941,7 +1941,7 @@ static void demo_init_vk(struct demo *demo) assert(!err); for (uint32_t i = 0; i < device_extension_count; i++) { - if (!strcmp("VK_EXT_KHR_device_swapchain", device_extensions[i].extName)) { + if (!strcmp("VK_EXT_KHR_device_swapchain", device_extensions[i].extensionName)) { swapchainExtFound = 1; extension_names[enabled_extension_count++] = "VK_EXT_KHR_device_swapchain"; } diff --git a/demos/vulkaninfo.c b/demos/vulkaninfo.c index 0977d21b..bec71c10 100644 --- a/demos/vulkaninfo.c +++ b/demos/vulkaninfo.c @@ -87,7 +87,7 @@ struct app_dev { VkDevice obj; - VkFormatProperties format_props[VK_FORMAT_NUM]; + VkFormatProperties format_props[VK_FORMAT_RANGE_SIZE]; }; struct layer_extension_list { @@ -342,7 +342,7 @@ static void app_dev_init_formats(struct app_dev *dev) { VkFormat f; - for (f = 0; f < VK_FORMAT_NUM; f++) { + for (f = 0; f < VK_FORMAT_RANGE_SIZE; f++) { const VkFormat fmt = f; vkGetPhysicalDeviceFormatProperties(dev->gpu->obj, fmt, &dev->format_props[f]); @@ -459,7 +459,7 @@ static void app_dev_init(struct app_dev *dev, struct app_gpu *gpu) VkBool32 extension_found = 0; for (uint32_t j = 0; j < gpu->device_extension_count; j++) { VkExtensionProperties *ext_prop = &gpu->device_extensions[j]; - if (!strcmp(known_extensions[i], ext_prop->extName)) { + if (!strcmp(known_extensions[i], ext_prop->extensionName)) { extension_found = 1; enabled_extension_count++; @@ -522,8 +522,8 @@ static void app_create_instance(struct app_instance *inst) const VkApplicationInfo app_info = { .sType = VK_STRUCTURE_TYPE_APPLICATION_INFO, .pNext = NULL, - .pAppName = APP_SHORT_NAME, - .appVersion = 1, + .pApplicationName = APP_SHORT_NAME, + .applicationVersion = 1, .pEngineName = APP_SHORT_NAME, .engineVersion = 1, .apiVersion = VK_API_VERSION, @@ -531,7 +531,7 @@ static void app_create_instance(struct app_instance *inst) VkInstanceCreateInfo inst_info = { .sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, .pNext = NULL, - .pAppInfo = &app_info, + .pApplicationInfo = &app_info, .enabledLayerNameCount = 0, .ppEnabledLayerNames = NULL, .enabledExtensionNameCount = 0, @@ -597,7 +597,7 @@ static void app_create_instance(struct app_instance *inst) VkBool32 extension_found = 0; for (uint32_t j = 0; j < inst->global_extension_count; j++) { VkExtensionProperties *extension_prop = &inst->global_extensions[j]; - if (!strcmp(known_extensions[i], extension_prop->extName)) { + if (!strcmp(known_extensions[i], extension_prop->extensionName)) { extension_found = 1; global_extension_count++; @@ -711,8 +711,8 @@ static void app_dev_dump_format_props(const struct app_dev *dev, VkFormat fmt) ((features[i].flags & VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT) ? "\n\t\tVK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT" : ""), ((features[i].flags & VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT) ? "\n\t\tVK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT" : ""), ((features[i].flags & VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT) ? "\n\t\tVK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT" : ""), - ((features[i].flags & VK_FORMAT_FEATURE_BLIT_SOURCE_BIT) ? "\n\t\tVK_FORMAT_FEATURE_BLIT_SOURCE_BIT" : ""), - ((features[i].flags & VK_FORMAT_FEATURE_BLIT_DESTINATION_BIT) ? "\n\t\tVK_FORMAT_FEATURE_BLIT_DESTINATION_BIT" : ""), + ((features[i].flags & VK_FORMAT_FEATURE_BLIT_SRC_BIT) ? "\n\t\tVK_FORMAT_FEATURE_BLIT_SRC_BIT" : ""), + ((features[i].flags & VK_FORMAT_FEATURE_BLIT_DST_BIT) ? "\n\t\tVK_FORMAT_FEATURE_BLIT_DST_BIT" : ""), ((features[i].flags & VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT) ? "\n\t\tVK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT" : ""), ((features[i].flags & VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT) ? "\n\t\tVK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT" : ""), ((features[i].flags & VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_ATOMIC_BIT) ? "\n\t\tVK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_ATOMIC_BIT" : ""), @@ -728,7 +728,7 @@ app_dev_dump(const struct app_dev *dev) { VkFormat fmt; - for (fmt = 0; fmt < VK_FORMAT_NUM; fmt++) { + for (fmt = 0; fmt < VK_FORMAT_RANGE_SIZE; fmt++) { app_dev_dump_format_props(dev, fmt); } } @@ -753,7 +753,7 @@ static void app_gpu_dump_features(const struct app_gpu *gpu) printf("\tgeometryShader = %u\n", features->geometryShader ); printf("\ttessellationShader = %u\n", features->tessellationShader ); printf("\tsampleRateShading = %u\n", features->sampleRateShading ); - printf("\tdualSourceBlend = %u\n", features->dualSourceBlend ); + printf("\tdualSrcBlend = %u\n", features->dualSrcBlend ); printf("\tlogicOp = %u\n", features->logicOp ); printf("\tmultiDrawIndirect = %u\n", features->multiDrawIndirect ); printf("\tdepthClip = %u\n", features->depthClamp ); @@ -846,7 +846,7 @@ static void app_dump_limits(const VkPhysicalDeviceLimits *limits) printf("\t\tmaxVertexInputAttributeOffset = 0x%" PRIxLEAST32 "\n", limits->maxVertexInputAttributeOffset ); printf("\t\tmaxVertexInputBindingStride = 0x%" PRIxLEAST32 "\n", limits->maxVertexInputBindingStride ); printf("\t\tmaxVertexOutputComponents = 0x%" PRIxLEAST32 "\n", limits->maxVertexOutputComponents ); - printf("\t\tmaxTessellationGenLevel = 0x%" PRIxLEAST32 "\n", limits->maxTessellationGenLevel ); + printf("\t\tmaxTessellationGenerationLevel = 0x%" PRIxLEAST32 "\n", limits->maxTessellationGenerationLevel ); printf("\t\tmaxTessellationPatchSize = 0x%" PRIxLEAST32 "\n", limits->maxTessellationPatchSize ); printf("\t\tmaxTessellationControlPerVertexInputComponents = 0x%" PRIxLEAST32 "\n", limits->maxTessellationControlPerVertexInputComponents ); printf("\t\tmaxTessellationControlPerVertexOutputComponents = 0x%" PRIxLEAST32 "\n", limits->maxTessellationControlPerVertexOutputComponents); @@ -861,7 +861,7 @@ static void app_dump_limits(const VkPhysicalDeviceLimits *limits) printf("\t\tmaxGeometryTotalOutputComponents = 0x%" PRIxLEAST32 "\n", limits->maxGeometryTotalOutputComponents ); printf("\t\tmaxFragmentInputComponents = 0x%" PRIxLEAST32 "\n", limits->maxFragmentInputComponents ); printf("\t\tmaxFragmentOutputAttachments = 0x%" PRIxLEAST32 "\n", limits->maxFragmentOutputAttachments ); - printf("\t\tmaxFragmentDualSourceAttachments = 0x%" PRIxLEAST32 "\n", limits->maxFragmentDualSourceAttachments ); + printf("\t\tmaxFragmentDualSrcAttachments = 0x%" PRIxLEAST32 "\n", limits->maxFragmentDualSrcAttachments ); printf("\t\tmaxFragmentCombinedOutputResources = 0x%" PRIxLEAST32 "\n", limits->maxFragmentCombinedOutputResources ); printf("\t\tmaxComputeSharedMemorySize = 0x%" PRIxLEAST32 "\n", limits->maxComputeSharedMemorySize ); printf("\t\tmaxComputeWorkGroupCount[0] = 0x%" PRIxLEAST32 "\n", limits->maxComputeWorkGroupCount[0] ); @@ -962,7 +962,7 @@ static void app_dump_extensions( printf("%s\t", indent); printf("%-32s: extension revision %2d", - ext_prop->extName, ext_prop->specVersion); + ext_prop->extensionName, ext_prop->specVersion); } printf("\n"); fflush(stdout); @@ -1022,7 +1022,7 @@ static void app_gpu_dump(const struct app_gpu *gpu) extract_version(layer_info->layer_properties.specVersion, &major, &minor, &patch); snprintf(spec_version, sizeof(spec_version), "%d.%d.%d", major, minor, patch); - extract_version(layer_info->layer_properties.implVersion, &major, &minor, &patch); + extract_version(layer_info->layer_properties.implementationVersion, &major, &minor, &patch); snprintf(layer_version, sizeof(layer_version), "%d.%d.%d", major, minor, patch); printf("\t%s (%s) Vulkan version %s, layer version %s\n", layer_info->layer_properties.layerName, @@ -1078,7 +1078,7 @@ int main(int argc, char **argv) extract_version(layer_prop->specVersion, &major, &minor, &patch); snprintf(spec_version, sizeof(spec_version), "%d.%d.%d", major, minor, patch); - extract_version(layer_prop->implVersion, &major, &minor, &patch); + extract_version(layer_prop->implementationVersion, &major, &minor, &patch); snprintf(layer_version, sizeof(layer_version), "%d.%d.%d", major, minor, patch); printf("\t%s (%s) Vulkan version %s, layer version %s\n", layer_prop->layerName, (char*) layer_prop->description, spec_version, layer_version); diff --git a/docs/vk_full_pipeline_ds.dot b/docs/vk_full_pipeline_ds.dot index 15f0c26d..24654326 100644 --- a/docs/vk_full_pipeline_ds.dot +++ b/docs/vk_full_pipeline_ds.dot @@ -21,7 +21,7 @@ label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" P label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">VkPipelineRsStateCreateInfo</TD></TR><TR><TD>VkStructureType</TD><TD>sType=<BR/>VK_STRUCTURE_TYPE_PIPELINE_RS_STATE_CREATE_INFO</TD></TR> <TR><TD>const void*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>bool32_t</TD><TD>depthClipEnable</TD></TR> <TR><TD>bool32_t</TD><TD>rasterizerDiscardEnable</TD></TR> <TR><TD>float</TD><TD>pointSize</TD></TR> </TABLE>> ]; "VkPipelineCbStateCreateInfo_" [ -label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">VK_PIPELINE_CB_STATE</TD></TR><TR><TD>VkStructureType</TD><TD>sType=<BR/>VK_STRUCTURE_TYPE_PIPELINE_CB_STATE_CREATE_INFO</TD></TR> <TR><TD>const void*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>bool32_t</TD><TD>alphaToCoverageEnable</TD></TR> <TR><TD>bool32_t</TD><TD>dualSourceBlendEnable</TD></TR> <TR><TD>VkLogicOp</TD><TD>logicOp</TD></TR> <TR><TD>VkPipelineCbAttachmentState</TD><TD>attachment</TD></TR> </TABLE>> +label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">VK_PIPELINE_CB_STATE</TD></TR><TR><TD>VkStructureType</TD><TD>sType=<BR/>VK_STRUCTURE_TYPE_PIPELINE_CB_STATE_CREATE_INFO</TD></TR> <TR><TD>const void*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>bool32_t</TD><TD>alphaToCoverageEnable</TD></TR> <TR><TD>bool32_t</TD><TD>dualSrcBlendEnable</TD></TR> <TR><TD>VkLogicOp</TD><TD>logicOp</TD></TR> <TR><TD>VkPipelineCbAttachmentState</TD><TD>attachment</TD></TR> </TABLE>> ]; "_VK_PIPELINE_DB_STATE_CREATE_INFO" [ label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">VK_PIPELINE_DB_STATE_CREATE_INFO</TD></TR><TR><TD>VkStructureType</TD><TD>sType=<BR/>VK_STRUCTURE_TYPE_PIPELINE_DB_STATE_CREATE_INFO</TD></TR> <TR><TD>const void*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>VkFormat</TD><TD>format</TD></TR> </TABLE>> diff --git a/docs/vk_graphics_pipeline.dot b/docs/vk_graphics_pipeline.dot index c659cff8..946a2523 100644 --- a/docs/vk_graphics_pipeline.dot +++ b/docs/vk_graphics_pipeline.dot @@ -21,7 +21,7 @@ label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" P label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">VkPipelineRsStateCreateInfo</TD></TR><TR><TD>VkStructureType</TD><TD>sType=<BR/>VK_STRUCTURE_TYPE_PIPELINE_RS_STATE_CREATE_INFO</TD></TR> <TR><TD>const void*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>bool32_t</TD><TD>depthClipEnable</TD></TR> <TR><TD>bool32_t</TD><TD>rasterizerDiscardEnable</TD></TR> <TR><TD>float</TD><TD>pointSize</TD></TR> </TABLE>> ]; "VkPipelineCbStateCreateInfo_" [ -label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">VK_PIPELINE_CB_STATE</TD></TR><TR><TD>VkStructureType</TD><TD>sType=<BR/>VK_STRUCTURE_TYPE_PIPELINE_CB_STATE_CREATE_INFO</TD></TR> <TR><TD>const void*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>bool32_t</TD><TD>alphaToCoverageEnable</TD></TR> <TR><TD>bool32_t</TD><TD>dualSourceBlendEnable</TD></TR> <TR><TD>VkLogicOp</TD><TD>logicOp</TD></TR> <TR><TD>VkPipelineCbAttachmentState</TD><TD>attachment</TD></TR> </TABLE>> +label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">VK_PIPELINE_CB_STATE</TD></TR><TR><TD>VkStructureType</TD><TD>sType=<BR/>VK_STRUCTURE_TYPE_PIPELINE_CB_STATE_CREATE_INFO</TD></TR> <TR><TD>const void*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>bool32_t</TD><TD>alphaToCoverageEnable</TD></TR> <TR><TD>bool32_t</TD><TD>dualSrcBlendEnable</TD></TR> <TR><TD>VkLogicOp</TD><TD>logicOp</TD></TR> <TR><TD>VkPipelineCbAttachmentState</TD><TD>attachment</TD></TR> </TABLE>> ]; "_VK_PIPELINE_DB_STATE_CREATE_INFO" [ label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">VK_PIPELINE_DB_STATE_CREATE_INFO</TD></TR><TR><TD>VkStructureType</TD><TD>sType=<BR/>VK_STRUCTURE_TYPE_PIPELINE_DB_STATE_CREATE_INFO</TD></TR> <TR><TD>const void*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>VkFormat</TD><TD>format</TD></TR> </TABLE>> diff --git a/icd/common/icd-enumerate-drm.c b/icd/common/icd-enumerate-drm.c index 050eac38..8596097e 100644 --- a/icd/common/icd-enumerate-drm.c +++ b/icd/common/icd-enumerate-drm.c @@ -125,7 +125,7 @@ static struct icd_drm_device *probe_syspath(const struct icd_instance *instance, return devices; } else { dev = icd_instance_alloc(instance, sizeof(*dev), 0, - VK_SYSTEM_ALLOC_SCOPE_FUNCTION); + VK_SYSTEM_ALLOCATION_SCOPE_FUNCTION); if (!dev) return devices; diff --git a/icd/common/icd-format.c b/icd/common/icd-format.c index 893eb27f..771afdf9 100644 --- a/icd/common/icd-format.c +++ b/icd/common/icd-format.c @@ -32,7 +32,7 @@ static const struct icd_format_info { size_t size; uint32_t channel_count; -} icd_format_table[VK_FORMAT_NUM] = { +} icd_format_table[VK_FORMAT_RANGE_SIZE] = { [VK_FORMAT_UNDEFINED] = { 0, 0 }, [VK_FORMAT_R4G4_UNORM] = { 1, 2 }, [VK_FORMAT_R4G4_USCALED] = { 1, 2 }, diff --git a/icd/common/icd-format.h b/icd/common/icd-format.h index b607d2c5..0dda3fcd 100644 --- a/icd/common/icd-format.h +++ b/icd/common/icd-format.h @@ -71,8 +71,8 @@ static inline bool icd_pipeline_cb_att_needs_dual_source_blending(const VkPipeli { if (icd_blend_mode_is_dual_src(att->srcBlendColor) || icd_blend_mode_is_dual_src(att->srcBlendAlpha) || - icd_blend_mode_is_dual_src(att->destBlendColor) || - icd_blend_mode_is_dual_src(att->destBlendAlpha)) { + icd_blend_mode_is_dual_src(att->dstBlendColor) || + icd_blend_mode_is_dual_src(att->dstBlendAlpha)) { return true; } return false; diff --git a/icd/common/icd-instance.c b/icd/common/icd-instance.c index 20febdaf..a7560bce 100644 --- a/icd/common/icd-instance.c +++ b/icd/common/icd-instance.c @@ -33,7 +33,7 @@ static void * VKAPI default_alloc(void *user_data, size_t size, size_t alignment, - VkSystemAllocScope allocScope) + VkSystemAllocationScope allocationScope) { if (alignment <= 1) { return malloc(size); @@ -66,10 +66,10 @@ static void VKAPI default_free(void *user_data, void *ptr) } struct icd_instance *icd_instance_create(const VkApplicationInfo *app_info, - const VkAllocCallbacks *alloc_cb) + const VkAllocationCallbacks *alloc_cb) { - static const VkAllocCallbacks default_alloc_cb = { - .pfnAlloc = default_alloc, + static const VkAllocationCallbacks default_alloc_cb = { + .pfnAllocation = default_alloc, .pfnFree = default_free, }; struct icd_instance *instance; @@ -79,17 +79,17 @@ struct icd_instance *icd_instance_create(const VkApplicationInfo *app_info, if (!alloc_cb) alloc_cb = &default_alloc_cb; - instance = alloc_cb->pfnAlloc(alloc_cb->pUserData, sizeof(*instance), 0, - VK_SYSTEM_ALLOC_SCOPE_INSTANCE); + instance = alloc_cb->pfnAllocation(alloc_cb->pUserData, sizeof(*instance), 0, + VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); if (!instance) return NULL; memset(instance, 0, sizeof(*instance)); - name = (app_info->pAppName) ? app_info->pAppName : "unnamed"; + name = (app_info->pApplicationName) ? app_info->pApplicationName : "unnamed"; len = strlen(name); - instance->name = alloc_cb->pfnAlloc(alloc_cb->pUserData, len + 1, 0, - VK_SYSTEM_ALLOC_SCOPE_INSTANCE); + instance->name = alloc_cb->pfnAllocation(alloc_cb->pUserData, len + 1, 0, + VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); if (!instance->name) { alloc_cb->pfnFree(alloc_cb->pUserData, instance); return NULL; @@ -133,7 +133,7 @@ VkResult icd_instance_create_logger( // } logger = icd_instance_alloc(instance, sizeof(*logger), 0, - VK_SYSTEM_ALLOC_SCOPE_OBJECT); + VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); if (!logger) return VK_ERROR_OUT_OF_HOST_MEMORY; diff --git a/icd/common/icd-instance.h b/icd/common/icd-instance.h index d54af4e9..6058d860 100644 --- a/icd/common/icd-instance.h +++ b/icd/common/icd-instance.h @@ -46,20 +46,20 @@ struct icd_instance_logger { struct icd_instance { char *name; - VkAllocCallbacks alloc_cb; + VkAllocationCallbacks alloc_cb; struct icd_instance_logger *loggers; }; struct icd_instance *icd_instance_create(const VkApplicationInfo *app_info, - const VkAllocCallbacks *alloc_cb); + const VkAllocationCallbacks *alloc_cb); void icd_instance_destroy(struct icd_instance *instance); static inline void *icd_instance_alloc(const struct icd_instance *instance, size_t size, size_t alignment, - VkSystemAllocScope scope) + VkSystemAllocationScope scope) { - return instance->alloc_cb.pfnAlloc(instance->alloc_cb.pUserData, + return instance->alloc_cb.pfnAllocation(instance->alloc_cb.pUserData, size, alignment, scope); } diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c index c155745a..bc0204f6 100644 --- a/icd/nulldrv/nulldrv.c +++ b/icd/nulldrv/nulldrv.c @@ -44,7 +44,7 @@ static const char * const nulldrv_gpu_exts[NULLDRV_EXT_COUNT] = { }; static const VkExtensionProperties intel_gpu_exts[NULLDRV_EXT_COUNT] = { { - .extName = VK_EXT_KHR_SWAPCHAIN_EXTENSION_NAME, + .extensionName = VK_EXT_KHR_SWAPCHAIN_EXTENSION_NAME, .specVersion = VK_EXT_KHR_SWAPCHAIN_REVISION, } }; @@ -150,12 +150,12 @@ static VkResult dev_create_queues(struct nulldrv_dev *dev, static enum nulldrv_ext_type nulldrv_gpu_lookup_extension( const struct nulldrv_gpu *gpu, - const char* extName) + const char* extensionName) { enum nulldrv_ext_type type; for (type = 0; type < ARRAY_SIZE(nulldrv_gpu_exts); type++) { - if (strcmp(nulldrv_gpu_exts[type], extName) == 0) + if (strcmp(nulldrv_gpu_exts[type], extensionName) == 0) break; } @@ -299,7 +299,7 @@ static struct nulldrv_img *nulldrv_img(VkImage image) } static VkResult nulldrv_mem_alloc(struct nulldrv_dev *dev, - const VkMemoryAllocInfo *info, + const VkMemoryAllocateInfo *info, struct nulldrv_mem **mem_ret) { struct nulldrv_mem *mem; @@ -481,7 +481,7 @@ static VkResult graphics_pipeline_create(struct nulldrv_dev *dev, } static VkResult nulldrv_cmd_create(struct nulldrv_dev *dev, - const VkCmdBufferAllocInfo *info, + const VkCommandBufferAllocateInfo *info, struct nulldrv_cmd **cmd_ret) { struct nulldrv_cmd *cmd; @@ -611,7 +611,7 @@ static VkResult nulldrv_buf_view_create(struct nulldrv_dev *dev, ICD_EXPORT VkResult VKAPI vkCreateBuffer( VkDevice device, const VkBufferCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkBuffer* pBuffer) { NULLDRV_LOG_FUNC; @@ -623,16 +623,16 @@ ICD_EXPORT VkResult VKAPI vkCreateBuffer( ICD_EXPORT void VKAPI vkDestroyBuffer( VkDevice device, VkBuffer buffer, - const VkAllocCallbacks* pAllocator) + const VkAllocationCallbacks* pAllocator) { NULLDRV_LOG_FUNC; } ICD_EXPORT VkResult VKAPI vkCreateCommandPool( VkDevice device, - const VkCmdPoolCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, - VkCmdPool* pCmdPool) + const VkCommandPoolCreateInfo* pCreateInfo, + const VkAllocationCallbacks* pAllocator, + VkCommandPool* pCommandPool) { NULLDRV_LOG_FUNC; return VK_SUCCESS; @@ -640,63 +640,63 @@ ICD_EXPORT VkResult VKAPI vkCreateCommandPool( ICD_EXPORT void VKAPI vkDestroyCommandPool( VkDevice device, - VkCmdPool cmdPool, - const VkAllocCallbacks* pAllocator) + VkCommandPool commandPool, + const VkAllocationCallbacks* pAllocator) { NULLDRV_LOG_FUNC; } ICD_EXPORT VkResult VKAPI vkResetCommandPool( VkDevice device, - VkCmdPool cmdPool, - VkCmdPoolResetFlags flags) + VkCommandPool commandPool, + VkCommandPoolResetFlags flags) { NULLDRV_LOG_FUNC; return VK_SUCCESS; } -ICD_EXPORT VkResult VKAPI vkAllocCommandBuffers( +ICD_EXPORT VkResult VKAPI vkAllocateCommandBuffers( VkDevice device, - const VkCmdBufferAllocInfo* pAllocInfo, - VkCmdBuffer* pCmdBuffers) + const VkCommandBufferAllocateInfo* pAllocateInfo, + VkCommandBuffer* pCommandBuffers) { NULLDRV_LOG_FUNC; struct nulldrv_dev *dev = nulldrv_dev(device); - return nulldrv_cmd_create(dev, pAllocInfo, - (struct nulldrv_cmd **) pCmdBuffers); + return nulldrv_cmd_create(dev, pAllocateInfo, + (struct nulldrv_cmd **) pCommandBuffers); } ICD_EXPORT void VKAPI vkFreeCommandBuffers( VkDevice device, - VkCmdPool cmdPool, + VkCommandPool commandPool, uint32_t commandBufferCount, - const VkCmdBuffer* pCmdBuffers) + const VkCommandBuffer* pCommandBuffers) { NULLDRV_LOG_FUNC; for (uint32_t i = 0; i < commandBufferCount; i++) { - free(pCmdBuffers[i]); + free(pCommandBuffers[i]); } } ICD_EXPORT VkResult VKAPI vkBeginCommandBuffer( - VkCmdBuffer cmdBuffer, - const VkCmdBufferBeginInfo *info) + VkCommandBuffer commandBuffer, + const VkCommandBufferBeginInfo *info) { NULLDRV_LOG_FUNC; return VK_SUCCESS; } ICD_EXPORT VkResult VKAPI vkEndCommandBuffer( - VkCmdBuffer cmdBuffer) + VkCommandBuffer commandBuffer) { NULLDRV_LOG_FUNC; return VK_SUCCESS; } ICD_EXPORT VkResult VKAPI vkResetCommandBuffer( - VkCmdBuffer cmdBuffer, - VkCmdBufferResetFlags flags) + VkCommandBuffer commandBuffer, + VkCommandBufferResetFlags flags) { NULLDRV_LOG_FUNC; return VK_SUCCESS; @@ -876,9 +876,9 @@ ICD_EXPORT VkResult VKAPI vkQueuePresentKHR( } ICD_EXPORT void VKAPI vkCmdCopyBuffer( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkBuffer srcBuffer, - VkBuffer destBuffer, + VkBuffer dstBuffer, uint32_t regionCount, const VkBufferCopy* pRegions) { @@ -886,11 +886,11 @@ ICD_EXPORT void VKAPI vkCmdCopyBuffer( } ICD_EXPORT void VKAPI vkCmdCopyImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, - VkImage destImage, - VkImageLayout destImageLayout, + VkImage dstImage, + VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageCopy* pRegions) { @@ -898,11 +898,11 @@ ICD_EXPORT void VKAPI vkCmdCopyImage( } ICD_EXPORT void VKAPI vkCmdBlitImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, - VkImage destImage, - VkImageLayout destImageLayout, + VkImage dstImage, + VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageBlit* pRegions, VkFilter filter) @@ -911,10 +911,10 @@ ICD_EXPORT void VKAPI vkCmdBlitImage( } ICD_EXPORT void VKAPI vkCmdCopyBufferToImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkBuffer srcBuffer, - VkImage destImage, - VkImageLayout destImageLayout, + VkImage dstImage, + VkImageLayout dstImageLayout, uint32_t regionCount, const VkBufferImageCopy* pRegions) { @@ -922,10 +922,10 @@ ICD_EXPORT void VKAPI vkCmdCopyBufferToImage( } ICD_EXPORT void VKAPI vkCmdCopyImageToBuffer( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, - VkBuffer destBuffer, + VkBuffer dstBuffer, uint32_t regionCount, const VkBufferImageCopy* pRegions) { @@ -933,9 +933,9 @@ ICD_EXPORT void VKAPI vkCmdCopyImageToBuffer( } ICD_EXPORT void VKAPI vkCmdUpdateBuffer( - VkCmdBuffer cmdBuffer, - VkBuffer destBuffer, - VkDeviceSize destOffset, + VkCommandBuffer commandBuffer, + VkBuffer dstBuffer, + VkDeviceSize dstOffset, VkDeviceSize dataSize, const uint32_t* pData) { @@ -943,9 +943,9 @@ ICD_EXPORT void VKAPI vkCmdUpdateBuffer( } ICD_EXPORT void VKAPI vkCmdFillBuffer( - VkCmdBuffer cmdBuffer, - VkBuffer destBuffer, - VkDeviceSize destOffset, + VkCommandBuffer commandBuffer, + VkBuffer dstBuffer, + VkDeviceSize dstOffset, VkDeviceSize size, uint32_t data) { @@ -953,7 +953,7 @@ ICD_EXPORT void VKAPI vkCmdFillBuffer( } ICD_EXPORT void VKAPI vkCmdClearDepthStencilImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearDepthStencilValue* pDepthStencil, @@ -964,7 +964,7 @@ ICD_EXPORT void VKAPI vkCmdClearDepthStencilImage( } ICD_EXPORT void VKAPI vkCmdClearAttachments( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t attachmentCount, const VkClearAttachment* pAttachments, uint32_t rectCount, @@ -974,7 +974,7 @@ ICD_EXPORT void VKAPI vkCmdClearAttachments( } ICD_EXPORT void VKAPI vkCmdClearColorImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearColorValue *pColor, @@ -985,7 +985,7 @@ ICD_EXPORT void VKAPI vkCmdClearColorImage( } ICD_EXPORT void VKAPI vkCmdClearDepthStencil( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, float depth, @@ -997,11 +997,11 @@ ICD_EXPORT void VKAPI vkCmdClearDepthStencil( } ICD_EXPORT void VKAPI vkCmdResolveImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, - VkImage destImage, - VkImageLayout destImageLayout, + VkImage dstImage, + VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageResolve* pRegions) { @@ -1009,7 +1009,7 @@ ICD_EXPORT void VKAPI vkCmdResolveImage( } ICD_EXPORT void VKAPI vkCmdBeginQuery( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t slot, VkFlags flags) @@ -1018,7 +1018,7 @@ ICD_EXPORT void VKAPI vkCmdBeginQuery( } ICD_EXPORT void VKAPI vkCmdEndQuery( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t slot) { @@ -1026,7 +1026,7 @@ ICD_EXPORT void VKAPI vkCmdEndQuery( } ICD_EXPORT void VKAPI vkCmdResetQueryPool( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount) @@ -1035,7 +1035,7 @@ ICD_EXPORT void VKAPI vkCmdResetQueryPool( } ICD_EXPORT void VKAPI vkCmdSetEvent( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkEvent event_, VkPipelineStageFlags stageMask) { @@ -1043,7 +1043,7 @@ ICD_EXPORT void VKAPI vkCmdSetEvent( } ICD_EXPORT void VKAPI vkCmdResetEvent( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkEvent event_, VkPipelineStageFlags stageMask) { @@ -1051,12 +1051,12 @@ ICD_EXPORT void VKAPI vkCmdResetEvent( } ICD_EXPORT void VKAPI vkCmdCopyQueryPoolResults( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount, - VkBuffer destBuffer, - VkDeviceSize destOffset, + VkBuffer dstBuffer, + VkDeviceSize dstOffset, VkDeviceSize destStride, VkFlags flags) { @@ -1064,7 +1064,7 @@ ICD_EXPORT void VKAPI vkCmdCopyQueryPoolResults( } ICD_EXPORT void VKAPI vkCmdWriteTimestamp( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, uint32_t slot) @@ -1073,60 +1073,60 @@ ICD_EXPORT void VKAPI vkCmdWriteTimestamp( } ICD_EXPORT void VKAPI vkCmdBindPipeline( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline) { NULLDRV_LOG_FUNC; } -ICD_EXPORT void VKAPI vkCmdSetViewport(VkCmdBuffer cmdBuffer, uint32_t viewportCount, const VkViewport* pViewports) +ICD_EXPORT void VKAPI vkCmdSetViewport(VkCommandBuffer commandBuffer, uint32_t viewportCount, const VkViewport* pViewports) { NULLDRV_LOG_FUNC; } -ICD_EXPORT void VKAPI vkCmdSetScissor(VkCmdBuffer cmdBuffer, uint32_t scissorCount, const VkRect2D* pScissors) +ICD_EXPORT void VKAPI vkCmdSetScissor(VkCommandBuffer commandBuffer, uint32_t scissorCount, const VkRect2D* pScissors) { NULLDRV_LOG_FUNC; } -ICD_EXPORT void VKAPI vkCmdSetLineWidth(VkCmdBuffer cmdBuffer, float lineWidth) +ICD_EXPORT void VKAPI vkCmdSetLineWidth(VkCommandBuffer commandBuffer, float lineWidth) { NULLDRV_LOG_FUNC; } -ICD_EXPORT void VKAPI vkCmdSetDepthBias(VkCmdBuffer cmdBuffer, float depthBiasConstantFactor, float depthBiasClamp, float depthBiasSlopeFactor) +ICD_EXPORT void VKAPI vkCmdSetDepthBias(VkCommandBuffer commandBuffer, float depthBiasConstantFactor, float depthBiasClamp, float depthBiasSlopeFactor) { NULLDRV_LOG_FUNC; } -ICD_EXPORT void VKAPI vkCmdSetBlendConstants(VkCmdBuffer cmdBuffer, const float blendConstants[4]) +ICD_EXPORT void VKAPI vkCmdSetBlendConstants(VkCommandBuffer commandBuffer, const float blendConstants[4]) { NULLDRV_LOG_FUNC; } -ICD_EXPORT void VKAPI vkCmdSetDepthBounds(VkCmdBuffer cmdBuffer, float minDepthBounds, float maxDepthBounds) +ICD_EXPORT void VKAPI vkCmdSetDepthBounds(VkCommandBuffer commandBuffer, float minDepthBounds, float maxDepthBounds) { NULLDRV_LOG_FUNC; } -ICD_EXPORT void VKAPI vkCmdSetStencilCompareMask(VkCmdBuffer cmdBuffer, VkStencilFaceFlags faceMask, uint32_t stencilCompareMask) +ICD_EXPORT void VKAPI vkCmdSetStencilCompareMask(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t stencilCompareMask) { NULLDRV_LOG_FUNC; } -ICD_EXPORT void VKAPI vkCmdSetStencilWriteMask(VkCmdBuffer cmdBuffer, VkStencilFaceFlags faceMask, uint32_t stencilWriteMask) +ICD_EXPORT void VKAPI vkCmdSetStencilWriteMask(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t stencilWriteMask) { NULLDRV_LOG_FUNC; } -ICD_EXPORT void VKAPI vkCmdSetStencilReference(VkCmdBuffer cmdBuffer, VkStencilFaceFlags faceMask, uint32_t stencilReference) +ICD_EXPORT void VKAPI vkCmdSetStencilReference(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t stencilReference) { NULLDRV_LOG_FUNC; } ICD_EXPORT void VKAPI vkCmdBindDescriptorSets( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t firstSet, @@ -1139,7 +1139,7 @@ ICD_EXPORT void VKAPI vkCmdBindDescriptorSets( } ICD_EXPORT void VKAPI vkCmdBindVertexBuffers( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t startBinding, uint32_t bindingCount, const VkBuffer* pBuffers, @@ -1149,7 +1149,7 @@ ICD_EXPORT void VKAPI vkCmdBindVertexBuffers( } ICD_EXPORT void VKAPI vkCmdBindIndexBuffer( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkIndexType indexType) @@ -1158,7 +1158,7 @@ ICD_EXPORT void VKAPI vkCmdBindIndexBuffer( } ICD_EXPORT void VKAPI vkCmdDraw( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, @@ -1168,7 +1168,7 @@ ICD_EXPORT void VKAPI vkCmdDraw( } ICD_EXPORT void VKAPI vkCmdDrawIndexed( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex, @@ -1179,7 +1179,7 @@ ICD_EXPORT void VKAPI vkCmdDrawIndexed( } ICD_EXPORT void VKAPI vkCmdDrawIndirect( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, @@ -1189,7 +1189,7 @@ ICD_EXPORT void VKAPI vkCmdDrawIndirect( } ICD_EXPORT void VKAPI vkCmdDrawIndexedIndirect( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, @@ -1199,7 +1199,7 @@ ICD_EXPORT void VKAPI vkCmdDrawIndexedIndirect( } ICD_EXPORT void VKAPI vkCmdDispatch( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t x, uint32_t y, uint32_t z) @@ -1208,7 +1208,7 @@ ICD_EXPORT void VKAPI vkCmdDispatch( } ICD_EXPORT void VKAPI vkCmdDispatchIndirect( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset) { @@ -1216,24 +1216,24 @@ ICD_EXPORT void VKAPI vkCmdDispatchIndirect( } void VKAPI vkCmdWaitEvents( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent* pEvents, VkPipelineStageFlags sourceStageMask, - VkPipelineStageFlags destStageMask, - uint32_t memBarrierCount, - const void* const* ppMemBarriers) + VkPipelineStageFlags dstStageMask, + uint32_t memoryBarrierCount, + const void* const* ppMemoryBarriers) { NULLDRV_LOG_FUNC; } void VKAPI vkCmdPipelineBarrier( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkPipelineStageFlags srcStageMask, - VkPipelineStageFlags destStageMask, + VkPipelineStageFlags dstStageMask, VkDependencyFlags dependencyFlags, - uint32_t memBarrierCount, - const void* const* ppMemBarriers) + uint32_t memoryBarrierCount, + const void* const* ppMemoryBarriers) { NULLDRV_LOG_FUNC; } @@ -1241,7 +1241,7 @@ void VKAPI vkCmdPipelineBarrier( ICD_EXPORT VkResult VKAPI vkCreateDevice( VkPhysicalDevice gpu_, const VkDeviceCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkDevice* pDevice) { NULLDRV_LOG_FUNC; @@ -1251,7 +1251,7 @@ ICD_EXPORT VkResult VKAPI vkCreateDevice( ICD_EXPORT void VKAPI vkDestroyDevice( VkDevice device, - const VkAllocCallbacks* pAllocator) + const VkAllocationCallbacks* pAllocator) { NULLDRV_LOG_FUNC; } @@ -1277,7 +1277,7 @@ ICD_EXPORT VkResult VKAPI vkDeviceWaitIdle( ICD_EXPORT VkResult VKAPI vkCreateEvent( VkDevice device, const VkEventCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkEvent* pEvent) { NULLDRV_LOG_FUNC; @@ -1287,7 +1287,7 @@ ICD_EXPORT VkResult VKAPI vkCreateEvent( ICD_EXPORT void VKAPI vkDestroyEvent( VkDevice device, VkEvent event, - const VkAllocCallbacks* pAllocator) + const VkAllocationCallbacks* pAllocator) { NULLDRV_LOG_FUNC; } @@ -1319,7 +1319,7 @@ ICD_EXPORT VkResult VKAPI vkResetEvent( ICD_EXPORT VkResult VKAPI vkCreateFence( VkDevice device, const VkFenceCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkFence* pFence) { NULLDRV_LOG_FUNC; @@ -1332,7 +1332,7 @@ ICD_EXPORT VkResult VKAPI vkCreateFence( ICD_EXPORT void VKAPI vkDestroyFence( VkDevice device, VkFence fence, - const VkAllocCallbacks* pAllocator) + const VkAllocationCallbacks* pAllocator) { NULLDRV_LOG_FUNC; } @@ -1478,7 +1478,7 @@ VkResult VKAPI vkEnumerateDeviceExtensionProperties( ICD_EXPORT VkResult VKAPI vkCreateImage( VkDevice device, const VkImageCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkImage* pImage) { NULLDRV_LOG_FUNC; @@ -1491,7 +1491,7 @@ ICD_EXPORT VkResult VKAPI vkCreateImage( ICD_EXPORT void VKAPI vkDestroyImage( VkDevice device, VkImage image, - const VkAllocCallbacks* pAllocator) + const VkAllocationCallbacks* pAllocator) { NULLDRV_LOG_FUNC; } @@ -1510,22 +1510,22 @@ ICD_EXPORT void VKAPI vkGetImageSubresourceLayout( pLayout->depthPitch = 4; } -ICD_EXPORT VkResult VKAPI vkAllocMemory( +ICD_EXPORT VkResult VKAPI vkAllocateMemory( VkDevice device, - const VkMemoryAllocInfo* pAllocInfo, - const VkAllocCallbacks* pAllocator, - VkDeviceMemory* pMem) + const VkMemoryAllocateInfo* pAllocateInfo, + const VkAllocationCallbacks* pAllocator, + VkDeviceMemory* pMemory) { NULLDRV_LOG_FUNC; struct nulldrv_dev *dev = nulldrv_dev(device); - return nulldrv_mem_alloc(dev, pAllocInfo, (struct nulldrv_mem **) pMem); + return nulldrv_mem_alloc(dev, pAllocateInfo, (struct nulldrv_mem **) pMemory); } ICD_EXPORT void VKAPI vkFreeMemory( VkDevice device, VkDeviceMemory mem_, - const VkAllocCallbacks* pAllocator) + const VkAllocationCallbacks* pAllocator) { NULLDRV_LOG_FUNC; } @@ -1556,8 +1556,8 @@ ICD_EXPORT void VKAPI vkUnmapMemory( ICD_EXPORT VkResult VKAPI vkFlushMappedMemoryRanges( VkDevice device, - uint32_t memRangeCount, - const VkMappedMemoryRange* pMemRanges) + uint32_t memoryRangeCount, + const VkMappedMemoryRange* pMemoryRanges) { NULLDRV_LOG_FUNC; return VK_SUCCESS; @@ -1565,8 +1565,8 @@ ICD_EXPORT VkResult VKAPI vkFlushMappedMemoryRanges( ICD_EXPORT VkResult VKAPI vkInvalidateMappedMemoryRanges( VkDevice device, - uint32_t memRangeCount, - const VkMappedMemoryRange* pMemRanges) + uint32_t memoryRangeCount, + const VkMappedMemoryRange* pMemoryRanges) { NULLDRV_LOG_FUNC; return VK_SUCCESS; @@ -1581,7 +1581,7 @@ ICD_EXPORT void VKAPI vkGetDeviceMemoryCommitment( ICD_EXPORT VkResult VKAPI vkCreateInstance( const VkInstanceCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkInstance* pInstance) { NULLDRV_LOG_FUNC; @@ -1601,7 +1601,7 @@ ICD_EXPORT VkResult VKAPI vkCreateInstance( ICD_EXPORT void VKAPI vkDestroyInstance( VkInstance pInstance, - const VkAllocCallbacks* pAllocator) + const VkAllocationCallbacks* pAllocator) { NULLDRV_LOG_FUNC; } @@ -1658,7 +1658,7 @@ ICD_EXPORT VkResult VKAPI vkBindBufferMemory( VkDevice device, VkBuffer buffer, VkDeviceMemory mem_, - VkDeviceSize memOffset) + VkDeviceSize memoryOffset) { NULLDRV_LOG_FUNC; return VK_SUCCESS; @@ -1668,7 +1668,7 @@ ICD_EXPORT VkResult VKAPI vkBindImageMemory( VkDevice device, VkImage image, VkDeviceMemory mem_, - VkDeviceSize memOffset) + VkDeviceSize memoryOffset) { NULLDRV_LOG_FUNC; return VK_SUCCESS; @@ -1709,7 +1709,7 @@ ICD_EXPORT VkResult VKAPI vkQueueBindSparse( ICD_EXPORT VkResult VKAPI vkCreatePipelineCache( VkDevice device, const VkPipelineCacheCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkPipelineCache* pPipelineCache) { @@ -1720,7 +1720,7 @@ ICD_EXPORT VkResult VKAPI vkCreatePipelineCache( ICD_EXPORT void VKAPI vkDestroyPipeline( VkDevice device, VkPipeline pipeline, - const VkAllocCallbacks* pAllocator) + const VkAllocationCallbacks* pAllocator) { NULLDRV_LOG_FUNC; } @@ -1728,7 +1728,7 @@ ICD_EXPORT void VKAPI vkDestroyPipeline( void VKAPI vkDestroyPipelineCache( VkDevice device, VkPipelineCache pipelineCache, - const VkAllocCallbacks* pAllocator) + const VkAllocationCallbacks* pAllocator) { NULLDRV_LOG_FUNC; } @@ -1745,7 +1745,7 @@ ICD_EXPORT VkResult VKAPI vkGetPipelineCacheData( ICD_EXPORT VkResult VKAPI vkMergePipelineCaches( VkDevice device, - VkPipelineCache destCache, + VkPipelineCache dstCache, uint32_t srcCacheCount, const VkPipelineCache* pSrcCaches) { @@ -1757,7 +1757,7 @@ ICD_EXPORT VkResult VKAPI vkCreateGraphicsPipelines( VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkGraphicsPipelineCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkPipeline* pPipeline) { NULLDRV_LOG_FUNC; @@ -1774,7 +1774,7 @@ ICD_EXPORT VkResult VKAPI vkCreateComputePipelines( VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkComputePipelineCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkPipeline* pPipeline) { NULLDRV_LOG_FUNC; @@ -1788,7 +1788,7 @@ ICD_EXPORT VkResult VKAPI vkCreateComputePipelines( ICD_EXPORT VkResult VKAPI vkCreateQueryPool( VkDevice device, const VkQueryPoolCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkQueryPool* pQueryPool) { NULLDRV_LOG_FUNC; @@ -1798,7 +1798,7 @@ ICD_EXPORT VkResult VKAPI vkCreateQueryPool( ICD_EXPORT void VKAPI vkDestroyQueryPool( VkDevice device, VkQueryPool queryPoool, - const VkAllocCallbacks* pAllocator) + const VkAllocationCallbacks* pAllocator) { NULLDRV_LOG_FUNC; } @@ -1837,7 +1837,7 @@ ICD_EXPORT VkResult VKAPI vkQueueSubmit( ICD_EXPORT VkResult VKAPI vkCreateSemaphore( VkDevice device, const VkSemaphoreCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkSemaphore* pSemaphore) { NULLDRV_LOG_FUNC; @@ -1847,7 +1847,7 @@ ICD_EXPORT VkResult VKAPI vkCreateSemaphore( ICD_EXPORT void VKAPI vkDestroySemaphore( VkDevice device, VkSemaphore semaphore, - const VkAllocCallbacks* pAllocator) + const VkAllocationCallbacks* pAllocator) { NULLDRV_LOG_FUNC; } @@ -1855,7 +1855,7 @@ ICD_EXPORT void VKAPI vkDestroySemaphore( ICD_EXPORT VkResult VKAPI vkCreateSampler( VkDevice device, const VkSamplerCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkSampler* pSampler) { NULLDRV_LOG_FUNC; @@ -1868,7 +1868,7 @@ ICD_EXPORT VkResult VKAPI vkCreateSampler( ICD_EXPORT void VKAPI vkDestroySampler( VkDevice device, VkSampler sampler, - const VkAllocCallbacks* pAllocator) + const VkAllocationCallbacks* pAllocator) { NULLDRV_LOG_FUNC; } @@ -1876,7 +1876,7 @@ ICD_EXPORT void VKAPI vkDestroySampler( ICD_EXPORT VkResult VKAPI vkCreateShaderModule( VkDevice device, const VkShaderModuleCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkShaderModule* pShaderModule) { // TODO: Fill in with real data @@ -1887,7 +1887,7 @@ ICD_EXPORT VkResult VKAPI vkCreateShaderModule( ICD_EXPORT void VKAPI vkDestroyShaderModule( VkDevice device, VkShaderModule shaderModule, - const VkAllocCallbacks* pAllocator) + const VkAllocationCallbacks* pAllocator) { // TODO: Fill in with real data NULLDRV_LOG_FUNC; @@ -1896,7 +1896,7 @@ ICD_EXPORT void VKAPI vkDestroyShaderModule( ICD_EXPORT VkResult VKAPI vkCreateShader( VkDevice device, const VkShaderCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkShader* pShader) { NULLDRV_LOG_FUNC; @@ -1908,7 +1908,7 @@ ICD_EXPORT VkResult VKAPI vkCreateShader( ICD_EXPORT void VKAPI vkDestroyShader( VkDevice device, VkShader shader, - const VkAllocCallbacks* pAllocator) + const VkAllocationCallbacks* pAllocator) { NULLDRV_LOG_FUNC; } @@ -1916,7 +1916,7 @@ ICD_EXPORT void VKAPI vkDestroyShader( ICD_EXPORT VkResult VKAPI vkCreateBufferView( VkDevice device, const VkBufferViewCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkBufferView* pView) { NULLDRV_LOG_FUNC; @@ -1929,7 +1929,7 @@ ICD_EXPORT VkResult VKAPI vkCreateBufferView( ICD_EXPORT void VKAPI vkDestroyBufferView( VkDevice device, VkBufferView bufferView, - const VkAllocCallbacks* pAllocator) + const VkAllocationCallbacks* pAllocator) { NULLDRV_LOG_FUNC; } @@ -1937,7 +1937,7 @@ ICD_EXPORT void VKAPI vkDestroyBufferView( ICD_EXPORT VkResult VKAPI vkCreateImageView( VkDevice device, const VkImageViewCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkImageView* pView) { NULLDRV_LOG_FUNC; @@ -1950,7 +1950,7 @@ ICD_EXPORT VkResult VKAPI vkCreateImageView( ICD_EXPORT void VKAPI vkDestroyImageView( VkDevice device, VkImageView imageView, - const VkAllocCallbacks* pAllocator) + const VkAllocationCallbacks* pAllocator) { NULLDRV_LOG_FUNC; } @@ -1958,7 +1958,7 @@ ICD_EXPORT void VKAPI vkDestroyImageView( ICD_EXPORT VkResult VKAPI vkCreateDescriptorSetLayout( VkDevice device, const VkDescriptorSetLayoutCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkDescriptorSetLayout* pSetLayout) { NULLDRV_LOG_FUNC; @@ -1971,7 +1971,7 @@ ICD_EXPORT VkResult VKAPI vkCreateDescriptorSetLayout( ICD_EXPORT void VKAPI vkDestroyDescriptorSetLayout( VkDevice device, VkDescriptorSetLayout descriptorSetLayout, - const VkAllocCallbacks* pAllocator) + const VkAllocationCallbacks* pAllocator) { NULLDRV_LOG_FUNC; } @@ -1979,7 +1979,7 @@ ICD_EXPORT void VKAPI vkDestroyDescriptorSetLayout( ICD_EXPORT VkResult VKAPI vkCreatePipelineLayout( VkDevice device, const VkPipelineLayoutCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkPipelineLayout* pPipelineLayout) { NULLDRV_LOG_FUNC; @@ -1993,7 +1993,7 @@ ICD_EXPORT VkResult VKAPI vkCreatePipelineLayout( ICD_EXPORT void VKAPI vkDestroyPipelineLayout( VkDevice device, VkPipelineLayout pipelineLayout, - const VkAllocCallbacks* pAllocator) + const VkAllocationCallbacks* pAllocator) { NULLDRV_LOG_FUNC; } @@ -2001,7 +2001,7 @@ ICD_EXPORT void VKAPI vkDestroyPipelineLayout( ICD_EXPORT VkResult VKAPI vkCreateDescriptorPool( VkDevice device, const VkDescriptorPoolCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkDescriptorPool* pDescriptorPool) { NULLDRV_LOG_FUNC; @@ -2014,7 +2014,7 @@ ICD_EXPORT VkResult VKAPI vkCreateDescriptorPool( ICD_EXPORT void VKAPI vkDestroyDescriptorPool( VkDevice device, VkDescriptorPool descriptorPool, - const VkAllocCallbacks* pAllocator) + const VkAllocationCallbacks* pAllocator) { NULLDRV_LOG_FUNC; } @@ -2028,20 +2028,20 @@ ICD_EXPORT VkResult VKAPI vkResetDescriptorPool( return VK_SUCCESS; } -ICD_EXPORT VkResult VKAPI vkAllocDescriptorSets( +ICD_EXPORT VkResult VKAPI vkAllocateDescriptorSets( VkDevice device, - const VkDescriptorSetAllocInfo* pAllocInfo, + const VkDescriptorSetAllocateInfo* pAllocateInfo, VkDescriptorSet* pDescriptorSets) { NULLDRV_LOG_FUNC; - struct nulldrv_desc_pool *pool = nulldrv_desc_pool(pAllocInfo->descriptorPool); + struct nulldrv_desc_pool *pool = nulldrv_desc_pool(pAllocateInfo->descriptorPool); struct nulldrv_dev *dev = pool->dev; VkResult ret = VK_SUCCESS; uint32_t i; - for (i = 0; i < pAllocInfo->setLayoutCount; i++) { + for (i = 0; i < pAllocateInfo->setLayoutCount; i++) { const struct nulldrv_desc_layout *layout = - nulldrv_desc_layout(pAllocInfo->pSetLayouts[i]); + nulldrv_desc_layout(pAllocateInfo->pSetLayouts[i]); ret = nulldrv_desc_set_create(dev, pool, layout, (struct nulldrv_desc_set **) &pDescriptorSets[i]); @@ -2075,7 +2075,7 @@ ICD_EXPORT void VKAPI vkUpdateDescriptorSets( ICD_EXPORT VkResult VKAPI vkCreateFramebuffer( VkDevice device, const VkFramebufferCreateInfo* info, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkFramebuffer* fb_ret) { NULLDRV_LOG_FUNC; @@ -2087,7 +2087,7 @@ ICD_EXPORT VkResult VKAPI vkCreateFramebuffer( ICD_EXPORT void VKAPI vkDestroyFramebuffer( VkDevice device, VkFramebuffer framebuffer, - const VkAllocCallbacks* pAllocator) + const VkAllocationCallbacks* pAllocator) { NULLDRV_LOG_FUNC; } @@ -2095,7 +2095,7 @@ ICD_EXPORT void VKAPI vkDestroyFramebuffer( ICD_EXPORT VkResult VKAPI vkCreateRenderPass( VkDevice device, const VkRenderPassCreateInfo* info, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkRenderPass* rp_ret) { NULLDRV_LOG_FUNC; @@ -2107,13 +2107,13 @@ ICD_EXPORT VkResult VKAPI vkCreateRenderPass( ICD_EXPORT void VKAPI vkDestroyRenderPass( VkDevice device, VkRenderPass renderPass, - const VkAllocCallbacks* pAllocator) + const VkAllocationCallbacks* pAllocator) { NULLDRV_LOG_FUNC; } ICD_EXPORT void VKAPI vkCmdPushConstants( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, uint32_t offset, @@ -2133,7 +2133,7 @@ ICD_EXPORT void VKAPI vkGetRenderAreaGranularity( } ICD_EXPORT void VKAPI vkCmdBeginRenderPass( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo* pRenderPassBegin, VkRenderPassContents contents) { @@ -2141,22 +2141,22 @@ ICD_EXPORT void VKAPI vkCmdBeginRenderPass( } ICD_EXPORT void VKAPI vkCmdNextSubpass( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkRenderPassContents contents) { NULLDRV_LOG_FUNC; } ICD_EXPORT void VKAPI vkCmdEndRenderPass( - VkCmdBuffer cmdBuffer) + VkCommandBuffer commandBuffer) { NULLDRV_LOG_FUNC; } ICD_EXPORT void VKAPI vkCmdExecuteCommands( - VkCmdBuffer cmdBuffer, - uint32_t cmdBuffersCount, - const VkCmdBuffer* pCmdBuffers) + VkCommandBuffer commandBuffer, + uint32_t commandBuffersCount, + const VkCommandBuffer* pCommandBuffers) { NULLDRV_LOG_FUNC; } diff --git a/include/vk_debug_marker_lunarg.h b/include/vk_debug_marker_lunarg.h index c4579597..cc53cc7f 100644 --- a/include/vk_debug_marker_lunarg.h +++ b/include/vk_debug_marker_lunarg.h @@ -60,8 +60,8 @@ extern "C" // ------------------------------------------------------------------------------------------------ // API functions -typedef void (VKAPI *PFN_vkCmdDbgMarkerBegin)(VkCmdBuffer cmdBuffer, const char* pMarker); -typedef void (VKAPI *PFN_vkCmdDbgMarkerEnd)(VkCmdBuffer cmdBuffer); +typedef void (VKAPI *PFN_vkCmdDbgMarkerBegin)(VkCommandBuffer commandBuffer, const char* pMarker); +typedef void (VKAPI *PFN_vkCmdDbgMarkerEnd)(VkCommandBuffer commandBuffer); typedef VkResult (VKAPI *PFN_vkDbgSetObjectTag)(VkDevice device, VkDbgObjectType objType, uint64_t object, size_t tagSize, const void* pTag); typedef VkResult (VKAPI *PFN_vkDbgSetObjectName)(VkDevice device, VkDbgObjectType objType, uint64_t object, size_t nameSize, const char* pName); @@ -69,11 +69,11 @@ typedef VkResult (VKAPI *PFN_vkDbgSetObjectName)(VkDevice device, VkDbgObjectTyp // DebugMarker extension entrypoints void VKAPI vkCmdDbgMarkerBegin( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, const char* pMarker); void VKAPI vkCmdDbgMarkerEnd( - VkCmdBuffer cmdBuffer); + VkCommandBuffer commandBuffer); VkResult VKAPI vkDbgSetObjectTag( VkDevice device, diff --git a/include/vk_debug_report_lunarg.h b/include/vk_debug_report_lunarg.h index 23bb63ca..04c6fd5b 100644 --- a/include/vk_debug_report_lunarg.h +++ b/include/vk_debug_report_lunarg.h @@ -74,16 +74,16 @@ typedef enum { VK_OBJECT_TYPE_RENDER_PASS = 25, VK_OBJECT_TYPE_PIPELINE_CACHE = 26, VK_OBJECT_TYPE_SWAPCHAIN_KHR = 27, - VK_OBJECT_TYPE_CMD_POOL = 28, + VK_OBJECT_TYPE_COMMAND_POOL = 28, VK_OBJECT_TYPE_BEGIN_RANGE = VK_OBJECT_TYPE_INSTANCE, - VK_OBJECT_TYPE_END_RANGE = VK_OBJECT_TYPE_CMD_POOL, - VK_OBJECT_TYPE_NUM = (VK_OBJECT_TYPE_CMD_POOL - VK_OBJECT_TYPE_INSTANCE + 1), + VK_OBJECT_TYPE_END_RANGE = VK_OBJECT_TYPE_COMMAND_POOL, + VK_OBJECT_TYPE_NUM = (VK_OBJECT_TYPE_COMMAND_POOL - VK_OBJECT_TYPE_INSTANCE + 1), VK_OBJECT_TYPE_MAX_ENUM = 0x7FFFFFFF } VkDbgObjectType; #define VK_DEBUG_REPORT_EXTENSION_NAME "DEBUG_REPORT" -VK_DEFINE_NONDISP_HANDLE(VkDbgMsgCallback) +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDbgMsgCallback) // ------------------------------------------------------------------------------------------------ // Enumerations diff --git a/include/vk_ext_khr_device_swapchain.h b/include/vk_ext_khr_device_swapchain.h index 3bf73c84..af95ff0c 100644 --- a/include/vk_ext_khr_device_swapchain.h +++ b/include/vk_ext_khr_device_swapchain.h @@ -41,7 +41,7 @@ extern "C" // ------------------------------------------------------------------------------------------------ // Objects -VK_DEFINE_NONDISP_HANDLE(VkSwapchainKHR); +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSwapchainKHR); // ------------------------------------------------------------------------------------------------ // Enumeration constants diff --git a/include/vk_layer.h b/include/vk_layer.h index 8fc494f1..2035a8be 100644 --- a/include/vk_layer.h +++ b/include/vk_layer.h @@ -35,7 +35,7 @@ typedef struct VkLayerDispatchTable_ PFN_vkQueueSubmit QueueSubmit; PFN_vkQueueWaitIdle QueueWaitIdle; PFN_vkDeviceWaitIdle DeviceWaitIdle; - PFN_vkAllocMemory AllocMemory; + PFN_vkAllocateMemory AllocateMemory; PFN_vkFreeMemory FreeMemory; PFN_vkMapMemory MapMemory; PFN_vkUnmapMemory UnmapMemory; @@ -92,7 +92,7 @@ typedef struct VkLayerDispatchTable_ PFN_vkCreateDescriptorPool CreateDescriptorPool; PFN_vkDestroyDescriptorPool DestroyDescriptorPool; PFN_vkResetDescriptorPool ResetDescriptorPool; - PFN_vkAllocDescriptorSets AllocDescriptorSets; + PFN_vkAllocateDescriptorSets AllocateDescriptorSets; PFN_vkFreeDescriptorSets FreeDescriptorSets; PFN_vkUpdateDescriptorSets UpdateDescriptorSets; PFN_vkCreateFramebuffer CreateFramebuffer; @@ -103,7 +103,7 @@ typedef struct VkLayerDispatchTable_ PFN_vkCreateCommandPool CreateCommandPool; PFN_vkDestroyCommandPool DestroyCommandPool; PFN_vkResetCommandPool ResetCommandPool; - PFN_vkAllocCommandBuffers AllocCommandBuffers; + PFN_vkAllocateCommandBuffers AllocateCommandBuffers; PFN_vkFreeCommandBuffers FreeCommandBuffers; PFN_vkBeginCommandBuffer BeginCommandBuffer; PFN_vkEndCommandBuffer EndCommandBuffer; diff --git a/include/vulkan.h b/include/vulkan.h index 8c7977c6..1a637390 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -52,9 +52,9 @@ extern "C" { #if defined(__LP64__) || defined(_WIN64) || defined(__x86_64__) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__) - #define VK_DEFINE_NONDISP_HANDLE(obj) typedef struct obj##_T *obj; + #define VK_DEFINE_NON_DISPATCHABLE_HANDLE(obj) typedef struct obj##_T *obj; #else - #define VK_DEFINE_NONDISP_HANDLE(obj) typedef uint64_t obj; + #define VK_DEFINE_NON_DISPATCHABLE_HANDLE(obj) typedef uint64_t obj; #endif @@ -68,28 +68,28 @@ VK_DEFINE_HANDLE(VkInstance) VK_DEFINE_HANDLE(VkPhysicalDevice) VK_DEFINE_HANDLE(VkDevice) VK_DEFINE_HANDLE(VkQueue) -VK_DEFINE_NONDISP_HANDLE(VkSemaphore) -VK_DEFINE_HANDLE(VkCmdBuffer) -VK_DEFINE_NONDISP_HANDLE(VkFence) -VK_DEFINE_NONDISP_HANDLE(VkDeviceMemory) -VK_DEFINE_NONDISP_HANDLE(VkBuffer) -VK_DEFINE_NONDISP_HANDLE(VkImage) -VK_DEFINE_NONDISP_HANDLE(VkEvent) -VK_DEFINE_NONDISP_HANDLE(VkQueryPool) -VK_DEFINE_NONDISP_HANDLE(VkBufferView) -VK_DEFINE_NONDISP_HANDLE(VkImageView) -VK_DEFINE_NONDISP_HANDLE(VkShaderModule) -VK_DEFINE_NONDISP_HANDLE(VkShader) -VK_DEFINE_NONDISP_HANDLE(VkPipelineCache) -VK_DEFINE_NONDISP_HANDLE(VkPipelineLayout) -VK_DEFINE_NONDISP_HANDLE(VkRenderPass) -VK_DEFINE_NONDISP_HANDLE(VkPipeline) -VK_DEFINE_NONDISP_HANDLE(VkDescriptorSetLayout) -VK_DEFINE_NONDISP_HANDLE(VkSampler) -VK_DEFINE_NONDISP_HANDLE(VkDescriptorPool) -VK_DEFINE_NONDISP_HANDLE(VkDescriptorSet) -VK_DEFINE_NONDISP_HANDLE(VkFramebuffer) -VK_DEFINE_NONDISP_HANDLE(VkCmdPool) +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSemaphore) +VK_DEFINE_HANDLE(VkCommandBuffer) +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkFence) +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDeviceMemory) +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkBuffer) +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkImage) +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkEvent) +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkQueryPool) +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkBufferView) +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkImageView) +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkShaderModule) +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkShader) +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkPipelineCache) +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkPipelineLayout) +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkRenderPass) +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkPipeline) +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDescriptorSetLayout) +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSampler) +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDescriptorPool) +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDescriptorSet) +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkFramebuffer) +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkCommandPool) #define VK_LOD_CLAMP_NONE 1000.0f #define VK_REMAINING_MIP_LEVELS (~0U) @@ -171,9 +171,9 @@ typedef enum { VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET = 37, VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO = 38, VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO = 39, - VK_STRUCTURE_TYPE_CMD_POOL_CREATE_INFO = 40, - VK_STRUCTURE_TYPE_CMD_BUFFER_ALLOC_INFO = 41, - VK_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO = 42, + VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO = 40, + VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOC_INFO = 41, + VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO = 42, VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO = 43, VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER = 44, VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER = 45, @@ -187,16 +187,16 @@ typedef enum { } VkStructureType; typedef enum { - VK_SYSTEM_ALLOC_SCOPE_FUNCTION = 0, - VK_SYSTEM_ALLOC_SCOPE_OBJECT = 1, - VK_SYSTEM_ALLOC_SCOPE_CACHE = 2, - VK_SYSTEM_ALLOC_SCOPE_DEVICE = 3, - VK_SYSTEM_ALLOC_SCOPE_INSTANCE = 4, - VK_SYSTEM_ALLOC_SCOPE_BEGIN_RANGE = VK_SYSTEM_ALLOC_SCOPE_FUNCTION, - VK_SYSTEM_ALLOC_SCOPE_END_RANGE = VK_SYSTEM_ALLOC_SCOPE_INSTANCE, - VK_SYSTEM_ALLOC_SCOPE_NUM = (VK_SYSTEM_ALLOC_SCOPE_INSTANCE - VK_SYSTEM_ALLOC_SCOPE_FUNCTION + 1), - VK_SYSTEM_ALLOC_SCOPE_MAX_ENUM = 0x7FFFFFFF -} VkSystemAllocScope; + VK_SYSTEM_ALLOCATION_SCOPE_FUNCTION = 0, + VK_SYSTEM_ALLOCATION_SCOPE_OBJECT = 1, + VK_SYSTEM_ALLOCATION_SCOPE_CACHE = 2, + VK_SYSTEM_ALLOCATION_SCOPE_DEVICE = 3, + VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE = 4, + VK_SYSTEM_ALLOCATION_SCOPE_BEGIN_RANGE = VK_SYSTEM_ALLOCATION_SCOPE_FUNCTION, + VK_SYSTEM_ALLOCATION_SCOPE_END_RANGE = VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE, + VK_SYSTEM_ALLOCATION_SCOPE_NUM = (VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE - VK_SYSTEM_ALLOCATION_SCOPE_FUNCTION + 1), + VK_SYSTEM_ALLOCATION_SCOPE_MAX_ENUM = 0x7FFFFFFF +} VkSystemAllocationScope; typedef enum { VK_INTERNAL_ALLOC_TYPE_EXECUTABLE = 0, @@ -383,7 +383,7 @@ typedef enum { VK_FORMAT_B10G10R10A2_SINT = 173, VK_FORMAT_BEGIN_RANGE = VK_FORMAT_UNDEFINED, VK_FORMAT_END_RANGE = VK_FORMAT_B10G10R10A2_SINT, - VK_FORMAT_NUM = (VK_FORMAT_B10G10R10A2_SINT - VK_FORMAT_UNDEFINED + 1), + VK_FORMAT_RANGE_SIZE = (VK_FORMAT_B10G10R10A2_SINT - VK_FORMAT_UNDEFINED + 1), VK_FORMAT_MAX_ENUM = 0x7FFFFFFF } VkFormat; @@ -393,7 +393,7 @@ typedef enum { VK_IMAGE_TYPE_3D = 2, VK_IMAGE_TYPE_BEGIN_RANGE = VK_IMAGE_TYPE_1D, VK_IMAGE_TYPE_END_RANGE = VK_IMAGE_TYPE_3D, - VK_IMAGE_TYPE_NUM = (VK_IMAGE_TYPE_3D - VK_IMAGE_TYPE_1D + 1), + VK_IMAGE_TYPE_RANGE_SIZE = (VK_IMAGE_TYPE_3D - VK_IMAGE_TYPE_1D + 1), VK_IMAGE_TYPE_MAX_ENUM = 0x7FFFFFFF } VkImageType; @@ -444,8 +444,8 @@ typedef enum { VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL = 3, VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL = 4, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL = 5, - VK_IMAGE_LAYOUT_TRANSFER_SOURCE_OPTIMAL = 6, - VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL = 7, + VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL = 6, + VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL = 7, VK_IMAGE_LAYOUT_PREINITIALIZED = 8, VK_IMAGE_LAYOUT_BEGIN_RANGE = VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_END_RANGE = VK_IMAGE_LAYOUT_PREINITIALIZED, @@ -497,10 +497,10 @@ typedef enum { VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST = 3, VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP = 4, VK_PRIMITIVE_TOPOLOGY_TRIANGLE_FAN = 5, - VK_PRIMITIVE_TOPOLOGY_LINE_LIST_ADJ = 6, - VK_PRIMITIVE_TOPOLOGY_LINE_STRIP_ADJ = 7, - VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST_ADJ = 8, - VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP_ADJ = 9, + VK_PRIMITIVE_TOPOLOGY_LINE_LIST_WITH_ADJACENCY = 6, + VK_PRIMITIVE_TOPOLOGY_LINE_STRIP_WITH_ADJACENCY = 7, + VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST_WITH_ADJACENCY = 8, + VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP_WITH_ADJACENCY = 9, VK_PRIMITIVE_TOPOLOGY_PATCH = 10, VK_PRIMITIVE_TOPOLOGY_BEGIN_RANGE = VK_PRIMITIVE_TOPOLOGY_POINT_LIST, VK_PRIMITIVE_TOPOLOGY_END_RANGE = VK_PRIMITIVE_TOPOLOGY_PATCH, @@ -519,11 +519,11 @@ typedef enum { } VkFillMode; typedef enum { - VK_FRONT_FACE_CCW = 0, - VK_FRONT_FACE_CW = 1, - VK_FRONT_FACE_BEGIN_RANGE = VK_FRONT_FACE_CCW, - VK_FRONT_FACE_END_RANGE = VK_FRONT_FACE_CW, - VK_FRONT_FACE_NUM = (VK_FRONT_FACE_CW - VK_FRONT_FACE_CCW + 1), + VK_FRONT_FACE_COUNTER_CLOCKWISE = 0, + VK_FRONT_FACE_CLOCKWISE = 1, + VK_FRONT_FACE_BEGIN_RANGE = VK_FRONT_FACE_COUNTER_CLOCKWISE, + VK_FRONT_FACE_END_RANGE = VK_FRONT_FACE_CLOCKWISE, + VK_FRONT_FACE_NUM = (VK_FRONT_FACE_CLOCKWISE - VK_FRONT_FACE_COUNTER_CLOCKWISE + 1), VK_FRONT_FACE_MAX_ENUM = 0x7FFFFFFF } VkFrontFace; @@ -531,10 +531,10 @@ typedef enum { VK_COMPARE_OP_NEVER = 0, VK_COMPARE_OP_LESS = 1, VK_COMPARE_OP_EQUAL = 2, - VK_COMPARE_OP_LESS_EQUAL = 3, + VK_COMPARE_OP_LESS_OR_EQUAL = 3, VK_COMPARE_OP_GREATER = 4, VK_COMPARE_OP_NOT_EQUAL = 5, - VK_COMPARE_OP_GREATER_EQUAL = 6, + VK_COMPARE_OP_GREATER_OR_EQUAL = 6, VK_COMPARE_OP_ALWAYS = 7, VK_COMPARE_OP_BEGIN_RANGE = VK_COMPARE_OP_NEVER, VK_COMPARE_OP_END_RANGE = VK_COMPARE_OP_ALWAYS, @@ -546,14 +546,14 @@ typedef enum { VK_STENCIL_OP_KEEP = 0, VK_STENCIL_OP_ZERO = 1, VK_STENCIL_OP_REPLACE = 2, - VK_STENCIL_OP_INC_CLAMP = 3, - VK_STENCIL_OP_DEC_CLAMP = 4, + VK_STENCIL_OP_INCREMENT_AND_CLAMP = 3, + VK_STENCIL_OP_DECREMENT_AND_CLAMP = 4, VK_STENCIL_OP_INVERT = 5, - VK_STENCIL_OP_INC_WRAP = 6, - VK_STENCIL_OP_DEC_WRAP = 7, + VK_STENCIL_OP_INCREMENT_AND_WRAP = 6, + VK_STENCIL_OP_DECREMENT_AND_WRAP = 7, VK_STENCIL_OP_BEGIN_RANGE = VK_STENCIL_OP_KEEP, - VK_STENCIL_OP_END_RANGE = VK_STENCIL_OP_DEC_WRAP, - VK_STENCIL_OP_NUM = (VK_STENCIL_OP_DEC_WRAP - VK_STENCIL_OP_KEEP + 1), + VK_STENCIL_OP_END_RANGE = VK_STENCIL_OP_DECREMENT_AND_WRAP, + VK_STENCIL_OP_NUM = (VK_STENCIL_OP_DECREMENT_AND_WRAP - VK_STENCIL_OP_KEEP + 1), VK_STENCIL_OP_MAX_ENUM = 0x7FFFFFFF } VkStencilOp; @@ -563,11 +563,11 @@ typedef enum { VK_LOGIC_OP_AND_REVERSE = 2, VK_LOGIC_OP_COPY = 3, VK_LOGIC_OP_AND_INVERTED = 4, - VK_LOGIC_OP_NOOP = 5, + VK_LOGIC_OP_NO_OP = 5, VK_LOGIC_OP_XOR = 6, VK_LOGIC_OP_OR = 7, VK_LOGIC_OP_NOR = 8, - VK_LOGIC_OP_EQUIV = 9, + VK_LOGIC_OP_EQUIVALENT = 9, VK_LOGIC_OP_INVERT = 10, VK_LOGIC_OP_OR_REVERSE = 11, VK_LOGIC_OP_COPY_INVERTED = 12, @@ -585,12 +585,12 @@ typedef enum { VK_BLEND_ONE = 1, VK_BLEND_SRC_COLOR = 2, VK_BLEND_ONE_MINUS_SRC_COLOR = 3, - VK_BLEND_DEST_COLOR = 4, - VK_BLEND_ONE_MINUS_DEST_COLOR = 5, + VK_BLEND_DST_COLOR = 4, + VK_BLEND_ONE_MINUS_DST_COLOR = 5, VK_BLEND_SRC_ALPHA = 6, VK_BLEND_ONE_MINUS_SRC_ALPHA = 7, - VK_BLEND_DEST_ALPHA = 8, - VK_BLEND_ONE_MINUS_DEST_ALPHA = 9, + VK_BLEND_DST_ALPHA = 8, + VK_BLEND_ONE_MINUS_DST_ALPHA = 9, VK_BLEND_CONSTANT_COLOR = 10, VK_BLEND_ONE_MINUS_CONSTANT_COLOR = 11, VK_BLEND_CONSTANT_ALPHA = 12, @@ -630,7 +630,7 @@ typedef enum { VK_DYNAMIC_STATE_STENCIL_REFERENCE = 8, VK_DYNAMIC_STATE_BEGIN_RANGE = VK_DYNAMIC_STATE_VIEWPORT, VK_DYNAMIC_STATE_END_RANGE = VK_DYNAMIC_STATE_STENCIL_REFERENCE, - VK_DYNAMIC_STATE_NUM = (VK_DYNAMIC_STATE_STENCIL_REFERENCE - VK_DYNAMIC_STATE_VIEWPORT + 1), + VK_DYNAMIC_STATE_RANGE_SIZE = (VK_DYNAMIC_STATE_STENCIL_REFERENCE - VK_DYNAMIC_STATE_VIEWPORT + 1), VK_DYNAMIC_STATE_MAX_ENUM = 0x7FFFFFFF } VkDynamicState; @@ -720,18 +720,18 @@ typedef enum { VK_PIPELINE_BIND_POINT_COMPUTE = 1, VK_PIPELINE_BIND_POINT_BEGIN_RANGE = VK_PIPELINE_BIND_POINT_GRAPHICS, VK_PIPELINE_BIND_POINT_END_RANGE = VK_PIPELINE_BIND_POINT_COMPUTE, - VK_PIPELINE_BIND_POINT_NUM = (VK_PIPELINE_BIND_POINT_COMPUTE - VK_PIPELINE_BIND_POINT_GRAPHICS + 1), + VK_PIPELINE_BIND_POINT_RANGE_SIZE = (VK_PIPELINE_BIND_POINT_COMPUTE - VK_PIPELINE_BIND_POINT_GRAPHICS + 1), VK_PIPELINE_BIND_POINT_MAX_ENUM = 0x7FFFFFFF } VkPipelineBindPoint; typedef enum { - VK_CMD_BUFFER_LEVEL_PRIMARY = 0, - VK_CMD_BUFFER_LEVEL_SECONDARY = 1, - VK_CMD_BUFFER_LEVEL_BEGIN_RANGE = VK_CMD_BUFFER_LEVEL_PRIMARY, - VK_CMD_BUFFER_LEVEL_END_RANGE = VK_CMD_BUFFER_LEVEL_SECONDARY, - VK_CMD_BUFFER_LEVEL_NUM = (VK_CMD_BUFFER_LEVEL_SECONDARY - VK_CMD_BUFFER_LEVEL_PRIMARY + 1), - VK_CMD_BUFFER_LEVEL_MAX_ENUM = 0x7FFFFFFF -} VkCmdBufferLevel; + VK_COMMAND_BUFFER_LEVEL_PRIMARY = 0, + VK_COMMAND_BUFFER_LEVEL_SECONDARY = 1, + VK_COMMAND_BUFFER_LEVEL_BEGIN_RANGE = VK_COMMAND_BUFFER_LEVEL_PRIMARY, + VK_COMMAND_BUFFER_LEVEL_END_RANGE = VK_COMMAND_BUFFER_LEVEL_SECONDARY, + VK_COMMAND_BUFFER_LEVEL_NUM = (VK_COMMAND_BUFFER_LEVEL_SECONDARY - VK_COMMAND_BUFFER_LEVEL_PRIMARY + 1), + VK_COMMAND_BUFFER_LEVEL_MAX_ENUM = 0x7FFFFFFF +} VkCommandBufferLevel; typedef enum { VK_INDEX_TYPE_UINT16 = 0, @@ -744,10 +744,10 @@ typedef enum { typedef enum { VK_RENDER_PASS_CONTENTS_INLINE = 0, - VK_RENDER_PASS_CONTENTS_SECONDARY_CMD_BUFFERS = 1, + VK_RENDER_PASS_CONTENTS_SECONDARY_COMMAND_BUFFERS = 1, VK_RENDER_PASS_CONTENTS_BEGIN_RANGE = VK_RENDER_PASS_CONTENTS_INLINE, - VK_RENDER_PASS_CONTENTS_END_RANGE = VK_RENDER_PASS_CONTENTS_SECONDARY_CMD_BUFFERS, - VK_RENDER_PASS_CONTENTS_NUM = (VK_RENDER_PASS_CONTENTS_SECONDARY_CMD_BUFFERS - VK_RENDER_PASS_CONTENTS_INLINE + 1), + VK_RENDER_PASS_CONTENTS_END_RANGE = VK_RENDER_PASS_CONTENTS_SECONDARY_COMMAND_BUFFERS, + VK_RENDER_PASS_CONTENTS_NUM = (VK_RENDER_PASS_CONTENTS_SECONDARY_COMMAND_BUFFERS - VK_RENDER_PASS_CONTENTS_INLINE + 1), VK_RENDER_PASS_CONTENTS_MAX_ENUM = 0x7FFFFFFF } VkRenderPassContents; @@ -764,14 +764,14 @@ typedef enum { VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT = 0x00000080, VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT = 0x00000100, VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT = 0x00000200, - VK_FORMAT_FEATURE_BLIT_SOURCE_BIT = 0x00000400, - VK_FORMAT_FEATURE_BLIT_DESTINATION_BIT = 0x00000800, + VK_FORMAT_FEATURE_BLIT_SRC_BIT = 0x00000400, + VK_FORMAT_FEATURE_BLIT_DST_BIT = 0x00000800, } VkFormatFeatureFlagBits; typedef VkFlags VkFormatFeatureFlags; typedef enum { - VK_IMAGE_USAGE_TRANSFER_SOURCE_BIT = 0x00000001, - VK_IMAGE_USAGE_TRANSFER_DESTINATION_BIT = 0x00000002, + VK_IMAGE_USAGE_TRANSFER_SRC_BIT = 0x00000001, + VK_IMAGE_USAGE_TRANSFER_DST_BIT = 0x00000002, VK_IMAGE_USAGE_SAMPLED_BIT = 0x00000004, VK_IMAGE_USAGE_STORAGE_BIT = 0x00000008, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT = 0x00000010, @@ -885,8 +885,8 @@ typedef enum { typedef VkFlags VkBufferCreateFlags; typedef enum { - VK_BUFFER_USAGE_TRANSFER_SOURCE_BIT = 0x00000001, - VK_BUFFER_USAGE_TRANSFER_DESTINATION_BIT = 0x00000002, + VK_BUFFER_USAGE_TRANSFER_SRC_BIT = 0x00000001, + VK_BUFFER_USAGE_TRANSFER_DST_BIT = 0x00000002, VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT = 0x00000004, VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT = 0x00000008, VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT = 0x00000010, @@ -1014,27 +1014,27 @@ typedef enum { typedef VkFlags VkDependencyFlags; typedef enum { - VK_CMD_POOL_CREATE_TRANSIENT_BIT = 0x00000001, - VK_CMD_POOL_CREATE_RESET_COMMAND_BUFFER_BIT = 0x00000002, -} VkCmdPoolCreateFlagBits; -typedef VkFlags VkCmdPoolCreateFlags; + VK_COMMAND_POOL_CREATE_TRANSIENT_BIT = 0x00000001, + VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT = 0x00000002, +} VkCommandPoolCreateFlagBits; +typedef VkFlags VkCommandPoolCreateFlags; typedef enum { - VK_CMD_POOL_RESET_RELEASE_RESOURCES_BIT = 0x00000001, -} VkCmdPoolResetFlagBits; -typedef VkFlags VkCmdPoolResetFlags; + VK_COMMAND_POOL_RESET_RELEASE_RESOURCES_BIT = 0x00000001, +} VkCommandPoolResetFlagBits; +typedef VkFlags VkCommandPoolResetFlags; typedef enum { - VK_CMD_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT = 0x00000001, - VK_CMD_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT = 0x00000002, - VK_CMD_BUFFER_USAGE_SIMULTANEOUS_USE_BIT = 0x00000004, -} VkCmdBufferUsageFlagBits; -typedef VkFlags VkCmdBufferUsageFlags; + VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT = 0x00000001, + VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT = 0x00000002, + VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT = 0x00000004, +} VkCommandBufferUsageFlagBits; +typedef VkFlags VkCommandBufferUsageFlags; typedef enum { - VK_CMD_BUFFER_RESET_RELEASE_RESOURCES_BIT = 0x00000001, -} VkCmdBufferResetFlagBits; -typedef VkFlags VkCmdBufferResetFlags; + VK_COMMAND_BUFFER_RESET_RELEASE_RESOURCES_BIT = 0x00000001, +} VkCommandBufferResetFlagBits; +typedef VkFlags VkCommandBufferResetFlags; typedef enum { VK_STENCIL_FACE_NONE = 0, @@ -1053,38 +1053,38 @@ typedef void* (VKAPI *PFN_vkAllocFunction)( void* pUserData, size_t size, size_t alignment, - VkSystemAllocScope allocScope); + VkSystemAllocationScope allocationScope); typedef void* (VKAPI *PFN_vkReallocFunction)( void* pUserData, void* pOriginal, size_t size, size_t alignment, - VkSystemAllocScope allocScope); + VkSystemAllocationScope allocationScope); typedef void (VKAPI *PFN_vkFreeFunction)( void* pUserData, - void* pMem); + void* pMemory); typedef void (VKAPI *PFN_vkInternalAllocNotification)( void* pUserData, size_t size, - VkInternalAllocType allocType, - VkSystemAllocScope allocScope); + VkInternalAllocType allocationType, + VkSystemAllocationScope allocationScope); typedef void (VKAPI *PFN_vkInternalFreeNotification)( void* pUserData, size_t size, - VkInternalAllocType allocType, - VkSystemAllocScope allocScope); + VkInternalAllocType allocationType, + VkSystemAllocationScope allocationScope); typedef void (VKAPI *PFN_vkVoidFunction)(void); typedef struct { VkStructureType sType; const void* pNext; - const char* pAppName; - uint32_t appVersion; + const char* pApplicationName; + uint32_t applicationVersion; const char* pEngineName; uint32_t engineVersion; uint32_t apiVersion; @@ -1094,7 +1094,7 @@ typedef struct { VkStructureType sType; const void* pNext; VkInstanceCreateFlags flags; - const VkApplicationInfo* pAppInfo; + const VkApplicationInfo* pApplicationInfo; uint32_t enabledLayerNameCount; const char*const* ppEnabledLayerNames; uint32_t enabledExtensionNameCount; @@ -1103,12 +1103,12 @@ typedef struct { typedef struct { void* pUserData; - PFN_vkAllocFunction pfnAlloc; - PFN_vkReallocFunction pfnRealloc; + PFN_vkAllocFunction pfnAllocation; + PFN_vkReallocFunction pfnReallocation; PFN_vkFreeFunction pfnFree; PFN_vkInternalAllocNotification pfnInternalAlloc; PFN_vkInternalFreeNotification pfnInternalFree; -} VkAllocCallbacks; +} VkAllocationCallbacks; typedef struct { VkBool32 robustBufferAccess; @@ -1118,7 +1118,7 @@ typedef struct { VkBool32 geometryShader; VkBool32 tessellationShader; VkBool32 sampleRateShading; - VkBool32 dualSourceBlend; + VkBool32 dualSrcBlend; VkBool32 logicOp; VkBool32 multiDrawIndirect; VkBool32 depthClamp; @@ -1215,7 +1215,7 @@ typedef struct { uint32_t maxVertexInputAttributeOffset; uint32_t maxVertexInputBindingStride; uint32_t maxVertexOutputComponents; - uint32_t maxTessellationGenLevel; + uint32_t maxTessellationGenerationLevel; uint32_t maxTessellationPatchSize; uint32_t maxTessellationControlPerVertexInputComponents; uint32_t maxTessellationControlPerVertexOutputComponents; @@ -1230,7 +1230,7 @@ typedef struct { uint32_t maxGeometryTotalOutputComponents; uint32_t maxFragmentInputComponents; uint32_t maxFragmentOutputAttachments; - uint32_t maxFragmentDualSourceAttachments; + uint32_t maxFragmentDualSrcAttachments; uint32_t maxFragmentCombinedOutputResources; uint32_t maxComputeSharedMemorySize; uint32_t maxComputeWorkGroupCount[3]; @@ -1352,14 +1352,14 @@ typedef struct { } VkDeviceCreateInfo; typedef struct { - char extName[VK_MAX_EXTENSION_NAME]; + char extensionName[VK_MAX_EXTENSION_NAME]; uint32_t specVersion; } VkExtensionProperties; typedef struct { char layerName[VK_MAX_EXTENSION_NAME]; uint32_t specVersion; - uint32_t implVersion; + uint32_t implementationVersion; char description[VK_MAX_DESCRIPTION]; } VkLayerProperties; @@ -1369,7 +1369,7 @@ typedef struct { uint32_t waitSemaphoreCount; const VkSemaphore* pWaitSemaphores; uint32_t commandBufferCount; - const VkCmdBuffer* pCommandBuffers; + const VkCommandBuffer* pCommandBuffers; uint32_t signalSemaphoreCount; const VkSemaphore* pSignalSemaphores; } VkSubmitInfo; @@ -1379,7 +1379,7 @@ typedef struct { const void* pNext; VkDeviceSize allocationSize; uint32_t memoryTypeIndex; -} VkMemoryAllocInfo; +} VkMemoryAllocateInfo; typedef struct { VkStructureType sType; @@ -1413,7 +1413,7 @@ typedef struct { VkDeviceSize resourceOffset; VkDeviceSize size; VkDeviceMemory mem; - VkDeviceSize memOffset; + VkDeviceSize memoryOffset; VkSparseMemoryBindFlags flags; } VkSparseMemoryBind; @@ -1446,7 +1446,7 @@ typedef struct { VkOffset3D offset; VkExtent3D extent; VkDeviceMemory mem; - VkDeviceSize memOffset; + VkDeviceSize memoryOffset; VkSparseMemoryBindFlags flags; } VkSparseImageMemoryBind; @@ -1554,9 +1554,9 @@ typedef struct { typedef struct { VkImageAspectFlags aspectMask; uint32_t baseMipLevel; - uint32_t numLevels; + uint32_t levelCount; uint32_t baseArrayLayer; - uint32_t numLayers; + uint32_t layerCount; } VkImageSubresourceRange; typedef struct { @@ -1702,13 +1702,13 @@ typedef struct { float depthBiasClamp; float depthBiasSlopeFactor; float lineWidth; -} VkPipelineRasterStateCreateInfo; +} VkPipelineRasterizationStateCreateInfo; typedef struct { VkStructureType sType; const void* pNext; VkPipelineMultisampleStateCreateFlags flags; - uint32_t rasterSamples; + uint32_t rasterizationSamples; VkBool32 sampleShadingEnable; float minSampleShading; const VkSampleMask* pSampleMask; @@ -1744,10 +1744,10 @@ typedef struct { typedef struct { VkBool32 blendEnable; VkBlend srcBlendColor; - VkBlend destBlendColor; + VkBlend dstBlendColor; VkBlendOp blendOpColor; VkBlend srcBlendAlpha; - VkBlend destBlendAlpha; + VkBlend dstBlendAlpha; VkBlendOp blendOpAlpha; VkChannelFlags channelWriteMask; } VkPipelineColorBlendAttachmentState; @@ -1781,7 +1781,7 @@ typedef struct { const VkPipelineInputAssemblyStateCreateInfo* pInputAssemblyState; const VkPipelineTessellationStateCreateInfo* pTessellationState; const VkPipelineViewportStateCreateInfo* pViewportState; - const VkPipelineRasterStateCreateInfo* pRasterState; + const VkPipelineRasterizationStateCreateInfo* pRasterizationState; const VkPipelineMultisampleStateCreateInfo* pMultisampleState; const VkPipelineDepthStencilStateCreateInfo* pDepthStencilState; const VkPipelineColorBlendStateCreateInfo* pColorBlendState; @@ -1874,7 +1874,7 @@ typedef struct { VkDescriptorPool descriptorPool; uint32_t setLayoutCount; const VkDescriptorSetLayout* pSetLayouts; -} VkDescriptorSetAllocInfo; +} VkDescriptorSetAllocateInfo; typedef struct { VkSampler sampler; @@ -1891,9 +1891,9 @@ typedef struct { typedef struct { VkStructureType sType; const void* pNext; - VkDescriptorSet destSet; - uint32_t destBinding; - uint32_t destArrayElement; + VkDescriptorSet dstSet; + uint32_t dstBinding; + uint32_t dstArrayElement; uint32_t descriptorCount; VkDescriptorType descriptorType; const VkDescriptorImageInfo* pImageInfo; @@ -1907,9 +1907,9 @@ typedef struct { VkDescriptorSet srcSet; uint32_t srcBinding; uint32_t srcArrayElement; - VkDescriptorSet destSet; - uint32_t destBinding; - uint32_t destArrayElement; + VkDescriptorSet dstSet; + uint32_t dstBinding; + uint32_t dstArrayElement; uint32_t descriptorCount; } VkCopyDescriptorSet; @@ -1957,9 +1957,9 @@ typedef struct { typedef struct { uint32_t srcSubpass; - uint32_t destSubpass; + uint32_t dstSubpass; VkPipelineStageFlags srcStageMask; - VkPipelineStageFlags destStageMask; + VkPipelineStageFlags dstStageMask; VkMemoryOutputFlags outputMask; VkMemoryInputFlags inputMask; VkDependencyFlags dependencyFlags; @@ -1980,30 +1980,30 @@ typedef struct { typedef struct { VkStructureType sType; const void* pNext; - VkCmdPoolCreateFlags flags; + VkCommandPoolCreateFlags flags; uint32_t queueFamilyIndex; -} VkCmdPoolCreateInfo; +} VkCommandPoolCreateInfo; typedef struct { VkStructureType sType; const void* pNext; - VkCmdPool cmdPool; - VkCmdBufferLevel level; + VkCommandPool commandPool; + VkCommandBufferLevel level; uint32_t bufferCount; -} VkCmdBufferAllocInfo; +} VkCommandBufferAllocateInfo; typedef struct { VkStructureType sType; const void* pNext; - VkCmdBufferUsageFlags flags; + VkCommandBufferUsageFlags flags; VkRenderPass renderPass; uint32_t subpass; VkFramebuffer framebuffer; -} VkCmdBufferBeginInfo; +} VkCommandBufferBeginInfo; typedef struct { VkDeviceSize srcOffset; - VkDeviceSize destOffset; + VkDeviceSize dstOffset; VkDeviceSize size; } VkBufferCopy; @@ -2011,14 +2011,14 @@ typedef struct { VkImageAspectFlags aspect; uint32_t mipLevel; uint32_t baseArrayLayer; - uint32_t numLayers; + uint32_t layerCount; } VkImageSubresourceCopy; typedef struct { VkImageSubresourceCopy srcSubresource; VkOffset3D srcOffset; - VkImageSubresourceCopy destSubresource; - VkOffset3D destOffset; + VkImageSubresourceCopy dstSubresource; + VkOffset3D dstOffset; VkExtent3D extent; } VkImageCopy; @@ -2026,8 +2026,8 @@ typedef struct { VkImageSubresourceCopy srcSubresource; VkOffset3D srcOffset; VkExtent3D srcExtent; - VkImageSubresourceCopy destSubresource; - VkOffset3D destOffset; + VkImageSubresourceCopy dstSubresource; + VkOffset3D dstOffset; VkExtent3D destExtent; } VkImageBlit; @@ -2065,14 +2065,14 @@ typedef struct { typedef struct { VkRect2D rect; uint32_t baseArrayLayer; - uint32_t numLayers; + uint32_t layerCount; } VkClearRect; typedef struct { VkImageSubresourceCopy srcSubresource; VkOffset3D srcOffset; - VkImageSubresourceCopy destSubresource; - VkOffset3D destOffset; + VkImageSubresourceCopy dstSubresource; + VkOffset3D dstOffset; VkExtent3D extent; } VkImageResolve; @@ -2092,7 +2092,7 @@ typedef struct { VkMemoryOutputFlags outputMask; VkMemoryInputFlags inputMask; uint32_t srcQueueFamilyIndex; - uint32_t destQueueFamilyIndex; + uint32_t dstQueueFamilyIndex; VkBuffer buffer; VkDeviceSize offset; VkDeviceSize size; @@ -2127,7 +2127,7 @@ typedef struct { VkImageLayout oldLayout; VkImageLayout newLayout; uint32_t srcQueueFamilyIndex; - uint32_t destQueueFamilyIndex; + uint32_t dstQueueFamilyIndex; VkImage image; VkImageSubresourceRange subresourceRange; } VkImageMemoryBarrier; @@ -2140,8 +2140,8 @@ typedef struct { } VkMemoryBarrier; -typedef VkResult (VKAPI *PFN_vkCreateInstance)(const VkInstanceCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkInstance* pInstance); -typedef void (VKAPI *PFN_vkDestroyInstance)(VkInstance instance, const VkAllocCallbacks* pAllocator); +typedef VkResult (VKAPI *PFN_vkCreateInstance)(const VkInstanceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkInstance* pInstance); +typedef void (VKAPI *PFN_vkDestroyInstance)(VkInstance instance, const VkAllocationCallbacks* pAllocator); typedef VkResult (VKAPI *PFN_vkEnumeratePhysicalDevices)(VkInstance instance, uint32_t* pPhysicalDeviceCount, VkPhysicalDevice* pPhysicalDevices); typedef void (VKAPI *PFN_vkGetPhysicalDeviceFeatures)(VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures* pFeatures); typedef void (VKAPI *PFN_vkGetPhysicalDeviceFormatProperties)(VkPhysicalDevice physicalDevice, VkFormat format, VkFormatProperties* pFormatProperties); @@ -2151,8 +2151,8 @@ typedef void (VKAPI *PFN_vkGetPhysicalDeviceQueueFamilyProperties)(VkPhysicalDev typedef void (VKAPI *PFN_vkGetPhysicalDeviceMemoryProperties)(VkPhysicalDevice physicalDevice, VkPhysicalDeviceMemoryProperties* pMemoryProperties); typedef PFN_vkVoidFunction (VKAPI *PFN_vkGetInstanceProcAddr)(VkInstance instance, const char* pName); typedef PFN_vkVoidFunction (VKAPI *PFN_vkGetDeviceProcAddr)(VkDevice device, const char* pName); -typedef VkResult (VKAPI *PFN_vkCreateDevice)(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkDevice* pDevice); -typedef void (VKAPI *PFN_vkDestroyDevice)(VkDevice device, const VkAllocCallbacks* pAllocator); +typedef VkResult (VKAPI *PFN_vkCreateDevice)(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDevice* pDevice); +typedef void (VKAPI *PFN_vkDestroyDevice)(VkDevice device, const VkAllocationCallbacks* pAllocator); typedef VkResult (VKAPI *PFN_vkEnumerateInstanceExtensionProperties)(const char* pLayerName, uint32_t* pPropertyCount, VkExtensionProperties* pProperties); typedef VkResult (VKAPI *PFN_vkEnumerateDeviceExtensionProperties)(VkPhysicalDevice physicalDevice, const char* pLayerName, uint32_t* pPropertyCount, VkExtensionProperties* pProperties); typedef VkResult (VKAPI *PFN_vkEnumerateInstanceLayerProperties)(uint32_t* pPropertyCount, VkLayerProperties* pProperties); @@ -2161,134 +2161,134 @@ typedef void (VKAPI *PFN_vkGetDeviceQueue)(VkDevice device, uint32_t queueFamily typedef VkResult (VKAPI *PFN_vkQueueSubmit)(VkQueue queue, uint32_t submitCount, const VkSubmitInfo* pSubmits, VkFence fence); typedef VkResult (VKAPI *PFN_vkQueueWaitIdle)(VkQueue queue); typedef VkResult (VKAPI *PFN_vkDeviceWaitIdle)(VkDevice device); -typedef VkResult (VKAPI *PFN_vkAllocMemory)(VkDevice device, const VkMemoryAllocInfo* pAllocInfo, const VkAllocCallbacks* pAllocator, VkDeviceMemory* pMem); -typedef void (VKAPI *PFN_vkFreeMemory)(VkDevice device, VkDeviceMemory mem, const VkAllocCallbacks* pAllocator); +typedef VkResult (VKAPI *PFN_vkAllocateMemory)(VkDevice device, const VkMemoryAllocateInfo* pAllocateInfo, const VkAllocationCallbacks* pAllocator, VkDeviceMemory* pMemory); +typedef void (VKAPI *PFN_vkFreeMemory)(VkDevice device, VkDeviceMemory mem, const VkAllocationCallbacks* pAllocator); typedef VkResult (VKAPI *PFN_vkMapMemory)(VkDevice device, VkDeviceMemory mem, VkDeviceSize offset, VkDeviceSize size, VkMemoryMapFlags flags, void** ppData); typedef void (VKAPI *PFN_vkUnmapMemory)(VkDevice device, VkDeviceMemory mem); -typedef VkResult (VKAPI *PFN_vkFlushMappedMemoryRanges)(VkDevice device, uint32_t memRangeCount, const VkMappedMemoryRange* pMemRanges); -typedef VkResult (VKAPI *PFN_vkInvalidateMappedMemoryRanges)(VkDevice device, uint32_t memRangeCount, const VkMappedMemoryRange* pMemRanges); +typedef VkResult (VKAPI *PFN_vkFlushMappedMemoryRanges)(VkDevice device, uint32_t memoryRangeCount, const VkMappedMemoryRange* pMemoryRanges); +typedef VkResult (VKAPI *PFN_vkInvalidateMappedMemoryRanges)(VkDevice device, uint32_t memoryRangeCount, const VkMappedMemoryRange* pMemoryRanges); typedef void (VKAPI *PFN_vkGetDeviceMemoryCommitment)(VkDevice device, VkDeviceMemory memory, VkDeviceSize* pCommittedMemoryInBytes); -typedef VkResult (VKAPI *PFN_vkBindBufferMemory)(VkDevice device, VkBuffer buffer, VkDeviceMemory mem, VkDeviceSize memOffset); -typedef VkResult (VKAPI *PFN_vkBindImageMemory)(VkDevice device, VkImage image, VkDeviceMemory mem, VkDeviceSize memOffset); +typedef VkResult (VKAPI *PFN_vkBindBufferMemory)(VkDevice device, VkBuffer buffer, VkDeviceMemory mem, VkDeviceSize memoryOffset); +typedef VkResult (VKAPI *PFN_vkBindImageMemory)(VkDevice device, VkImage image, VkDeviceMemory mem, VkDeviceSize memoryOffset); typedef void (VKAPI *PFN_vkGetBufferMemoryRequirements)(VkDevice device, VkBuffer buffer, VkMemoryRequirements* pMemoryRequirements); typedef void (VKAPI *PFN_vkGetImageMemoryRequirements)(VkDevice device, VkImage image, VkMemoryRequirements* pMemoryRequirements); typedef void (VKAPI *PFN_vkGetImageSparseMemoryRequirements)(VkDevice device, VkImage image, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements* pSparseMemoryRequirements); typedef void (VKAPI *PFN_vkGetPhysicalDeviceSparseImageFormatProperties)(VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, uint32_t samples, VkImageUsageFlags usage, VkImageTiling tiling, uint32_t* pPropertyCount, VkSparseImageFormatProperties* pProperties); typedef VkResult (VKAPI *PFN_vkQueueBindSparse)(VkQueue queue, uint32_t bindInfoCount, const VkBindSparseInfo* pBindInfo, VkFence fence); -typedef VkResult (VKAPI *PFN_vkCreateFence)(VkDevice device, const VkFenceCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkFence* pFence); -typedef void (VKAPI *PFN_vkDestroyFence)(VkDevice device, VkFence fence, const VkAllocCallbacks* pAllocator); +typedef VkResult (VKAPI *PFN_vkCreateFence)(VkDevice device, const VkFenceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkFence* pFence); +typedef void (VKAPI *PFN_vkDestroyFence)(VkDevice device, VkFence fence, const VkAllocationCallbacks* pAllocator); typedef VkResult (VKAPI *PFN_vkResetFences)(VkDevice device, uint32_t fenceCount, const VkFence* pFences); typedef VkResult (VKAPI *PFN_vkGetFenceStatus)(VkDevice device, VkFence fence); typedef VkResult (VKAPI *PFN_vkWaitForFences)(VkDevice device, uint32_t fenceCount, const VkFence* pFences, VkBool32 waitAll, uint64_t timeout); -typedef VkResult (VKAPI *PFN_vkCreateSemaphore)(VkDevice device, const VkSemaphoreCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkSemaphore* pSemaphore); -typedef void (VKAPI *PFN_vkDestroySemaphore)(VkDevice device, VkSemaphore semaphore, const VkAllocCallbacks* pAllocator); -typedef VkResult (VKAPI *PFN_vkCreateEvent)(VkDevice device, const VkEventCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkEvent* pEvent); -typedef void (VKAPI *PFN_vkDestroyEvent)(VkDevice device, VkEvent event, const VkAllocCallbacks* pAllocator); +typedef VkResult (VKAPI *PFN_vkCreateSemaphore)(VkDevice device, const VkSemaphoreCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSemaphore* pSemaphore); +typedef void (VKAPI *PFN_vkDestroySemaphore)(VkDevice device, VkSemaphore semaphore, const VkAllocationCallbacks* pAllocator); +typedef VkResult (VKAPI *PFN_vkCreateEvent)(VkDevice device, const VkEventCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkEvent* pEvent); +typedef void (VKAPI *PFN_vkDestroyEvent)(VkDevice device, VkEvent event, const VkAllocationCallbacks* pAllocator); typedef VkResult (VKAPI *PFN_vkGetEventStatus)(VkDevice device, VkEvent event); typedef VkResult (VKAPI *PFN_vkSetEvent)(VkDevice device, VkEvent event); typedef VkResult (VKAPI *PFN_vkResetEvent)(VkDevice device, VkEvent event); -typedef VkResult (VKAPI *PFN_vkCreateQueryPool)(VkDevice device, const VkQueryPoolCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkQueryPool* pQueryPool); -typedef void (VKAPI *PFN_vkDestroyQueryPool)(VkDevice device, VkQueryPool queryPool, const VkAllocCallbacks* pAllocator); +typedef VkResult (VKAPI *PFN_vkCreateQueryPool)(VkDevice device, const VkQueryPoolCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkQueryPool* pQueryPool); +typedef void (VKAPI *PFN_vkDestroyQueryPool)(VkDevice device, VkQueryPool queryPool, const VkAllocationCallbacks* pAllocator); typedef VkResult (VKAPI *PFN_vkGetQueryPoolResults)(VkDevice device, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount, size_t dataSize, void* pData, VkDeviceSize stride, VkQueryResultFlags flags); -typedef VkResult (VKAPI *PFN_vkCreateBuffer)(VkDevice device, const VkBufferCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkBuffer* pBuffer); -typedef void (VKAPI *PFN_vkDestroyBuffer)(VkDevice device, VkBuffer buffer, const VkAllocCallbacks* pAllocator); -typedef VkResult (VKAPI *PFN_vkCreateBufferView)(VkDevice device, const VkBufferViewCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkBufferView* pView); -typedef void (VKAPI *PFN_vkDestroyBufferView)(VkDevice device, VkBufferView bufferView, const VkAllocCallbacks* pAllocator); -typedef VkResult (VKAPI *PFN_vkCreateImage)(VkDevice device, const VkImageCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkImage* pImage); -typedef void (VKAPI *PFN_vkDestroyImage)(VkDevice device, VkImage image, const VkAllocCallbacks* pAllocator); +typedef VkResult (VKAPI *PFN_vkCreateBuffer)(VkDevice device, const VkBufferCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkBuffer* pBuffer); +typedef void (VKAPI *PFN_vkDestroyBuffer)(VkDevice device, VkBuffer buffer, const VkAllocationCallbacks* pAllocator); +typedef VkResult (VKAPI *PFN_vkCreateBufferView)(VkDevice device, const VkBufferViewCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkBufferView* pView); +typedef void (VKAPI *PFN_vkDestroyBufferView)(VkDevice device, VkBufferView bufferView, const VkAllocationCallbacks* pAllocator); +typedef VkResult (VKAPI *PFN_vkCreateImage)(VkDevice device, const VkImageCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkImage* pImage); +typedef void (VKAPI *PFN_vkDestroyImage)(VkDevice device, VkImage image, const VkAllocationCallbacks* pAllocator); typedef void (VKAPI *PFN_vkGetImageSubresourceLayout)(VkDevice device, VkImage image, const VkImageSubresource* pSubresource, VkSubresourceLayout* pLayout); -typedef VkResult (VKAPI *PFN_vkCreateImageView)(VkDevice device, const VkImageViewCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkImageView* pView); -typedef void (VKAPI *PFN_vkDestroyImageView)(VkDevice device, VkImageView imageView, const VkAllocCallbacks* pAllocator); -typedef VkResult (VKAPI *PFN_vkCreateShaderModule)(VkDevice device, const VkShaderModuleCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkShaderModule* pShaderModule); -typedef void (VKAPI *PFN_vkDestroyShaderModule)(VkDevice device, VkShaderModule shaderModule, const VkAllocCallbacks* pAllocator); -typedef VkResult (VKAPI *PFN_vkCreateShader)(VkDevice device, const VkShaderCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkShader* pShader); -typedef void (VKAPI *PFN_vkDestroyShader)(VkDevice device, VkShader shader, const VkAllocCallbacks* pAllocator); -typedef VkResult (VKAPI *PFN_vkCreatePipelineCache)(VkDevice device, const VkPipelineCacheCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkPipelineCache* pPipelineCache); -typedef void (VKAPI *PFN_vkDestroyPipelineCache)(VkDevice device, VkPipelineCache pipelineCache, const VkAllocCallbacks* pAllocator); +typedef VkResult (VKAPI *PFN_vkCreateImageView)(VkDevice device, const VkImageViewCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkImageView* pView); +typedef void (VKAPI *PFN_vkDestroyImageView)(VkDevice device, VkImageView imageView, const VkAllocationCallbacks* pAllocator); +typedef VkResult (VKAPI *PFN_vkCreateShaderModule)(VkDevice device, const VkShaderModuleCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkShaderModule* pShaderModule); +typedef void (VKAPI *PFN_vkDestroyShaderModule)(VkDevice device, VkShaderModule shaderModule, const VkAllocationCallbacks* pAllocator); +typedef VkResult (VKAPI *PFN_vkCreateShader)(VkDevice device, const VkShaderCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkShader* pShader); +typedef void (VKAPI *PFN_vkDestroyShader)(VkDevice device, VkShader shader, const VkAllocationCallbacks* pAllocator); +typedef VkResult (VKAPI *PFN_vkCreatePipelineCache)(VkDevice device, const VkPipelineCacheCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkPipelineCache* pPipelineCache); +typedef void (VKAPI *PFN_vkDestroyPipelineCache)(VkDevice device, VkPipelineCache pipelineCache, const VkAllocationCallbacks* pAllocator); typedef VkResult (VKAPI *PFN_vkGetPipelineCacheData)(VkDevice device, VkPipelineCache pipelineCache, size_t* pDataSize, void* pData); -typedef VkResult (VKAPI *PFN_vkMergePipelineCaches)(VkDevice device, VkPipelineCache destCache, uint32_t srcCacheCount, const VkPipelineCache* pSrcCaches); -typedef VkResult (VKAPI *PFN_vkCreateGraphicsPipelines)(VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkGraphicsPipelineCreateInfo* pCreateInfos, const VkAllocCallbacks* pAllocator, VkPipeline* pPipelines); -typedef VkResult (VKAPI *PFN_vkCreateComputePipelines)(VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkComputePipelineCreateInfo* pCreateInfos, const VkAllocCallbacks* pAllocator, VkPipeline* pPipelines); -typedef void (VKAPI *PFN_vkDestroyPipeline)(VkDevice device, VkPipeline pipeline, const VkAllocCallbacks* pAllocator); -typedef VkResult (VKAPI *PFN_vkCreatePipelineLayout)(VkDevice device, const VkPipelineLayoutCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkPipelineLayout* pPipelineLayout); -typedef void (VKAPI *PFN_vkDestroyPipelineLayout)(VkDevice device, VkPipelineLayout pipelineLayout, const VkAllocCallbacks* pAllocator); -typedef VkResult (VKAPI *PFN_vkCreateSampler)(VkDevice device, const VkSamplerCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkSampler* pSampler); -typedef void (VKAPI *PFN_vkDestroySampler)(VkDevice device, VkSampler sampler, const VkAllocCallbacks* pAllocator); -typedef VkResult (VKAPI *PFN_vkCreateDescriptorSetLayout)(VkDevice device, const VkDescriptorSetLayoutCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkDescriptorSetLayout* pSetLayout); -typedef void (VKAPI *PFN_vkDestroyDescriptorSetLayout)(VkDevice device, VkDescriptorSetLayout descriptorSetLayout, const VkAllocCallbacks* pAllocator); -typedef VkResult (VKAPI *PFN_vkCreateDescriptorPool)(VkDevice device, const VkDescriptorPoolCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkDescriptorPool* pDescriptorPool); -typedef void (VKAPI *PFN_vkDestroyDescriptorPool)(VkDevice device, VkDescriptorPool descriptorPool, const VkAllocCallbacks* pAllocator); +typedef VkResult (VKAPI *PFN_vkMergePipelineCaches)(VkDevice device, VkPipelineCache dstCache, uint32_t srcCacheCount, const VkPipelineCache* pSrcCaches); +typedef VkResult (VKAPI *PFN_vkCreateGraphicsPipelines)(VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkGraphicsPipelineCreateInfo* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines); +typedef VkResult (VKAPI *PFN_vkCreateComputePipelines)(VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkComputePipelineCreateInfo* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines); +typedef void (VKAPI *PFN_vkDestroyPipeline)(VkDevice device, VkPipeline pipeline, const VkAllocationCallbacks* pAllocator); +typedef VkResult (VKAPI *PFN_vkCreatePipelineLayout)(VkDevice device, const VkPipelineLayoutCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkPipelineLayout* pPipelineLayout); +typedef void (VKAPI *PFN_vkDestroyPipelineLayout)(VkDevice device, VkPipelineLayout pipelineLayout, const VkAllocationCallbacks* pAllocator); +typedef VkResult (VKAPI *PFN_vkCreateSampler)(VkDevice device, const VkSamplerCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSampler* pSampler); +typedef void (VKAPI *PFN_vkDestroySampler)(VkDevice device, VkSampler sampler, const VkAllocationCallbacks* pAllocator); +typedef VkResult (VKAPI *PFN_vkCreateDescriptorSetLayout)(VkDevice device, const VkDescriptorSetLayoutCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDescriptorSetLayout* pSetLayout); +typedef void (VKAPI *PFN_vkDestroyDescriptorSetLayout)(VkDevice device, VkDescriptorSetLayout descriptorSetLayout, const VkAllocationCallbacks* pAllocator); +typedef VkResult (VKAPI *PFN_vkCreateDescriptorPool)(VkDevice device, const VkDescriptorPoolCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDescriptorPool* pDescriptorPool); +typedef void (VKAPI *PFN_vkDestroyDescriptorPool)(VkDevice device, VkDescriptorPool descriptorPool, const VkAllocationCallbacks* pAllocator); typedef VkResult (VKAPI *PFN_vkResetDescriptorPool)(VkDevice device, VkDescriptorPool descriptorPool, VkDescriptorPoolResetFlags flags); -typedef VkResult (VKAPI *PFN_vkAllocDescriptorSets)(VkDevice device, const VkDescriptorSetAllocInfo* pAllocInfo, VkDescriptorSet* pDescriptorSets); +typedef VkResult (VKAPI *PFN_vkAllocateDescriptorSets)(VkDevice device, const VkDescriptorSetAllocateInfo* pAllocateInfo, VkDescriptorSet* pDescriptorSets); typedef VkResult (VKAPI *PFN_vkFreeDescriptorSets)(VkDevice device, VkDescriptorPool descriptorPool, uint32_t descriptorSetCount, const VkDescriptorSet* pDescriptorSets); typedef void (VKAPI *PFN_vkUpdateDescriptorSets)(VkDevice device, uint32_t descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites, uint32_t descriptorCopyCount, const VkCopyDescriptorSet* pDescriptorCopies); -typedef VkResult (VKAPI *PFN_vkCreateFramebuffer)(VkDevice device, const VkFramebufferCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkFramebuffer* pFramebuffer); -typedef void (VKAPI *PFN_vkDestroyFramebuffer)(VkDevice device, VkFramebuffer framebuffer, const VkAllocCallbacks* pAllocator); -typedef VkResult (VKAPI *PFN_vkCreateRenderPass)(VkDevice device, const VkRenderPassCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkRenderPass* pRenderPass); -typedef void (VKAPI *PFN_vkDestroyRenderPass)(VkDevice device, VkRenderPass renderPass, const VkAllocCallbacks* pAllocator); +typedef VkResult (VKAPI *PFN_vkCreateFramebuffer)(VkDevice device, const VkFramebufferCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkFramebuffer* pFramebuffer); +typedef void (VKAPI *PFN_vkDestroyFramebuffer)(VkDevice device, VkFramebuffer framebuffer, const VkAllocationCallbacks* pAllocator); +typedef VkResult (VKAPI *PFN_vkCreateRenderPass)(VkDevice device, const VkRenderPassCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkRenderPass* pRenderPass); +typedef void (VKAPI *PFN_vkDestroyRenderPass)(VkDevice device, VkRenderPass renderPass, const VkAllocationCallbacks* pAllocator); typedef void (VKAPI *PFN_vkGetRenderAreaGranularity)(VkDevice device, VkRenderPass renderPass, VkExtent2D* pGranularity); -typedef VkResult (VKAPI *PFN_vkCreateCommandPool)(VkDevice device, const VkCmdPoolCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkCmdPool* pCmdPool); -typedef void (VKAPI *PFN_vkDestroyCommandPool)(VkDevice device, VkCmdPool cmdPool, const VkAllocCallbacks* pAllocator); -typedef VkResult (VKAPI *PFN_vkResetCommandPool)(VkDevice device, VkCmdPool cmdPool, VkCmdPoolResetFlags flags); -typedef VkResult (VKAPI *PFN_vkAllocCommandBuffers)(VkDevice device, const VkCmdBufferAllocInfo* pAllocInfo, VkCmdBuffer* pCmdBuffers); -typedef void (VKAPI *PFN_vkFreeCommandBuffers)(VkDevice device, VkCmdPool cmdPool, uint32_t commandBufferCount, const VkCmdBuffer* pCommandBuffers); -typedef VkResult (VKAPI *PFN_vkBeginCommandBuffer)(VkCmdBuffer cmdBuffer, const VkCmdBufferBeginInfo* pBeginInfo); -typedef VkResult (VKAPI *PFN_vkEndCommandBuffer)(VkCmdBuffer cmdBuffer); -typedef VkResult (VKAPI *PFN_vkResetCommandBuffer)(VkCmdBuffer cmdBuffer, VkCmdBufferResetFlags flags); -typedef void (VKAPI *PFN_vkCmdBindPipeline)(VkCmdBuffer cmdBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline); -typedef void (VKAPI *PFN_vkCmdSetViewport)(VkCmdBuffer cmdBuffer, uint32_t viewportCount, const VkViewport* pViewports); -typedef void (VKAPI *PFN_vkCmdSetScissor)(VkCmdBuffer cmdBuffer, uint32_t scissorCount, const VkRect2D* pScissors); -typedef void (VKAPI *PFN_vkCmdSetLineWidth)(VkCmdBuffer cmdBuffer, float lineWidth); -typedef void (VKAPI *PFN_vkCmdSetDepthBias)(VkCmdBuffer cmdBuffer, float depthBiasConstantFactor, float depthBiasClamp, float depthBiasSlopeFactor); -typedef void (VKAPI *PFN_vkCmdSetBlendConstants)(VkCmdBuffer cmdBuffer, const float blendConstants[4]); -typedef void (VKAPI *PFN_vkCmdSetDepthBounds)(VkCmdBuffer cmdBuffer, float minDepthBounds, float maxDepthBounds); -typedef void (VKAPI *PFN_vkCmdSetStencilCompareMask)(VkCmdBuffer cmdBuffer, VkStencilFaceFlags faceMask, uint32_t stencilCompareMask); -typedef void (VKAPI *PFN_vkCmdSetStencilWriteMask)(VkCmdBuffer cmdBuffer, VkStencilFaceFlags faceMask, uint32_t stencilWriteMask); -typedef void (VKAPI *PFN_vkCmdSetStencilReference)(VkCmdBuffer cmdBuffer, VkStencilFaceFlags faceMask, uint32_t stencilReference); -typedef void (VKAPI *PFN_vkCmdBindDescriptorSets)(VkCmdBuffer cmdBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t firstSet, uint32_t descriptorSetCount, const VkDescriptorSet* pDescriptorSets, uint32_t dynamicOffsetCount, const uint32_t* pDynamicOffsets); -typedef void (VKAPI *PFN_vkCmdBindIndexBuffer)(VkCmdBuffer cmdBuffer, VkBuffer buffer, VkDeviceSize offset, VkIndexType indexType); -typedef void (VKAPI *PFN_vkCmdBindVertexBuffers)(VkCmdBuffer cmdBuffer, uint32_t startBinding, uint32_t bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets); -typedef void (VKAPI *PFN_vkCmdDraw)(VkCmdBuffer cmdBuffer, uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance); -typedef void (VKAPI *PFN_vkCmdDrawIndexed)(VkCmdBuffer cmdBuffer, uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex, int32_t vertexOffset, uint32_t firstInstance); -typedef void (VKAPI *PFN_vkCmdDrawIndirect)(VkCmdBuffer cmdBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride); -typedef void (VKAPI *PFN_vkCmdDrawIndexedIndirect)(VkCmdBuffer cmdBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride); -typedef void (VKAPI *PFN_vkCmdDispatch)(VkCmdBuffer cmdBuffer, uint32_t x, uint32_t y, uint32_t z); -typedef void (VKAPI *PFN_vkCmdDispatchIndirect)(VkCmdBuffer cmdBuffer, VkBuffer buffer, VkDeviceSize offset); -typedef void (VKAPI *PFN_vkCmdCopyBuffer)(VkCmdBuffer cmdBuffer, VkBuffer srcBuffer, VkBuffer destBuffer, uint32_t regionCount, const VkBufferCopy* pRegions); -typedef void (VKAPI *PFN_vkCmdCopyImage)(VkCmdBuffer cmdBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage destImage, VkImageLayout destImageLayout, uint32_t regionCount, const VkImageCopy* pRegions); -typedef void (VKAPI *PFN_vkCmdBlitImage)(VkCmdBuffer cmdBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage destImage, VkImageLayout destImageLayout, uint32_t regionCount, const VkImageBlit* pRegions, VkFilter filter); -typedef void (VKAPI *PFN_vkCmdCopyBufferToImage)(VkCmdBuffer cmdBuffer, VkBuffer srcBuffer, VkImage destImage, VkImageLayout destImageLayout, uint32_t regionCount, const VkBufferImageCopy* pRegions); -typedef void (VKAPI *PFN_vkCmdCopyImageToBuffer)(VkCmdBuffer cmdBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkBuffer destBuffer, uint32_t regionCount, const VkBufferImageCopy* pRegions); -typedef void (VKAPI *PFN_vkCmdUpdateBuffer)(VkCmdBuffer cmdBuffer, VkBuffer destBuffer, VkDeviceSize destOffset, VkDeviceSize dataSize, const uint32_t* pData); -typedef void (VKAPI *PFN_vkCmdFillBuffer)(VkCmdBuffer cmdBuffer, VkBuffer destBuffer, VkDeviceSize destOffset, VkDeviceSize size, uint32_t data); -typedef void (VKAPI *PFN_vkCmdClearColorImage)(VkCmdBuffer cmdBuffer, VkImage image, VkImageLayout imageLayout, const VkClearColorValue* pColor, uint32_t rangeCount, const VkImageSubresourceRange* pRanges); -typedef void (VKAPI *PFN_vkCmdClearDepthStencilImage)(VkCmdBuffer cmdBuffer, VkImage image, VkImageLayout imageLayout, const VkClearDepthStencilValue* pDepthStencil, uint32_t rangeCount, const VkImageSubresourceRange* pRanges); -typedef void (VKAPI *PFN_vkCmdClearAttachments)(VkCmdBuffer cmdBuffer, uint32_t attachmentCount, const VkClearAttachment* pAttachments, uint32_t rectCount, const VkClearRect* pRects); -typedef void (VKAPI *PFN_vkCmdResolveImage)(VkCmdBuffer cmdBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage destImage, VkImageLayout destImageLayout, uint32_t regionCount, const VkImageResolve* pRegions); -typedef void (VKAPI *PFN_vkCmdSetEvent)(VkCmdBuffer cmdBuffer, VkEvent event, VkPipelineStageFlags stageMask); -typedef void (VKAPI *PFN_vkCmdResetEvent)(VkCmdBuffer cmdBuffer, VkEvent event, VkPipelineStageFlags stageMask); -typedef void (VKAPI *PFN_vkCmdWaitEvents)(VkCmdBuffer cmdBuffer, uint32_t eventCount, const VkEvent* pEvents, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags destStageMask, uint32_t memBarrierCount, const void* const* ppMemBarriers); -typedef void (VKAPI *PFN_vkCmdPipelineBarrier)(VkCmdBuffer cmdBuffer, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags destStageMask, VkDependencyFlags dependencyFlags, uint32_t memBarrierCount, const void* const* ppMemBarriers); -typedef void (VKAPI *PFN_vkCmdBeginQuery)(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t slot, VkQueryControlFlags flags); -typedef void (VKAPI *PFN_vkCmdEndQuery)(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t slot); -typedef void (VKAPI *PFN_vkCmdResetQueryPool)(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount); -typedef void (VKAPI *PFN_vkCmdWriteTimestamp)(VkCmdBuffer cmdBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, uint32_t slot); -typedef void (VKAPI *PFN_vkCmdCopyQueryPoolResults)(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount, VkBuffer destBuffer, VkDeviceSize destOffset, VkDeviceSize stride, VkQueryResultFlags flags); -typedef void (VKAPI *PFN_vkCmdPushConstants)(VkCmdBuffer cmdBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, uint32_t offset, uint32_t size, const void* values); -typedef void (VKAPI *PFN_vkCmdBeginRenderPass)(VkCmdBuffer cmdBuffer, const VkRenderPassBeginInfo* pRenderPassBegin, VkRenderPassContents contents); -typedef void (VKAPI *PFN_vkCmdNextSubpass)(VkCmdBuffer cmdBuffer, VkRenderPassContents contents); -typedef void (VKAPI *PFN_vkCmdEndRenderPass)(VkCmdBuffer cmdBuffer); -typedef void (VKAPI *PFN_vkCmdExecuteCommands)(VkCmdBuffer cmdBuffer, uint32_t cmdBuffersCount, const VkCmdBuffer* pCmdBuffers); +typedef VkResult (VKAPI *PFN_vkCreateCommandPool)(VkDevice device, const VkCommandPoolCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkCommandPool* pCommandPool); +typedef void (VKAPI *PFN_vkDestroyCommandPool)(VkDevice device, VkCommandPool commandPool, const VkAllocationCallbacks* pAllocator); +typedef VkResult (VKAPI *PFN_vkResetCommandPool)(VkDevice device, VkCommandPool commandPool, VkCommandPoolResetFlags flags); +typedef VkResult (VKAPI *PFN_vkAllocateCommandBuffers)(VkDevice device, const VkCommandBufferAllocateInfo* pAllocateInfo, VkCommandBuffer* pCommandBuffers); +typedef void (VKAPI *PFN_vkFreeCommandBuffers)(VkDevice device, VkCommandPool commandPool, uint32_t commandBufferCount, const VkCommandBuffer* pCommandBuffers); +typedef VkResult (VKAPI *PFN_vkBeginCommandBuffer)(VkCommandBuffer commandBuffer, const VkCommandBufferBeginInfo* pBeginInfo); +typedef VkResult (VKAPI *PFN_vkEndCommandBuffer)(VkCommandBuffer commandBuffer); +typedef VkResult (VKAPI *PFN_vkResetCommandBuffer)(VkCommandBuffer commandBuffer, VkCommandBufferResetFlags flags); +typedef void (VKAPI *PFN_vkCmdBindPipeline)(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline); +typedef void (VKAPI *PFN_vkCmdSetViewport)(VkCommandBuffer commandBuffer, uint32_t viewportCount, const VkViewport* pViewports); +typedef void (VKAPI *PFN_vkCmdSetScissor)(VkCommandBuffer commandBuffer, uint32_t scissorCount, const VkRect2D* pScissors); +typedef void (VKAPI *PFN_vkCmdSetLineWidth)(VkCommandBuffer commandBuffer, float lineWidth); +typedef void (VKAPI *PFN_vkCmdSetDepthBias)(VkCommandBuffer commandBuffer, float depthBiasConstantFactor, float depthBiasClamp, float depthBiasSlopeFactor); +typedef void (VKAPI *PFN_vkCmdSetBlendConstants)(VkCommandBuffer commandBuffer, const float blendConstants[4]); +typedef void (VKAPI *PFN_vkCmdSetDepthBounds)(VkCommandBuffer commandBuffer, float minDepthBounds, float maxDepthBounds); +typedef void (VKAPI *PFN_vkCmdSetStencilCompareMask)(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t stencilCompareMask); +typedef void (VKAPI *PFN_vkCmdSetStencilWriteMask)(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t stencilWriteMask); +typedef void (VKAPI *PFN_vkCmdSetStencilReference)(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t stencilReference); +typedef void (VKAPI *PFN_vkCmdBindDescriptorSets)(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t firstSet, uint32_t descriptorSetCount, const VkDescriptorSet* pDescriptorSets, uint32_t dynamicOffsetCount, const uint32_t* pDynamicOffsets); +typedef void (VKAPI *PFN_vkCmdBindIndexBuffer)(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkIndexType indexType); +typedef void (VKAPI *PFN_vkCmdBindVertexBuffers)(VkCommandBuffer commandBuffer, uint32_t startBinding, uint32_t bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets); +typedef void (VKAPI *PFN_vkCmdDraw)(VkCommandBuffer commandBuffer, uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance); +typedef void (VKAPI *PFN_vkCmdDrawIndexed)(VkCommandBuffer commandBuffer, uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex, int32_t vertexOffset, uint32_t firstInstance); +typedef void (VKAPI *PFN_vkCmdDrawIndirect)(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride); +typedef void (VKAPI *PFN_vkCmdDrawIndexedIndirect)(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride); +typedef void (VKAPI *PFN_vkCmdDispatch)(VkCommandBuffer commandBuffer, uint32_t x, uint32_t y, uint32_t z); +typedef void (VKAPI *PFN_vkCmdDispatchIndirect)(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset); +typedef void (VKAPI *PFN_vkCmdCopyBuffer)(VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferCopy* pRegions); +typedef void (VKAPI *PFN_vkCmdCopyImage)(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageCopy* pRegions); +typedef void (VKAPI *PFN_vkCmdBlitImage)(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageBlit* pRegions, VkFilter filter); +typedef void (VKAPI *PFN_vkCmdCopyBufferToImage)(VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkBufferImageCopy* pRegions); +typedef void (VKAPI *PFN_vkCmdCopyImageToBuffer)(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferImageCopy* pRegions); +typedef void (VKAPI *PFN_vkCmdUpdateBuffer)(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const uint32_t* pData); +typedef void (VKAPI *PFN_vkCmdFillBuffer)(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize size, uint32_t data); +typedef void (VKAPI *PFN_vkCmdClearColorImage)(VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearColorValue* pColor, uint32_t rangeCount, const VkImageSubresourceRange* pRanges); +typedef void (VKAPI *PFN_vkCmdClearDepthStencilImage)(VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearDepthStencilValue* pDepthStencil, uint32_t rangeCount, const VkImageSubresourceRange* pRanges); +typedef void (VKAPI *PFN_vkCmdClearAttachments)(VkCommandBuffer commandBuffer, uint32_t attachmentCount, const VkClearAttachment* pAttachments, uint32_t rectCount, const VkClearRect* pRects); +typedef void (VKAPI *PFN_vkCmdResolveImage)(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageResolve* pRegions); +typedef void (VKAPI *PFN_vkCmdSetEvent)(VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask); +typedef void (VKAPI *PFN_vkCmdResetEvent)(VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask); +typedef void (VKAPI *PFN_vkCmdWaitEvents)(VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent* pEvents, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, uint32_t memoryBarrierCount, const void* const* ppMemoryBarriers); +typedef void (VKAPI *PFN_vkCmdPipelineBarrier)(VkCommandBuffer commandBuffer, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, VkDependencyFlags dependencyFlags, uint32_t memoryBarrierCount, const void* const* ppMemoryBarriers); +typedef void (VKAPI *PFN_vkCmdBeginQuery)(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t slot, VkQueryControlFlags flags); +typedef void (VKAPI *PFN_vkCmdEndQuery)(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t slot); +typedef void (VKAPI *PFN_vkCmdResetQueryPool)(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount); +typedef void (VKAPI *PFN_vkCmdWriteTimestamp)(VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, uint32_t slot); +typedef void (VKAPI *PFN_vkCmdCopyQueryPoolResults)(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize stride, VkQueryResultFlags flags); +typedef void (VKAPI *PFN_vkCmdPushConstants)(VkCommandBuffer commandBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, uint32_t offset, uint32_t size, const void* values); +typedef void (VKAPI *PFN_vkCmdBeginRenderPass)(VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo* pRenderPassBegin, VkRenderPassContents contents); +typedef void (VKAPI *PFN_vkCmdNextSubpass)(VkCommandBuffer commandBuffer, VkRenderPassContents contents); +typedef void (VKAPI *PFN_vkCmdEndRenderPass)(VkCommandBuffer commandBuffer); +typedef void (VKAPI *PFN_vkCmdExecuteCommands)(VkCommandBuffer commandBuffer, uint32_t commandBuffersCount, const VkCommandBuffer* pCommandBuffers); #ifdef VK_PROTOTYPES VkResult VKAPI vkCreateInstance( const VkInstanceCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkInstance* pInstance); void VKAPI vkDestroyInstance( VkInstance instance, - const VkAllocCallbacks* pAllocator); + const VkAllocationCallbacks* pAllocator); VkResult VKAPI vkEnumeratePhysicalDevices( VkInstance instance, @@ -2337,12 +2337,12 @@ PFN_vkVoidFunction VKAPI vkGetDeviceProcAddr( VkResult VKAPI vkCreateDevice( VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkDevice* pDevice); void VKAPI vkDestroyDevice( VkDevice device, - const VkAllocCallbacks* pAllocator); + const VkAllocationCallbacks* pAllocator); VkResult VKAPI vkEnumerateInstanceExtensionProperties( const char* pLayerName, @@ -2382,16 +2382,16 @@ VkResult VKAPI vkQueueWaitIdle( VkResult VKAPI vkDeviceWaitIdle( VkDevice device); -VkResult VKAPI vkAllocMemory( +VkResult VKAPI vkAllocateMemory( VkDevice device, - const VkMemoryAllocInfo* pAllocInfo, - const VkAllocCallbacks* pAllocator, - VkDeviceMemory* pMem); + const VkMemoryAllocateInfo* pAllocateInfo, + const VkAllocationCallbacks* pAllocator, + VkDeviceMemory* pMemory); void VKAPI vkFreeMemory( VkDevice device, VkDeviceMemory mem, - const VkAllocCallbacks* pAllocator); + const VkAllocationCallbacks* pAllocator); VkResult VKAPI vkMapMemory( VkDevice device, @@ -2407,13 +2407,13 @@ void VKAPI vkUnmapMemory( VkResult VKAPI vkFlushMappedMemoryRanges( VkDevice device, - uint32_t memRangeCount, - const VkMappedMemoryRange* pMemRanges); + uint32_t memoryRangeCount, + const VkMappedMemoryRange* pMemoryRanges); VkResult VKAPI vkInvalidateMappedMemoryRanges( VkDevice device, - uint32_t memRangeCount, - const VkMappedMemoryRange* pMemRanges); + uint32_t memoryRangeCount, + const VkMappedMemoryRange* pMemoryRanges); void VKAPI vkGetDeviceMemoryCommitment( VkDevice device, @@ -2424,13 +2424,13 @@ VkResult VKAPI vkBindBufferMemory( VkDevice device, VkBuffer buffer, VkDeviceMemory mem, - VkDeviceSize memOffset); + VkDeviceSize memoryOffset); VkResult VKAPI vkBindImageMemory( VkDevice device, VkImage image, VkDeviceMemory mem, - VkDeviceSize memOffset); + VkDeviceSize memoryOffset); void VKAPI vkGetBufferMemoryRequirements( VkDevice device, @@ -2467,13 +2467,13 @@ VkResult VKAPI vkQueueBindSparse( VkResult VKAPI vkCreateFence( VkDevice device, const VkFenceCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkFence* pFence); void VKAPI vkDestroyFence( VkDevice device, VkFence fence, - const VkAllocCallbacks* pAllocator); + const VkAllocationCallbacks* pAllocator); VkResult VKAPI vkResetFences( VkDevice device, @@ -2494,24 +2494,24 @@ VkResult VKAPI vkWaitForFences( VkResult VKAPI vkCreateSemaphore( VkDevice device, const VkSemaphoreCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkSemaphore* pSemaphore); void VKAPI vkDestroySemaphore( VkDevice device, VkSemaphore semaphore, - const VkAllocCallbacks* pAllocator); + const VkAllocationCallbacks* pAllocator); VkResult VKAPI vkCreateEvent( VkDevice device, const VkEventCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkEvent* pEvent); void VKAPI vkDestroyEvent( VkDevice device, VkEvent event, - const VkAllocCallbacks* pAllocator); + const VkAllocationCallbacks* pAllocator); VkResult VKAPI vkGetEventStatus( VkDevice device, @@ -2528,13 +2528,13 @@ VkResult VKAPI vkResetEvent( VkResult VKAPI vkCreateQueryPool( VkDevice device, const VkQueryPoolCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkQueryPool* pQueryPool); void VKAPI vkDestroyQueryPool( VkDevice device, VkQueryPool queryPool, - const VkAllocCallbacks* pAllocator); + const VkAllocationCallbacks* pAllocator); VkResult VKAPI vkGetQueryPoolResults( VkDevice device, @@ -2549,35 +2549,35 @@ VkResult VKAPI vkGetQueryPoolResults( VkResult VKAPI vkCreateBuffer( VkDevice device, const VkBufferCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkBuffer* pBuffer); void VKAPI vkDestroyBuffer( VkDevice device, VkBuffer buffer, - const VkAllocCallbacks* pAllocator); + const VkAllocationCallbacks* pAllocator); VkResult VKAPI vkCreateBufferView( VkDevice device, const VkBufferViewCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkBufferView* pView); void VKAPI vkDestroyBufferView( VkDevice device, VkBufferView bufferView, - const VkAllocCallbacks* pAllocator); + const VkAllocationCallbacks* pAllocator); VkResult VKAPI vkCreateImage( VkDevice device, const VkImageCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkImage* pImage); void VKAPI vkDestroyImage( VkDevice device, VkImage image, - const VkAllocCallbacks* pAllocator); + const VkAllocationCallbacks* pAllocator); void VKAPI vkGetImageSubresourceLayout( VkDevice device, @@ -2588,46 +2588,46 @@ void VKAPI vkGetImageSubresourceLayout( VkResult VKAPI vkCreateImageView( VkDevice device, const VkImageViewCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkImageView* pView); void VKAPI vkDestroyImageView( VkDevice device, VkImageView imageView, - const VkAllocCallbacks* pAllocator); + const VkAllocationCallbacks* pAllocator); VkResult VKAPI vkCreateShaderModule( VkDevice device, const VkShaderModuleCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkShaderModule* pShaderModule); void VKAPI vkDestroyShaderModule( VkDevice device, VkShaderModule shaderModule, - const VkAllocCallbacks* pAllocator); + const VkAllocationCallbacks* pAllocator); VkResult VKAPI vkCreateShader( VkDevice device, const VkShaderCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkShader* pShader); void VKAPI vkDestroyShader( VkDevice device, VkShader shader, - const VkAllocCallbacks* pAllocator); + const VkAllocationCallbacks* pAllocator); VkResult VKAPI vkCreatePipelineCache( VkDevice device, const VkPipelineCacheCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkPipelineCache* pPipelineCache); void VKAPI vkDestroyPipelineCache( VkDevice device, VkPipelineCache pipelineCache, - const VkAllocCallbacks* pAllocator); + const VkAllocationCallbacks* pAllocator); VkResult VKAPI vkGetPipelineCacheData( VkDevice device, @@ -2637,7 +2637,7 @@ VkResult VKAPI vkGetPipelineCacheData( VkResult VKAPI vkMergePipelineCaches( VkDevice device, - VkPipelineCache destCache, + VkPipelineCache dstCache, uint32_t srcCacheCount, const VkPipelineCache* pSrcCaches); @@ -2646,7 +2646,7 @@ VkResult VKAPI vkCreateGraphicsPipelines( VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkGraphicsPipelineCreateInfo* pCreateInfos, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines); VkResult VKAPI vkCreateComputePipelines( @@ -2654,66 +2654,66 @@ VkResult VKAPI vkCreateComputePipelines( VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkComputePipelineCreateInfo* pCreateInfos, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines); void VKAPI vkDestroyPipeline( VkDevice device, VkPipeline pipeline, - const VkAllocCallbacks* pAllocator); + const VkAllocationCallbacks* pAllocator); VkResult VKAPI vkCreatePipelineLayout( VkDevice device, const VkPipelineLayoutCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkPipelineLayout* pPipelineLayout); void VKAPI vkDestroyPipelineLayout( VkDevice device, VkPipelineLayout pipelineLayout, - const VkAllocCallbacks* pAllocator); + const VkAllocationCallbacks* pAllocator); VkResult VKAPI vkCreateSampler( VkDevice device, const VkSamplerCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkSampler* pSampler); void VKAPI vkDestroySampler( VkDevice device, VkSampler sampler, - const VkAllocCallbacks* pAllocator); + const VkAllocationCallbacks* pAllocator); VkResult VKAPI vkCreateDescriptorSetLayout( VkDevice device, const VkDescriptorSetLayoutCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkDescriptorSetLayout* pSetLayout); void VKAPI vkDestroyDescriptorSetLayout( VkDevice device, VkDescriptorSetLayout descriptorSetLayout, - const VkAllocCallbacks* pAllocator); + const VkAllocationCallbacks* pAllocator); VkResult VKAPI vkCreateDescriptorPool( VkDevice device, const VkDescriptorPoolCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkDescriptorPool* pDescriptorPool); void VKAPI vkDestroyDescriptorPool( VkDevice device, VkDescriptorPool descriptorPool, - const VkAllocCallbacks* pAllocator); + const VkAllocationCallbacks* pAllocator); VkResult VKAPI vkResetDescriptorPool( VkDevice device, VkDescriptorPool descriptorPool, VkDescriptorPoolResetFlags flags); -VkResult VKAPI vkAllocDescriptorSets( +VkResult VKAPI vkAllocateDescriptorSets( VkDevice device, - const VkDescriptorSetAllocInfo* pAllocInfo, + const VkDescriptorSetAllocateInfo* pAllocateInfo, VkDescriptorSet* pDescriptorSets); VkResult VKAPI vkFreeDescriptorSets( @@ -2732,24 +2732,24 @@ void VKAPI vkUpdateDescriptorSets( VkResult VKAPI vkCreateFramebuffer( VkDevice device, const VkFramebufferCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkFramebuffer* pFramebuffer); void VKAPI vkDestroyFramebuffer( VkDevice device, VkFramebuffer framebuffer, - const VkAllocCallbacks* pAllocator); + const VkAllocationCallbacks* pAllocator); VkResult VKAPI vkCreateRenderPass( VkDevice device, const VkRenderPassCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkRenderPass* pRenderPass); void VKAPI vkDestroyRenderPass( VkDevice device, VkRenderPass renderPass, - const VkAllocCallbacks* pAllocator); + const VkAllocationCallbacks* pAllocator); void VKAPI vkGetRenderAreaGranularity( VkDevice device, @@ -2758,93 +2758,93 @@ void VKAPI vkGetRenderAreaGranularity( VkResult VKAPI vkCreateCommandPool( VkDevice device, - const VkCmdPoolCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, - VkCmdPool* pCmdPool); + const VkCommandPoolCreateInfo* pCreateInfo, + const VkAllocationCallbacks* pAllocator, + VkCommandPool* pCommandPool); void VKAPI vkDestroyCommandPool( VkDevice device, - VkCmdPool cmdPool, - const VkAllocCallbacks* pAllocator); + VkCommandPool commandPool, + const VkAllocationCallbacks* pAllocator); VkResult VKAPI vkResetCommandPool( VkDevice device, - VkCmdPool cmdPool, - VkCmdPoolResetFlags flags); + VkCommandPool commandPool, + VkCommandPoolResetFlags flags); -VkResult VKAPI vkAllocCommandBuffers( +VkResult VKAPI vkAllocateCommandBuffers( VkDevice device, - const VkCmdBufferAllocInfo* pAllocInfo, - VkCmdBuffer* pCmdBuffers); + const VkCommandBufferAllocateInfo* pAllocateInfo, + VkCommandBuffer* pCommandBuffers); void VKAPI vkFreeCommandBuffers( VkDevice device, - VkCmdPool cmdPool, + VkCommandPool commandPool, uint32_t commandBufferCount, - const VkCmdBuffer* pCommandBuffers); + const VkCommandBuffer* pCommandBuffers); VkResult VKAPI vkBeginCommandBuffer( - VkCmdBuffer cmdBuffer, - const VkCmdBufferBeginInfo* pBeginInfo); + VkCommandBuffer commandBuffer, + const VkCommandBufferBeginInfo* pBeginInfo); VkResult VKAPI vkEndCommandBuffer( - VkCmdBuffer cmdBuffer); + VkCommandBuffer commandBuffer); VkResult VKAPI vkResetCommandBuffer( - VkCmdBuffer cmdBuffer, - VkCmdBufferResetFlags flags); + VkCommandBuffer commandBuffer, + VkCommandBufferResetFlags flags); void VKAPI vkCmdBindPipeline( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline); void VKAPI vkCmdSetViewport( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t viewportCount, const VkViewport* pViewports); void VKAPI vkCmdSetScissor( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t scissorCount, const VkRect2D* pScissors); void VKAPI vkCmdSetLineWidth( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, float lineWidth); void VKAPI vkCmdSetDepthBias( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, float depthBiasConstantFactor, float depthBiasClamp, float depthBiasSlopeFactor); void VKAPI vkCmdSetBlendConstants( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, const float blendConstants[4]); void VKAPI vkCmdSetDepthBounds( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, float minDepthBounds, float maxDepthBounds); void VKAPI vkCmdSetStencilCompareMask( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t stencilCompareMask); void VKAPI vkCmdSetStencilWriteMask( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t stencilWriteMask); void VKAPI vkCmdSetStencilReference( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t stencilReference); void VKAPI vkCmdBindDescriptorSets( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t firstSet, @@ -2854,27 +2854,27 @@ void VKAPI vkCmdBindDescriptorSets( const uint32_t* pDynamicOffsets); void VKAPI vkCmdBindIndexBuffer( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkIndexType indexType); void VKAPI vkCmdBindVertexBuffers( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t startBinding, uint32_t bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets); void VKAPI vkCmdDraw( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance); void VKAPI vkCmdDrawIndexed( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex, @@ -2882,88 +2882,88 @@ void VKAPI vkCmdDrawIndexed( uint32_t firstInstance); void VKAPI vkCmdDrawIndirect( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride); void VKAPI vkCmdDrawIndexedIndirect( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride); void VKAPI vkCmdDispatch( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t x, uint32_t y, uint32_t z); void VKAPI vkCmdDispatchIndirect( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset); void VKAPI vkCmdCopyBuffer( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkBuffer srcBuffer, - VkBuffer destBuffer, + VkBuffer dstBuffer, uint32_t regionCount, const VkBufferCopy* pRegions); void VKAPI vkCmdCopyImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, - VkImage destImage, - VkImageLayout destImageLayout, + VkImage dstImage, + VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageCopy* pRegions); void VKAPI vkCmdBlitImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, - VkImage destImage, - VkImageLayout destImageLayout, + VkImage dstImage, + VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageBlit* pRegions, VkFilter filter); void VKAPI vkCmdCopyBufferToImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkBuffer srcBuffer, - VkImage destImage, - VkImageLayout destImageLayout, + VkImage dstImage, + VkImageLayout dstImageLayout, uint32_t regionCount, const VkBufferImageCopy* pRegions); void VKAPI vkCmdCopyImageToBuffer( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, - VkBuffer destBuffer, + VkBuffer dstBuffer, uint32_t regionCount, const VkBufferImageCopy* pRegions); void VKAPI vkCmdUpdateBuffer( - VkCmdBuffer cmdBuffer, - VkBuffer destBuffer, - VkDeviceSize destOffset, + VkCommandBuffer commandBuffer, + VkBuffer dstBuffer, + VkDeviceSize dstOffset, VkDeviceSize dataSize, const uint32_t* pData); void VKAPI vkCmdFillBuffer( - VkCmdBuffer cmdBuffer, - VkBuffer destBuffer, - VkDeviceSize destOffset, + VkCommandBuffer commandBuffer, + VkBuffer dstBuffer, + VkDeviceSize dstOffset, VkDeviceSize size, uint32_t data); void VKAPI vkCmdClearColorImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearColorValue* pColor, @@ -2971,7 +2971,7 @@ void VKAPI vkCmdClearColorImage( const VkImageSubresourceRange* pRanges); void VKAPI vkCmdClearDepthStencilImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearDepthStencilValue* pDepthStencil, @@ -2979,83 +2979,83 @@ void VKAPI vkCmdClearDepthStencilImage( const VkImageSubresourceRange* pRanges); void VKAPI vkCmdClearAttachments( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t attachmentCount, const VkClearAttachment* pAttachments, uint32_t rectCount, const VkClearRect* pRects); void VKAPI vkCmdResolveImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, - VkImage destImage, - VkImageLayout destImageLayout, + VkImage dstImage, + VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageResolve* pRegions); void VKAPI vkCmdSetEvent( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask); void VKAPI vkCmdResetEvent( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask); void VKAPI vkCmdWaitEvents( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent* pEvents, VkPipelineStageFlags srcStageMask, - VkPipelineStageFlags destStageMask, - uint32_t memBarrierCount, - const void* const* ppMemBarriers); + VkPipelineStageFlags dstStageMask, + uint32_t memoryBarrierCount, + const void* const* ppMemoryBarriers); void VKAPI vkCmdPipelineBarrier( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkPipelineStageFlags srcStageMask, - VkPipelineStageFlags destStageMask, + VkPipelineStageFlags dstStageMask, VkDependencyFlags dependencyFlags, - uint32_t memBarrierCount, - const void* const* ppMemBarriers); + uint32_t memoryBarrierCount, + const void* const* ppMemoryBarriers); void VKAPI vkCmdBeginQuery( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t slot, VkQueryControlFlags flags); void VKAPI vkCmdEndQuery( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t slot); void VKAPI vkCmdResetQueryPool( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount); void VKAPI vkCmdWriteTimestamp( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, uint32_t slot); void VKAPI vkCmdCopyQueryPoolResults( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount, - VkBuffer destBuffer, - VkDeviceSize destOffset, + VkBuffer dstBuffer, + VkDeviceSize dstOffset, VkDeviceSize stride, VkQueryResultFlags flags); void VKAPI vkCmdPushConstants( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, uint32_t offset, @@ -3063,21 +3063,21 @@ void VKAPI vkCmdPushConstants( const void* values); void VKAPI vkCmdBeginRenderPass( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo* pRenderPassBegin, VkRenderPassContents contents); void VKAPI vkCmdNextSubpass( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkRenderPassContents contents); void VKAPI vkCmdEndRenderPass( - VkCmdBuffer cmdBuffer); + VkCommandBuffer commandBuffer); void VKAPI vkCmdExecuteCommands( - VkCmdBuffer cmdBuffer, - uint32_t cmdBuffersCount, - const VkCmdBuffer* pCmdBuffers); + VkCommandBuffer commandBuffer, + uint32_t commandBuffersCount, + const VkCommandBuffer* pCommandBuffers); #endif #ifdef __cplusplus diff --git a/layers/README.md b/layers/README.md index 4e53ed8c..8ee47b9f 100644 --- a/layers/README.md +++ b/layers/README.md @@ -10,7 +10,7 @@ vkEnumerateInstanceLayerProperties and vkEnumerateDeviceLayerProperties can be c available layers and their properties. Layers can intercept Vulkan instance level entry points in which case they are called an Instance Layer. Layers can intercept device entry points in which case they are called a Device Layer. Instance level entry points are those with VkInstance -or VkPhysicalDevice as first parameter. Device level entry points are those with VkDevice, VkCmdBuffer, +or VkPhysicalDevice as first parameter. Device level entry points are those with VkDevice, VkCommandBuffer, or VkQueue as the first parameter. Layers that want to intercept both instance and device level entrypoints are called Global Layers. vkXXXXGetProcAddr is used internally by the Layers and Loader to initialize dispatch tables. Device Layers are activated at vkCreateDevice time. Instance diff --git a/layers/apidump.h b/layers/apidump.h index fb8dcf12..28eab022 100644 --- a/layers/apidump.h +++ b/layers/apidump.h @@ -37,7 +37,7 @@ static const VkLayerProperties layerProps[LAYER_PROPS_ARRAY_SIZE] = { { "Generic", VK_API_VERSION, // specVersion - VK_MAKE_VERSION(0, 1, 0), // implVersion + VK_MAKE_VERSION(0, 1, 0), // implementationVersion "layer: APIDump", } }; @@ -47,7 +47,7 @@ static const VkLayerProperties layerDevProps[LAYER_DEV_PROPS_ARRAY_SIZE] = { { "Generic", VK_API_VERSION, // specVersion - VK_MAKE_VERSION(0, 1, 0), // implVersion + VK_MAKE_VERSION(0, 1, 0), // implementationVersion "layer: APIDump", } }; diff --git a/layers/basic.cpp b/layers/basic.cpp index f416d5a5..a87ab59e 100644 --- a/layers/basic.cpp +++ b/layers/basic.cpp @@ -34,7 +34,7 @@ static const VkLayerProperties globalLayerProps[] = { { "Basic", VK_API_VERSION, // specVersion - VK_MAKE_VERSION(0, 1, 0), // implVersion + VK_MAKE_VERSION(0, 1, 0), // implementationVersion "layer: Basic", } }; @@ -95,7 +95,7 @@ VK_LAYER_EXPORT VkResult VKAPI basic_EnumeratePhysicalDevices( return result; } -VK_LAYER_EXPORT VkResult VKAPI basic_CreateDevice(VkPhysicalDevice gpu, const VkDeviceCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkDevice* pDevice) +VK_LAYER_EXPORT VkResult VKAPI basic_CreateDevice(VkPhysicalDevice gpu, const VkDeviceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDevice* pDevice) { printf("At start of wrapped vkCreateDevice() call w/ gpu: %p\n", (void*)gpu); VkResult result = device_dispatch_table(*pDevice)->CreateDevice(gpu, pCreateInfo, pAllocator, pDevice); @@ -104,7 +104,7 @@ VK_LAYER_EXPORT VkResult VKAPI basic_CreateDevice(VkPhysicalDevice gpu, const Vk } /* hook DestroyDevice to remove tableMap entry */ -VK_LAYER_EXPORT void VKAPI basic_DestroyDevice(VkDevice device, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI basic_DestroyDevice(VkDevice device, const VkAllocationCallbacks* pAllocator) { dispatch_key key = get_dispatch_key(device); device_dispatch_table(device)->DestroyDevice(device, pAllocator); @@ -112,7 +112,7 @@ VK_LAYER_EXPORT void VKAPI basic_DestroyDevice(VkDevice device, const VkAllocCal } /* hook DestroyInstance to remove tableInstanceMap entry */ -VK_LAYER_EXPORT void VKAPI basic_DestroyInstance(VkInstance instance, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI basic_DestroyInstance(VkInstance instance, const VkAllocationCallbacks* pAllocator) { dispatch_key key = get_dispatch_key(instance); instance_dispatch_table(instance)->DestroyInstance(instance, pAllocator); diff --git a/layers/device_limits.cpp b/layers/device_limits.cpp index 41b0b6f0..89d58853 100644 --- a/layers/device_limits.cpp +++ b/layers/device_limits.cpp @@ -158,7 +158,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkEnumerateInstanceLayerProperties( pCount, pProperties); } -VK_LAYER_EXPORT VkResult VKAPI vkCreateInstance(const VkInstanceCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkInstance* pInstance) +VK_LAYER_EXPORT VkResult VKAPI vkCreateInstance(const VkInstanceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkInstance* pInstance) { layer_data *my_data = get_my_data_ptr(get_dispatch_key(*pInstance), layer_data_map); VkLayerInstanceDispatchTable* pTable = my_data->instance_dispatch_table; @@ -178,7 +178,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateInstance(const VkInstanceCreateInfo* pCre } /* hook DestroyInstance to remove tableInstanceMap entry */ -VK_LAYER_EXPORT void VKAPI vkDestroyInstance(VkInstance instance, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks* pAllocator) { dispatch_key key = get_dispatch_key(instance); layer_data *my_data = get_my_data_ptr(key, layer_data_map); @@ -317,20 +317,20 @@ VK_LAYER_EXPORT void VKAPI vkGetPhysicalDeviceSparseImageFormatProperties(VkPhys } VK_LAYER_EXPORT void VKAPI vkCmdSetViewport( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t viewportCount, const VkViewport* pViewports) { VkBool32 skipCall = VK_FALSE; /* TODO: Verify viewportCount < maxViewports from VkPhysicalDeviceLimits */ if (VK_FALSE == skipCall) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - my_data->device_dispatch_table->CmdSetViewport(cmdBuffer, viewportCount, pViewports); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + my_data->device_dispatch_table->CmdSetViewport(commandBuffer, viewportCount, pViewports); } } VK_LAYER_EXPORT void VKAPI vkCmdSetScissor( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t scissorCount, const VkRect2D* pScissors) { @@ -338,8 +338,8 @@ VK_LAYER_EXPORT void VKAPI vkCmdSetScissor( /* TODO: Verify scissorCount < maxViewports from VkPhysicalDeviceLimits */ /* TODO: viewportCount and scissorCount must match at draw time */ if (VK_FALSE == skipCall) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - my_data->device_dispatch_table->CmdSetScissor(cmdBuffer, scissorCount, pScissors); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + my_data->device_dispatch_table->CmdSetScissor(commandBuffer, scissorCount, pScissors); } } @@ -387,7 +387,7 @@ static VkBool32 validate_features_request(layer_data *phy_dev_data) return skipCall; } -VK_LAYER_EXPORT VkResult VKAPI vkCreateDevice(VkPhysicalDevice gpu, const VkDeviceCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkDevice* pDevice) +VK_LAYER_EXPORT VkResult VKAPI vkCreateDevice(VkPhysicalDevice gpu, const VkDeviceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDevice* pDevice) { VkBool32 skipCall = VK_FALSE; layer_data *phy_dev_data = get_my_data_ptr(get_dispatch_key(gpu), layer_data_map); @@ -429,7 +429,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateDevice(VkPhysicalDevice gpu, const VkDevi return result; } -VK_LAYER_EXPORT void VKAPI vkDestroyDevice(VkDevice device, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroyDevice(VkDevice device, const VkAllocationCallbacks* pAllocator) { // Free device lifetime allocations dispatch_key key = get_dispatch_key(device); @@ -440,33 +440,33 @@ VK_LAYER_EXPORT void VKAPI vkDestroyDevice(VkDevice device, const VkAllocCallbac layer_data_map.erase(key); } -VK_LAYER_EXPORT VkResult VKAPI vkCreateCommandPool(VkDevice device, const VkCmdPoolCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkCmdPool* pCmdPool) +VK_LAYER_EXPORT VkResult VKAPI vkCreateCommandPool(VkDevice device, const VkCommandPoolCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkCommandPool* pCommandPool) { // TODO : Verify that requested QueueFamilyIndex for this pool exists - VkResult result = get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->CreateCommandPool(device, pCreateInfo, pAllocator, pCmdPool); + VkResult result = get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->CreateCommandPool(device, pCreateInfo, pAllocator, pCommandPool); return result; } -VK_LAYER_EXPORT void VKAPI vkDestroyCommandPool(VkDevice device, VkCmdPool cmdPool, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroyCommandPool(VkDevice device, VkCommandPool commandPool, const VkAllocationCallbacks* pAllocator) { - get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyCommandPool(device, cmdPool, pAllocator); + get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyCommandPool(device, commandPool, pAllocator); } -VK_LAYER_EXPORT VkResult VKAPI vkResetCommandPool(VkDevice device, VkCmdPool cmdPool, VkCmdPoolResetFlags flags) +VK_LAYER_EXPORT VkResult VKAPI vkResetCommandPool(VkDevice device, VkCommandPool commandPool, VkCommandPoolResetFlags flags) { - VkResult result = get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->ResetCommandPool(device, cmdPool, flags); + VkResult result = get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->ResetCommandPool(device, commandPool, flags); return result; } -VK_LAYER_EXPORT VkResult VKAPI vkAllocCommandBuffers(VkDevice device, const VkCmdBufferAllocInfo* pCreateInfo, VkCmdBuffer* pCmdBuffer) +VK_LAYER_EXPORT VkResult VKAPI vkAllocateCommandBuffers(VkDevice device, const VkCommandBufferAllocateInfo* pCreateInfo, VkCommandBuffer* pCommandBuffer) { - VkResult result = get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->AllocCommandBuffers(device, pCreateInfo, pCmdBuffer); + VkResult result = get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->AllocateCommandBuffers(device, pCreateInfo, pCommandBuffer); return result; } -VK_LAYER_EXPORT void VKAPI vkFreeCommandBuffers(VkDevice device, VkCmdPool cmdPool, uint32_t count, const VkCmdBuffer* pCommandBuffers) +VK_LAYER_EXPORT void VKAPI vkFreeCommandBuffers(VkDevice device, VkCommandPool commandPool, uint32_t count, const VkCommandBuffer* pCommandBuffers) { - get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->FreeCommandBuffers(device, cmdPool, count, pCommandBuffers); + get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->FreeCommandBuffers(device, commandPool, count, pCommandBuffers); } VK_LAYER_EXPORT void VKAPI vkGetDeviceQueue(VkDevice device, uint32_t queueFamilyIndex, uint32_t queueIndex, VkQueue* pQueue) @@ -490,7 +490,7 @@ VK_LAYER_EXPORT void VKAPI vkGetDeviceQueue(VkDevice device, uint32_t queueFamil VK_LAYER_EXPORT VkResult VKAPI vkCreateImage( VkDevice device, const VkImageCreateInfo *pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkImage *pImage) { VkBool32 skipCall = VK_FALSE; @@ -543,63 +543,63 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateImage( } VK_LAYER_EXPORT void VKAPI vkCmdUpdateBuffer( - VkCmdBuffer cmdBuffer, - VkBuffer destBuffer, - VkDeviceSize destOffset, + VkCommandBuffer commandBuffer, + VkBuffer dstBuffer, + VkDeviceSize dstOffset, VkDeviceSize dataSize, const uint32_t* pData) { - layer_data *dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); - // destOffset is the byte offset into the buffer to start updating and must be a multiple of 4. - if (destOffset & 3) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + // dstOffset is the byte offset into the buffer to start updating and must be a multiple of 4. + if (dstOffset & 3) { + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); if (log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "DL", - "vkCmdUpdateBuffer parameter, VkDeviceSize destOffset, is not a multiple of 4")) { + "vkCmdUpdateBuffer parameter, VkDeviceSize dstOffset, is not a multiple of 4")) { return; } } // dataSize is the number of bytes to update, which must be a multiple of 4. if (dataSize & 3) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); if (log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "DL", "vkCmdUpdateBuffer parameter, VkDeviceSize dataSize, is not a multiple of 4")) { return; } } - dev_data->device_dispatch_table->CmdUpdateBuffer(cmdBuffer, destBuffer, destOffset, dataSize, pData); + dev_data->device_dispatch_table->CmdUpdateBuffer(commandBuffer, dstBuffer, dstOffset, dataSize, pData); } VK_LAYER_EXPORT void VKAPI vkCmdFillBuffer( - VkCmdBuffer cmdBuffer, - VkBuffer destBuffer, - VkDeviceSize destOffset, + VkCommandBuffer commandBuffer, + VkBuffer dstBuffer, + VkDeviceSize dstOffset, VkDeviceSize size, uint32_t data) { - layer_data *dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); - // destOffset is the byte offset into the buffer to start filling and must be a multiple of 4. - if (destOffset & 3) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + // dstOffset is the byte offset into the buffer to start filling and must be a multiple of 4. + if (dstOffset & 3) { + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); if (log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "DL", - "vkCmdFillBuffer parameter, VkDeviceSize destOffset, is not a multiple of 4")) { + "vkCmdFillBuffer parameter, VkDeviceSize dstOffset, is not a multiple of 4")) { return; } } // size is the number of bytes to fill, which must be a multiple of 4. if (size & 3) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); if (log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "DL", "vkCmdFillBuffer parameter, VkDeviceSize size, is not a multiple of 4")) { return; } } - dev_data->device_dispatch_table->CmdFillBuffer(cmdBuffer, destBuffer, destOffset, size, data); + dev_data->device_dispatch_table->CmdFillBuffer(commandBuffer, dstBuffer, dstOffset, size, data); } VK_LAYER_EXPORT VkResult VKAPI vkDbgCreateMsgCallback( @@ -656,8 +656,8 @@ VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI vkGetDeviceProcAddr(VkDevice dev, const return (PFN_vkVoidFunction) vkDestroyCommandPool; if (!strcmp(funcName, "ResetCommandPool")) return (PFN_vkVoidFunction) vkResetCommandPool; - if (!strcmp(funcName, "vkAllocCommandBuffers")) - return (PFN_vkVoidFunction) vkAllocCommandBuffers; + if (!strcmp(funcName, "vkAllocateCommandBuffers")) + return (PFN_vkVoidFunction) vkAllocateCommandBuffers; if (!strcmp(funcName, "vkFreeCommandBuffers")) return (PFN_vkVoidFunction) vkFreeCommandBuffers; if (!strcmp(funcName, "vkCmdUpdateBuffer")) diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp index cf733696..d1708305 100755 --- a/layers/draw_state.cpp +++ b/layers/draw_state.cpp @@ -75,7 +75,7 @@ struct layer_data { unordered_map<VkPipelineLayout, PIPELINE_LAYOUT_NODE> pipelineLayoutMap; unordered_map<VkShader, VkShaderStageFlagBits> shaderStageMap; // Map for layout chains - unordered_map<void*, GLOBAL_CB_NODE*> cmdBufferMap; + unordered_map<void*, GLOBAL_CB_NODE*> commandBufferMap; unordered_map<VkRenderPass, VkRenderPassCreateInfo*> renderPassMap; unordered_map<VkFramebuffer, VkFramebufferCreateInfo*> frameBufferMap; @@ -226,11 +226,11 @@ static string cmdTypeToString(CMD_TYPE cmd) static uint64_t g_drawCount[NUM_DRAW_TYPES] = {0, 0, 0, 0}; -// TODO : Should be tracking lastBound per cmdBuffer and when draws occur, report based on that cmd buffer lastBound +// TODO : Should be tracking lastBound per commandBuffer and when draws occur, report based on that cmd buffer lastBound // Then need to synchronize the accesses based on cmd buffer so that if I'm reading state on one cmd buffer, updates // to that same cmd buffer by separate thread are not changing state from underneath us // Track the last cmd buffer touched by this thread -static VkCmdBuffer g_lastCmdBuffer[MAX_TID] = {NULL}; +static VkCommandBuffer g_lastCommandBuffer[MAX_TID] = {NULL}; // Track the last group of CBs touched for displaying to dot file static GLOBAL_CB_NODE* g_pLastTouchedCB[NUM_COMMAND_BUFFERS_TO_DISPLAY] = {NULL}; static uint32_t g_lastTouchedCBIndex = 0; @@ -239,11 +239,11 @@ static GLOBAL_CB_NODE* g_lastGlobalCB = NULL; static PIPELINE_NODE* g_lastBoundPipeline = NULL; #define MAX_BINDING 0xFFFFFFFF // Default vtxBinding value in CB Node to identify if no vtxBinding set // prototype -static GLOBAL_CB_NODE* getCBNode(layer_data*, const VkCmdBuffer); -// Update global ptrs to reflect that specified cmdBuffer has been used +static GLOBAL_CB_NODE* getCBNode(layer_data*, const VkCommandBuffer); +// Update global ptrs to reflect that specified commandBuffer has been used static void updateCBTracking(GLOBAL_CB_NODE* pCB) { - g_lastCmdBuffer[getTIDIndex()] = pCB->cmdBuffer; + g_lastCommandBuffer[getTIDIndex()] = pCB->commandBuffer; loader_platform_thread_lock_mutex(&globalLock); g_lastGlobalCB = pCB; // TODO : This is a dumb algorithm. Need smart LRU that drops off oldest @@ -274,7 +274,7 @@ static VkBool32 validate_status(layer_data* my_data, GLOBAL_CB_NODE* pNode, CBSt if ((pNode->status & status_mask) != status_flag) { // TODO : How to pass dispatchable objects as srcObject? Here src obj should be cmd buffer return log_msg(my_data->report_data, msg_flags, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, error_code, "DS", - "CB object %#" PRIxLEAST64 ": %s", reinterpret_cast<uint64_t>(pNode->cmdBuffer), fail_msg); + "CB object %#" PRIxLEAST64 ": %s", reinterpret_cast<uint64_t>(pNode->commandBuffer), fail_msg); } } return VK_FALSE; @@ -518,9 +518,9 @@ static PIPELINE_NODE* initPipeline(layer_data* dev_data, const VkGraphicsPipelin memcpy((void*)&pPipeline->vpStateCI, pCreateInfo->pViewportState, sizeof(VkPipelineViewportStateCreateInfo)); pPipeline->graphicsPipelineCI.pViewportState = &pPipeline->vpStateCI; } - if (pCreateInfo->pRasterState != NULL) { - memcpy((void*)&pPipeline->rsStateCI, pCreateInfo->pRasterState, sizeof(VkPipelineRasterStateCreateInfo)); - pPipeline->graphicsPipelineCI.pRasterState = &pPipeline->rsStateCI; + if (pCreateInfo->pRasterizationState != NULL) { + memcpy((void*)&pPipeline->rsStateCI, pCreateInfo->pRasterizationState, sizeof(VkPipelineRasterizationStateCreateInfo)); + pPipeline->graphicsPipelineCI.pRasterizationState = &pPipeline->rsStateCI; } if (pCreateInfo->pMultisampleState != NULL) { memcpy((void*)&pPipeline->msStateCI, pCreateInfo->pMultisampleState, sizeof(VkPipelineMultisampleStateCreateInfo)); @@ -584,7 +584,7 @@ static uint32_t getNumSamples(layer_data* my_data, const VkPipeline pipeline) { PIPELINE_NODE* pPipe = my_data->pipelineMap[pipeline]; if (VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO == pPipe->msStateCI.sType) { - return pPipe->msStateCI.rasterSamples; + return pPipe->msStateCI.rasterizationSamples; } return 1; } @@ -1018,7 +1018,7 @@ static VkBool32 dsUpdate(layer_data* my_data, VkDevice device, uint32_t descript // Validate Write updates uint32_t i = 0; for (i=0; i < descriptorWriteCount; i++) { - VkDescriptorSet ds = pWDS[i].destSet; + VkDescriptorSet ds = pWDS[i].dstSet; SET_NODE* pSet = my_data->setMap[ds]; GENERIC_HEADER* pUpdate = (GENERIC_HEADER*) &pWDS[i]; pLayout = pSet->pLayout; @@ -1027,14 +1027,14 @@ static VkBool32 dsUpdate(layer_data* my_data, VkDevice device, uint32_t descript break; } uint32_t binding = 0, endIndex = 0; - binding = pWDS[i].destBinding; + binding = pWDS[i].dstBinding; // Make sure that layout being updated has the binding being updated if (pLayout->createInfo.bindingCount < binding) { skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, (uint64_t) ds, 0, DRAWSTATE_INVALID_UPDATE_INDEX, "DS", "Descriptor Set %p does not have binding to match update binding %u for update type %s!", ds, binding, string_VkStructureType(pUpdate->sType)); } else { // Next verify that update falls within size of given binding - endIndex = getUpdateEndIndex(my_data, device, pLayout, binding, pWDS[i].destArrayElement, pUpdate); + endIndex = getUpdateEndIndex(my_data, device, pLayout, binding, pWDS[i].dstArrayElement, pUpdate); if (getBindingEndIndex(pLayout, binding) < endIndex) { pLayoutCI = &pLayout->createInfo; string DSstr = vk_print_vkdescriptorsetlayoutcreateinfo(pLayoutCI, "{DS} "); @@ -1042,7 +1042,7 @@ static VkBool32 dsUpdate(layer_data* my_data, VkDevice device, uint32_t descript "Descriptor update type of %s is out of bounds for matching binding %u in Layout w/ CI:\n%s!", string_VkStructureType(pUpdate->sType), binding, DSstr.c_str()); } else { // TODO : should we skip update on a type mismatch or force it? uint32_t startIndex; - startIndex = getUpdateStartIndex(my_data, device, pLayout, binding, pWDS[i].destArrayElement, pUpdate); + startIndex = getUpdateStartIndex(my_data, device, pLayout, binding, pWDS[i].dstArrayElement, pUpdate); // Layout bindings match w/ update, now verify that update type & stageFlags are the same for entire update if ((skipCall = validateUpdateConsistency(my_data, device, pLayout, pUpdate, startIndex, endIndex)) == VK_FALSE) { // The update is within bounds and consistent, but need to make sure contents make sense as well @@ -1076,7 +1076,7 @@ static VkBool32 dsUpdate(layer_data* my_data, VkDevice device, uint32_t descript uint32_t srcStartIndex = 0, srcEndIndex = 0, dstStartIndex = 0, dstEndIndex = 0; // For each copy make sure that update falls within given layout and that types match pSrcSet = my_data->setMap[pCDS[i].srcSet]; - pDstSet = my_data->setMap[pCDS[i].destSet]; + pDstSet = my_data->setMap[pCDS[i].dstSet]; pSrcLayout = pSrcSet->pLayout; pDstLayout = pDstSet->pLayout; // Validate that src binding is valid for src set layout @@ -1084,27 +1084,27 @@ static VkBool32 dsUpdate(layer_data* my_data, VkDevice device, uint32_t descript skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, (uint64_t) pSrcSet->set, 0, DRAWSTATE_INVALID_UPDATE_INDEX, "DS", "Copy descriptor update %u has srcBinding %u which is out of bounds for underlying SetLayout %#" PRIxLEAST64 " which only has bindings 0-%u.", i, pCDS[i].srcBinding, (uint64_t) pSrcLayout->layout, pSrcLayout->createInfo.bindingCount-1); - } else if (pDstLayout->createInfo.bindingCount < pCDS[i].destBinding) { + } else if (pDstLayout->createInfo.bindingCount < pCDS[i].dstBinding) { skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, (uint64_t) pDstSet->set, 0, DRAWSTATE_INVALID_UPDATE_INDEX, "DS", - "Copy descriptor update %u has destBinding %u which is out of bounds for underlying SetLayout %#" PRIxLEAST64 " which only has bindings 0-%u.", - i, pCDS[i].destBinding, (uint64_t) pDstLayout->layout, pDstLayout->createInfo.bindingCount-1); + "Copy descriptor update %u has dstBinding %u which is out of bounds for underlying SetLayout %#" PRIxLEAST64 " which only has bindings 0-%u.", + i, pCDS[i].dstBinding, (uint64_t) pDstLayout->layout, pDstLayout->createInfo.bindingCount-1); } else { // Proceed with validation. Bindings are ok, but make sure update is within bounds of given layout srcEndIndex = getUpdateEndIndex(my_data, device, pSrcLayout, pCDS[i].srcBinding, pCDS[i].srcArrayElement, (const GENERIC_HEADER*)&(pCDS[i])); - dstEndIndex = getUpdateEndIndex(my_data, device, pDstLayout, pCDS[i].destBinding, pCDS[i].destArrayElement, (const GENERIC_HEADER*)&(pCDS[i])); + dstEndIndex = getUpdateEndIndex(my_data, device, pDstLayout, pCDS[i].dstBinding, pCDS[i].dstArrayElement, (const GENERIC_HEADER*)&(pCDS[i])); if (getBindingEndIndex(pSrcLayout, pCDS[i].srcBinding) < srcEndIndex) { pLayoutCI = &pSrcLayout->createInfo; string DSstr = vk_print_vkdescriptorsetlayoutcreateinfo(pLayoutCI, "{DS} "); skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, (uint64_t) pSrcSet->set, 0, DRAWSTATE_DESCRIPTOR_UPDATE_OUT_OF_BOUNDS, "DS", "Copy descriptor src update is out of bounds for matching binding %u in Layout w/ CI:\n%s!", pCDS[i].srcBinding, DSstr.c_str()); - } else if (getBindingEndIndex(pDstLayout, pCDS[i].destBinding) < dstEndIndex) { + } else if (getBindingEndIndex(pDstLayout, pCDS[i].dstBinding) < dstEndIndex) { pLayoutCI = &pDstLayout->createInfo; string DSstr = vk_print_vkdescriptorsetlayoutcreateinfo(pLayoutCI, "{DS} "); skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, (uint64_t) pDstSet->set, 0, DRAWSTATE_DESCRIPTOR_UPDATE_OUT_OF_BOUNDS, "DS", - "Copy descriptor dest update is out of bounds for matching binding %u in Layout w/ CI:\n%s!", pCDS[i].destBinding, DSstr.c_str()); + "Copy descriptor dest update is out of bounds for matching binding %u in Layout w/ CI:\n%s!", pCDS[i].dstBinding, DSstr.c_str()); } else { srcStartIndex = getUpdateStartIndex(my_data, device, pSrcLayout, pCDS[i].srcBinding, pCDS[i].srcArrayElement, (const GENERIC_HEADER*)&(pCDS[i])); - dstStartIndex = getUpdateStartIndex(my_data, device, pDstLayout, pCDS[i].destBinding, pCDS[i].destArrayElement, (const GENERIC_HEADER*)&(pCDS[i])); + dstStartIndex = getUpdateStartIndex(my_data, device, pDstLayout, pCDS[i].dstBinding, pCDS[i].dstArrayElement, (const GENERIC_HEADER*)&(pCDS[i])); for (uint32_t j=0; j<pCDS[i].descriptorCount; ++j) { // For copy just make sure that the types match and then perform the update if (pSrcLayout->descriptorTypes[srcStartIndex+j] != pDstLayout->descriptorTypes[dstStartIndex+j]) { @@ -1131,7 +1131,7 @@ static VkBool32 validate_descriptor_availability_in_pool(layer_data* dev_data, P LAYOUT_NODE* pLayout = getLayoutNode(dev_data, pSetLayouts[i]); if (NULL == pLayout) { skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT, (uint64_t) pSetLayouts[i], 0, DRAWSTATE_INVALID_LAYOUT, "DS", - "Unable to find set layout node for layout %#" PRIxLEAST64 " specified in vkAllocDescriptorSets() call", (uint64_t) pSetLayouts[i]); + "Unable to find set layout node for layout %#" PRIxLEAST64 " specified in vkAllocateDescriptorSets() call", (uint64_t) pSetLayouts[i]); } else { uint32_t typeIndex = 0, typeCount = 0; for (j=0; j<pLayout->createInfo.bindingCount; ++j) { @@ -1282,26 +1282,26 @@ static void clearDescriptorPool(layer_data* my_data, const VkDevice device, cons } } // For given CB object, fetch associated CB Node from map -static GLOBAL_CB_NODE* getCBNode(layer_data* my_data, const VkCmdBuffer cb) +static GLOBAL_CB_NODE* getCBNode(layer_data* my_data, const VkCommandBuffer cb) { loader_platform_thread_lock_mutex(&globalLock); - if (my_data->cmdBufferMap.find(cb) == my_data->cmdBufferMap.end()) { + if (my_data->commandBufferMap.find(cb) == my_data->commandBufferMap.end()) { loader_platform_thread_unlock_mutex(&globalLock); // TODO : How to pass cb as srcObj here? - log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", - "Attempt to use CmdBuffer %#" PRIxLEAST64 " that doesn't exist!", reinterpret_cast<uint64_t>(cb)); + log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_INVALID_COMMAND_BUFFER, "DS", + "Attempt to use CommandBuffer %#" PRIxLEAST64 " that doesn't exist!", reinterpret_cast<uint64_t>(cb)); return NULL; } loader_platform_thread_unlock_mutex(&globalLock); - return my_data->cmdBufferMap[cb]; + return my_data->commandBufferMap[cb]; } // Free all CB Nodes // NOTE : Calls to this function should be wrapped in mutex -static void deleteCmdBuffers(layer_data* my_data) +static void deleteCommandBuffers(layer_data* my_data) { - if (my_data->cmdBufferMap.size() <= 0) + if (my_data->commandBufferMap.size() <= 0) return; - for (auto ii=my_data->cmdBufferMap.begin(); ii!=my_data->cmdBufferMap.end(); ++ii) { + for (auto ii=my_data->commandBufferMap.begin(); ii!=my_data->commandBufferMap.end(); ++ii) { vector<CMD_NODE*> cmd_node_list = (*ii).second->pCmds; while (!cmd_node_list.empty()) { CMD_NODE* cmd_node = cmd_node_list.back(); @@ -1310,12 +1310,12 @@ static void deleteCmdBuffers(layer_data* my_data) } delete (*ii).second; } - my_data->cmdBufferMap.clear(); + my_data->commandBufferMap.clear(); } -static VkBool32 report_error_no_cb_begin(const layer_data* dev_data, const VkCmdBuffer cb, const char* caller_name) +static VkBool32 report_error_no_cb_begin(const layer_data* dev_data, const VkCommandBuffer cb, const char* caller_name) { // TODO : How to pass cb as srcObj here? - return log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_NO_BEGIN_CMD_BUFFER, "DS", + return log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_NO_BEGIN_COMMAND_BUFFER, "DS", "You must call vkBeginCommandBuffer() before this call to %s", (void*)caller_name); } static VkBool32 addCmd(const layer_data* my_data, GLOBAL_CB_NODE* pCB, const CMD_TYPE cmd) @@ -1331,11 +1331,11 @@ static VkBool32 addCmd(const layer_data* my_data, GLOBAL_CB_NODE* pCB, const CMD } else { // TODO : How to pass cb as srcObj here? skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_OUT_OF_MEMORY, "DS", - "Out of memory while attempting to allocate new CMD_NODE for cmdBuffer %#" PRIxLEAST64, reinterpret_cast<uint64_t>(pCB->cmdBuffer)); + "Out of memory while attempting to allocate new CMD_NODE for commandBuffer %#" PRIxLEAST64, reinterpret_cast<uint64_t>(pCB->commandBuffer)); } return skipCall; } -static void resetCB(layer_data* my_data, const VkCmdBuffer cb) +static void resetCB(layer_data* my_data, const VkCommandBuffer cb) { GLOBAL_CB_NODE* pCB = getCBNode(my_data, cb); if (pCB) { @@ -1346,9 +1346,9 @@ static void resetCB(layer_data* my_data, const VkCmdBuffer cb) } pCB->pCmds.clear(); // Reset CB state (need to save createInfo) - VkCmdBufferAllocInfo saveCBCI = pCB->createInfo; + VkCommandBufferAllocateInfo saveCBCI = pCB->createInfo; memset(pCB, 0, sizeof(GLOBAL_CB_NODE)); - pCB->cmdBuffer = cb; + pCB->commandBuffer = cb; pCB->createInfo = saveCBCI; pCB->lastVtxBinding = MAX_BINDING; } @@ -1413,7 +1413,7 @@ static void set_cb_pso_status(GLOBAL_CB_NODE* pCB, const PIPELINE_NODE* pPipe) } } // Print the last bound Gfx Pipeline -static VkBool32 printPipeline(layer_data* my_data, const VkCmdBuffer cb) +static VkBool32 printPipeline(layer_data* my_data, const VkCommandBuffer cb) { VkBool32 skipCall = VK_FALSE; GLOBAL_CB_NODE* pCB = getCBNode(my_data, cb); @@ -1429,7 +1429,7 @@ static VkBool32 printPipeline(layer_data* my_data, const VkCmdBuffer cb) return skipCall; } // Print details of DS config to stdout -static VkBool32 printDSConfig(layer_data* my_data, const VkCmdBuffer cb) +static VkBool32 printDSConfig(layer_data* my_data, const VkCommandBuffer cb) { VkBool32 skipCall = VK_FALSE; char ds_config_str[1024*256] = {0}; // TODO : Currently making this buffer HUGE w/o overrun protection. Need to be smarter, start smaller, and grow as needed. @@ -1478,7 +1478,7 @@ static VkBool32 printDSConfig(layer_data* my_data, const VkCmdBuffer cb) return skipCall; } -static void printCB(layer_data* my_data, const VkCmdBuffer cb) +static void printCB(layer_data* my_data, const VkCommandBuffer cb) { GLOBAL_CB_NODE* pCB = getCBNode(my_data, cb); if (pCB && pCB->pCmds.size() > 0) { @@ -1495,7 +1495,7 @@ static void printCB(layer_data* my_data, const VkCmdBuffer cb) } } -static VkBool32 synchAndPrintDSConfig(layer_data* my_data, const VkCmdBuffer cb) +static VkBool32 synchAndPrintDSConfig(layer_data* my_data, const VkCommandBuffer cb) { VkBool32 skipCall = VK_FALSE; if (!(my_data->report_data->active_flags & VK_DBG_REPORT_INFO_BIT)) { @@ -1513,7 +1513,7 @@ static VkBool32 insideRenderPass(const layer_data* my_data, GLOBAL_CB_NODE *pCB, VkBool32 inside = VK_FALSE; if (pCB->activeRenderPass) { inside = log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)pCB->cmdBuffer, 0, DRAWSTATE_INVALID_RENDERPASS_CMD, "DS", + (uint64_t)pCB->commandBuffer, 0, DRAWSTATE_INVALID_RENDERPASS_CMD, "DS", "%s: It is invalid to issue this call inside an active render pass (%#" PRIxLEAST64 ")", apiName, (uint64_t) pCB->activeRenderPass); } @@ -1527,7 +1527,7 @@ static VkBool32 outsideRenderPass(const layer_data* my_data, GLOBAL_CB_NODE *pCB VkBool32 outside = VK_FALSE; if (!pCB->activeRenderPass) { outside = log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)pCB->cmdBuffer, 0, DRAWSTATE_NO_ACTIVE_RENDERPASS, "DS", + (uint64_t)pCB->commandBuffer, 0, DRAWSTATE_NO_ACTIVE_RENDERPASS, "DS", "%s: This call must be issued inside an active render pass.", apiName); } return outside; @@ -1565,7 +1565,7 @@ static void init_draw_state(layer_data *my_data) } } -VK_LAYER_EXPORT VkResult VKAPI vkCreateInstance(const VkInstanceCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkInstance* pInstance) +VK_LAYER_EXPORT VkResult VKAPI vkCreateInstance(const VkInstanceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkInstance* pInstance) { layer_data *my_data = get_my_data_ptr(get_dispatch_key(*pInstance), layer_data_map); VkLayerInstanceDispatchTable *pTable = my_data->instance_dispatch_table; @@ -1585,7 +1585,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateInstance(const VkInstanceCreateInfo* pCre } /* hook DestroyInstance to remove tableInstanceMap entry */ -VK_LAYER_EXPORT void VKAPI vkDestroyInstance(VkInstance instance, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks* pAllocator) { dispatch_key key = get_dispatch_key(instance); layer_data *my_data = get_my_data_ptr(key, layer_data_map); @@ -1625,7 +1625,7 @@ static void createDeviceRegisterExtensions(const VkDeviceCreateInfo* pCreateInfo } } -VK_LAYER_EXPORT VkResult VKAPI vkCreateDevice(VkPhysicalDevice gpu, const VkDeviceCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkDevice* pDevice) +VK_LAYER_EXPORT VkResult VKAPI vkCreateDevice(VkPhysicalDevice gpu, const VkDeviceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDevice* pDevice) { layer_data* dev_data = get_my_data_ptr(get_dispatch_key(*pDevice), layer_data_map); VkResult result = dev_data->device_dispatch_table->CreateDevice(gpu, pCreateInfo, pAllocator, pDevice); @@ -1638,7 +1638,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateDevice(VkPhysicalDevice gpu, const VkDevi } // prototype static void deleteRenderPasses(layer_data*); -VK_LAYER_EXPORT void VKAPI vkDestroyDevice(VkDevice device, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroyDevice(VkDevice device, const VkAllocationCallbacks* pAllocator) { dispatch_key key = get_dispatch_key(device); layer_data* dev_data = get_my_data_ptr(key, layer_data_map); @@ -1646,7 +1646,7 @@ VK_LAYER_EXPORT void VKAPI vkDestroyDevice(VkDevice device, const VkAllocCallbac loader_platform_thread_lock_mutex(&globalLock); deletePipelines(dev_data); deleteRenderPasses(dev_data); - deleteCmdBuffers(dev_data); + deleteCommandBuffers(dev_data); deletePools(dev_data); deleteLayouts(dev_data); dev_data->imageViewMap.clear(); @@ -1737,15 +1737,15 @@ VK_LAYER_EXPORT VkResult VKAPI vkQueueSubmit(VkQueue queue, uint32_t submitCount pCB = getCBNode(dev_data, submit->pCommandBuffers[i]); loader_platform_thread_lock_mutex(&globalLock); pCB->submitCount++; // increment submit count - if ((pCB->beginInfo.flags & VK_CMD_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT) && (pCB->submitCount > 1)) { - skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_CMD_BUFFER_SINGLE_SUBMIT_VIOLATION, "DS", - "CB %#" PRIxLEAST64 " was begun w/ VK_CMD_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT set, but has been submitted %#" PRIxLEAST64 " times.", reinterpret_cast<uint64_t>(pCB->cmdBuffer), pCB->submitCount); + if ((pCB->beginInfo.flags & VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT) && (pCB->submitCount > 1)) { + skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_COMMAND_BUFFER_SINGLE_SUBMIT_VIOLATION, "DS", + "CB %#" PRIxLEAST64 " was begun w/ VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT set, but has been submitted %#" PRIxLEAST64 " times.", reinterpret_cast<uint64_t>(pCB->commandBuffer), pCB->submitCount); } if (CB_UPDATE_COMPLETE != pCB->state) { // Flag error for using CB w/o vkEndCommandBuffer() called // TODO : How to pass cb as srcObj? - skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_NO_END_CMD_BUFFER, "DS", - "You must call vkEndCommandBuffer() on CB %#" PRIxLEAST64 " before this call to vkQueueSubmit()!", reinterpret_cast<uint64_t>(pCB->cmdBuffer)); + skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_NO_END_COMMAND_BUFFER, "DS", + "You must call vkEndCommandBuffer() on CB %#" PRIxLEAST64 " before this call to vkQueueSubmit()!", reinterpret_cast<uint64_t>(pCB->commandBuffer)); loader_platform_thread_unlock_mutex(&globalLock); return VK_ERROR_VALIDATION_FAILED; } @@ -1757,119 +1757,119 @@ VK_LAYER_EXPORT VkResult VKAPI vkQueueSubmit(VkQueue queue, uint32_t submitCount return VK_ERROR_VALIDATION_FAILED; } -VK_LAYER_EXPORT void VKAPI vkDestroyFence(VkDevice device, VkFence fence, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroyFence(VkDevice device, VkFence fence, const VkAllocationCallbacks* pAllocator) { get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyFence(device, fence, pAllocator); // TODO : Clean up any internal data structures using this obj. } -VK_LAYER_EXPORT void VKAPI vkDestroySemaphore(VkDevice device, VkSemaphore semaphore, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroySemaphore(VkDevice device, VkSemaphore semaphore, const VkAllocationCallbacks* pAllocator) { get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroySemaphore(device, semaphore, pAllocator); // TODO : Clean up any internal data structures using this obj. } -VK_LAYER_EXPORT void VKAPI vkDestroyEvent(VkDevice device, VkEvent event, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroyEvent(VkDevice device, VkEvent event, const VkAllocationCallbacks* pAllocator) { get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyEvent(device, event, pAllocator); // TODO : Clean up any internal data structures using this obj. } -VK_LAYER_EXPORT void VKAPI vkDestroyQueryPool(VkDevice device, VkQueryPool queryPool, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroyQueryPool(VkDevice device, VkQueryPool queryPool, const VkAllocationCallbacks* pAllocator) { get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyQueryPool(device, queryPool, pAllocator); // TODO : Clean up any internal data structures using this obj. } -VK_LAYER_EXPORT void VKAPI vkDestroyBuffer(VkDevice device, VkBuffer buffer, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroyBuffer(VkDevice device, VkBuffer buffer, const VkAllocationCallbacks* pAllocator) { layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); dev_data->device_dispatch_table->DestroyBuffer(device, buffer, pAllocator); dev_data->bufferMap.erase(buffer); } -VK_LAYER_EXPORT void VKAPI vkDestroyBufferView(VkDevice device, VkBufferView bufferView, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroyBufferView(VkDevice device, VkBufferView bufferView, const VkAllocationCallbacks* pAllocator) { layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); dev_data->device_dispatch_table->DestroyBufferView(device, bufferView, pAllocator); dev_data->bufferViewMap.erase(bufferView); } -VK_LAYER_EXPORT void VKAPI vkDestroyImage(VkDevice device, VkImage image, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroyImage(VkDevice device, VkImage image, const VkAllocationCallbacks* pAllocator) { layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); dev_data->device_dispatch_table->DestroyImage(device, image, pAllocator); dev_data->imageMap.erase(image); } -VK_LAYER_EXPORT void VKAPI vkDestroyImageView(VkDevice device, VkImageView imageView, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroyImageView(VkDevice device, VkImageView imageView, const VkAllocationCallbacks* pAllocator) { get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyImageView(device, imageView, pAllocator); // TODO : Clean up any internal data structures using this obj. } -VK_LAYER_EXPORT void VKAPI vkDestroyShaderModule(VkDevice device, VkShaderModule shaderModule, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroyShaderModule(VkDevice device, VkShaderModule shaderModule, const VkAllocationCallbacks* pAllocator) { get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyShaderModule(device, shaderModule, pAllocator); // TODO : Clean up any internal data structures using this obj. } -VK_LAYER_EXPORT void VKAPI vkDestroyShader(VkDevice device, VkShader shader, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroyShader(VkDevice device, VkShader shader, const VkAllocationCallbacks* pAllocator) { layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); dev_data->device_dispatch_table->DestroyShader(device, shader, pAllocator); dev_data->shaderStageMap.erase(shader); } -VK_LAYER_EXPORT void VKAPI vkDestroyPipeline(VkDevice device, VkPipeline pipeline, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroyPipeline(VkDevice device, VkPipeline pipeline, const VkAllocationCallbacks* pAllocator) { get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyPipeline(device, pipeline, pAllocator); // TODO : Clean up any internal data structures using this obj. } -VK_LAYER_EXPORT void VKAPI vkDestroyPipelineLayout(VkDevice device, VkPipelineLayout pipelineLayout, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroyPipelineLayout(VkDevice device, VkPipelineLayout pipelineLayout, const VkAllocationCallbacks* pAllocator) { get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyPipelineLayout(device, pipelineLayout, pAllocator); // TODO : Clean up any internal data structures using this obj. } -VK_LAYER_EXPORT void VKAPI vkDestroySampler(VkDevice device, VkSampler sampler, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroySampler(VkDevice device, VkSampler sampler, const VkAllocationCallbacks* pAllocator) { get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroySampler(device, sampler, pAllocator); // TODO : Clean up any internal data structures using this obj. } -VK_LAYER_EXPORT void VKAPI vkDestroyDescriptorSetLayout(VkDevice device, VkDescriptorSetLayout descriptorSetLayout, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroyDescriptorSetLayout(VkDevice device, VkDescriptorSetLayout descriptorSetLayout, const VkAllocationCallbacks* pAllocator) { get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyDescriptorSetLayout(device, descriptorSetLayout, pAllocator); // TODO : Clean up any internal data structures using this obj. } -VK_LAYER_EXPORT void VKAPI vkDestroyDescriptorPool(VkDevice device, VkDescriptorPool descriptorPool, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroyDescriptorPool(VkDevice device, VkDescriptorPool descriptorPool, const VkAllocationCallbacks* pAllocator) { get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyDescriptorPool(device, descriptorPool, pAllocator); // TODO : Clean up any internal data structures using this obj. } -VK_LAYER_EXPORT void VKAPI vkFreeCommandBuffers(VkDevice device, VkCmdPool cmdPool, uint32_t count, const VkCmdBuffer *pCommandBuffers) +VK_LAYER_EXPORT void VKAPI vkFreeCommandBuffers(VkDevice device, VkCommandPool commandPool, uint32_t count, const VkCommandBuffer *pCommandBuffers) { - get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->FreeCommandBuffers(device, cmdPool, count, pCommandBuffers); + get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->FreeCommandBuffers(device, commandPool, count, pCommandBuffers); // TODO : Clean up any internal data structures using this obj. } -VK_LAYER_EXPORT void VKAPI vkDestroyFramebuffer(VkDevice device, VkFramebuffer framebuffer, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroyFramebuffer(VkDevice device, VkFramebuffer framebuffer, const VkAllocationCallbacks* pAllocator) { get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyFramebuffer(device, framebuffer, pAllocator); // TODO : Clean up any internal data structures using this obj. } -VK_LAYER_EXPORT void VKAPI vkDestroyRenderPass(VkDevice device, VkRenderPass renderPass, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroyRenderPass(VkDevice device, VkRenderPass renderPass, const VkAllocationCallbacks* pAllocator) { get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyRenderPass(device, renderPass, pAllocator); // TODO : Clean up any internal data structures using this obj. } -VK_LAYER_EXPORT VkResult VKAPI vkCreateBuffer(VkDevice device, const VkBufferCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkBuffer* pBuffer) +VK_LAYER_EXPORT VkResult VKAPI vkCreateBuffer(VkDevice device, const VkBufferCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkBuffer* pBuffer) { layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); VkResult result = dev_data->device_dispatch_table->CreateBuffer(device, pCreateInfo, pAllocator, pBuffer); @@ -1882,7 +1882,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateBuffer(VkDevice device, const VkBufferCre return result; } -VK_LAYER_EXPORT VkResult VKAPI vkCreateBufferView(VkDevice device, const VkBufferViewCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkBufferView* pView) +VK_LAYER_EXPORT VkResult VKAPI vkCreateBufferView(VkDevice device, const VkBufferViewCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkBufferView* pView) { layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); VkResult result = dev_data->device_dispatch_table->CreateBufferView(device, pCreateInfo, pAllocator, pView); @@ -1894,7 +1894,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateBufferView(VkDevice device, const VkBuffe return result; } -VK_LAYER_EXPORT VkResult VKAPI vkCreateImage(VkDevice device, const VkImageCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkImage* pImage) +VK_LAYER_EXPORT VkResult VKAPI vkCreateImage(VkDevice device, const VkImageCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkImage* pImage) { layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); VkResult result = dev_data->device_dispatch_table->CreateImage(device, pCreateInfo, pAllocator, pImage); @@ -1906,7 +1906,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateImage(VkDevice device, const VkImageCreat return result; } -VK_LAYER_EXPORT VkResult VKAPI vkCreateImageView(VkDevice device, const VkImageViewCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkImageView* pView) +VK_LAYER_EXPORT VkResult VKAPI vkCreateImageView(VkDevice device, const VkImageViewCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkImageView* pView) { layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); VkResult result = dev_data->device_dispatch_table->CreateImageView(device, pCreateInfo, pAllocator, pView); @@ -1921,7 +1921,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateImageView(VkDevice device, const VkImageV VK_LAYER_EXPORT VkResult VKAPI vkCreateShader( VkDevice device, const VkShaderCreateInfo *pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkShader *pShader) { layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); @@ -1940,7 +1940,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateShader( VkResult VKAPI vkCreatePipelineCache( VkDevice device, const VkPipelineCacheCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkPipelineCache* pPipelineCache) { layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); @@ -1951,7 +1951,7 @@ VkResult VKAPI vkCreatePipelineCache( void VKAPI vkDestroyPipelineCache( VkDevice device, VkPipelineCache pipelineCache, - const VkAllocCallbacks* pAllocator) + const VkAllocationCallbacks* pAllocator) { layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); dev_data->device_dispatch_table->DestroyPipelineCache(device, pipelineCache, pAllocator); @@ -1970,16 +1970,16 @@ VkResult VKAPI vkGetPipelineCacheData( VkResult VKAPI vkMergePipelineCaches( VkDevice device, - VkPipelineCache destCache, + VkPipelineCache dstCache, uint32_t srcCacheCount, const VkPipelineCache* pSrcCaches) { layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); - VkResult result = dev_data->device_dispatch_table->MergePipelineCaches(device, destCache, srcCacheCount, pSrcCaches); + VkResult result = dev_data->device_dispatch_table->MergePipelineCaches(device, dstCache, srcCacheCount, pSrcCaches); return result; } -VK_LAYER_EXPORT VkResult VKAPI vkCreateGraphicsPipelines(VkDevice device, VkPipelineCache pipelineCache, uint32_t count, const VkGraphicsPipelineCreateInfo* pCreateInfos, const VkAllocCallbacks* pAllocator, VkPipeline* pPipelines) +VK_LAYER_EXPORT VkResult VKAPI vkCreateGraphicsPipelines(VkDevice device, VkPipelineCache pipelineCache, uint32_t count, const VkGraphicsPipelineCreateInfo* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines) { VkResult result = VK_SUCCESS; //TODO What to do with pipelineCache? @@ -2021,7 +2021,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateGraphicsPipelines(VkDevice device, VkPipe return result; } -VK_LAYER_EXPORT VkResult VKAPI vkCreateSampler(VkDevice device, const VkSamplerCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkSampler* pSampler) +VK_LAYER_EXPORT VkResult VKAPI vkCreateSampler(VkDevice device, const VkSamplerCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSampler* pSampler) { layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); VkResult result = dev_data->device_dispatch_table->CreateSampler(device, pCreateInfo, pAllocator, pSampler); @@ -2033,7 +2033,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateSampler(VkDevice device, const VkSamplerC return result; } -VK_LAYER_EXPORT VkResult VKAPI vkCreateDescriptorSetLayout(VkDevice device, const VkDescriptorSetLayoutCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkDescriptorSetLayout* pSetLayout) +VK_LAYER_EXPORT VkResult VKAPI vkCreateDescriptorSetLayout(VkDevice device, const VkDescriptorSetLayoutCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDescriptorSetLayout* pSetLayout) { layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); VkResult result = dev_data->device_dispatch_table->CreateDescriptorSetLayout(device, pCreateInfo, pAllocator, pSetLayout); @@ -2082,7 +2082,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateDescriptorSetLayout(VkDevice device, cons return result; } -VkResult VKAPI vkCreatePipelineLayout(VkDevice device, const VkPipelineLayoutCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkPipelineLayout* pPipelineLayout) +VkResult VKAPI vkCreatePipelineLayout(VkDevice device, const VkPipelineLayoutCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkPipelineLayout* pPipelineLayout) { layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); VkResult result = dev_data->device_dispatch_table->CreatePipelineLayout(device, pCreateInfo, pAllocator, pPipelineLayout); @@ -2101,7 +2101,7 @@ VkResult VKAPI vkCreatePipelineLayout(VkDevice device, const VkPipelineLayoutCre return result; } -VK_LAYER_EXPORT VkResult VKAPI vkCreateDescriptorPool(VkDevice device, const VkDescriptorPoolCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkDescriptorPool* pDescriptorPool) +VK_LAYER_EXPORT VkResult VKAPI vkCreateDescriptorPool(VkDevice device, const VkDescriptorPoolCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDescriptorPool* pDescriptorPool) { layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); VkResult result = dev_data->device_dispatch_table->CreateDescriptorPool(device, pCreateInfo, pAllocator, pDescriptorPool); @@ -2136,36 +2136,36 @@ VK_LAYER_EXPORT VkResult VKAPI vkResetDescriptorPool(VkDevice device, VkDescript return result; } -VK_LAYER_EXPORT VkResult VKAPI vkAllocDescriptorSets(VkDevice device, const VkDescriptorSetAllocInfo* pAllocInfo, VkDescriptorSet* pDescriptorSets) +VK_LAYER_EXPORT VkResult VKAPI vkAllocateDescriptorSets(VkDevice device, const VkDescriptorSetAllocateInfo* pAllocateInfo, VkDescriptorSet* pDescriptorSets) { VkBool32 skipCall = VK_FALSE; layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); // Verify that requested descriptorSets are available in pool - POOL_NODE *pPoolNode = getPoolNode(dev_data, pAllocInfo->descriptorPool); + POOL_NODE *pPoolNode = getPoolNode(dev_data, pAllocateInfo->descriptorPool); if (!pPoolNode) { - skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_POOL, (uint64_t) pAllocInfo->descriptorPool, 0, DRAWSTATE_INVALID_POOL, "DS", - "Unable to find pool node for pool %#" PRIxLEAST64 " specified in vkAllocDescriptorSets() call", (uint64_t) pAllocInfo->descriptorPool); + skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_POOL, (uint64_t) pAllocateInfo->descriptorPool, 0, DRAWSTATE_INVALID_POOL, "DS", + "Unable to find pool node for pool %#" PRIxLEAST64 " specified in vkAllocateDescriptorSets() call", (uint64_t) pAllocateInfo->descriptorPool); } else { // Make sure pool has all the available descriptors before calling down chain - skipCall |= validate_descriptor_availability_in_pool(dev_data, pPoolNode, pAllocInfo->setLayoutCount, pAllocInfo->pSetLayouts); + skipCall |= validate_descriptor_availability_in_pool(dev_data, pPoolNode, pAllocateInfo->setLayoutCount, pAllocateInfo->pSetLayouts); } if (skipCall) return VK_ERROR_VALIDATION_FAILED; - VkResult result = dev_data->device_dispatch_table->AllocDescriptorSets(device, pAllocInfo, pDescriptorSets); + VkResult result = dev_data->device_dispatch_table->AllocateDescriptorSets(device, pAllocateInfo, pDescriptorSets); if (VK_SUCCESS == result) { - POOL_NODE *pPoolNode = getPoolNode(dev_data, pAllocInfo->descriptorPool); + POOL_NODE *pPoolNode = getPoolNode(dev_data, pAllocateInfo->descriptorPool); if (pPoolNode) { - if (pAllocInfo->setLayoutCount == 0) { - log_msg(dev_data->report_data, VK_DBG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, pAllocInfo->setLayoutCount, 0, DRAWSTATE_NONE, "DS", - "AllocDescriptorSets called with 0 count"); + if (pAllocateInfo->setLayoutCount == 0) { + log_msg(dev_data->report_data, VK_DBG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, pAllocateInfo->setLayoutCount, 0, DRAWSTATE_NONE, "DS", + "AllocateDescriptorSets called with 0 count"); } - for (uint32_t i = 0; i < pAllocInfo->setLayoutCount; i++) { + for (uint32_t i = 0; i < pAllocateInfo->setLayoutCount; i++) { log_msg(dev_data->report_data, VK_DBG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, (uint64_t) pDescriptorSets[i], 0, DRAWSTATE_NONE, "DS", "Created Descriptor Set %#" PRIxLEAST64, (uint64_t) pDescriptorSets[i]); // Create new set node and add to head of pool nodes SET_NODE* pNewNode = new SET_NODE; if (NULL == pNewNode) { if (log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, (uint64_t) pDescriptorSets[i], 0, DRAWSTATE_OUT_OF_MEMORY, "DS", - "Out of memory while attempting to allocate SET_NODE in vkAllocDescriptorSets()")) + "Out of memory while attempting to allocate SET_NODE in vkAllocateDescriptorSets()")) return VK_ERROR_VALIDATION_FAILED; } else { memset(pNewNode, 0, sizeof(SET_NODE)); @@ -2175,14 +2175,14 @@ VK_LAYER_EXPORT VkResult VKAPI vkAllocDescriptorSets(VkDevice device, const VkDe // Insert set at head of Set LL for this pool pNewNode->pNext = pPoolNode->pSets; pPoolNode->pSets = pNewNode; - LAYOUT_NODE* pLayout = getLayoutNode(dev_data, pAllocInfo->pSetLayouts[i]); + LAYOUT_NODE* pLayout = getLayoutNode(dev_data, pAllocateInfo->pSetLayouts[i]); if (NULL == pLayout) { - if (log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT, (uint64_t) pAllocInfo->pSetLayouts[i], 0, DRAWSTATE_INVALID_LAYOUT, "DS", - "Unable to find set layout node for layout %#" PRIxLEAST64 " specified in vkAllocDescriptorSets() call", (uint64_t) pAllocInfo->pSetLayouts[i])) + if (log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT, (uint64_t) pAllocateInfo->pSetLayouts[i], 0, DRAWSTATE_INVALID_LAYOUT, "DS", + "Unable to find set layout node for layout %#" PRIxLEAST64 " specified in vkAllocateDescriptorSets() call", (uint64_t) pAllocateInfo->pSetLayouts[i])) return VK_ERROR_VALIDATION_FAILED; } pNewNode->pLayout = pLayout; - pNewNode->pool = pAllocInfo->descriptorPool; + pNewNode->pool = pAllocateInfo->descriptorPool; pNewNode->set = pDescriptorSets[i]; pNewNode->descriptorCount = pLayout->endIndex + 1; if (pNewNode->descriptorCount) { @@ -2237,84 +2237,84 @@ VK_LAYER_EXPORT void VKAPI vkUpdateDescriptorSets(VkDevice device, uint32_t desc } } -VK_LAYER_EXPORT VkResult VKAPI vkAllocCommandBuffers(VkDevice device, const VkCmdBufferAllocInfo* pCreateInfo, VkCmdBuffer* pCmdBuffer) +VK_LAYER_EXPORT VkResult VKAPI vkAllocateCommandBuffers(VkDevice device, const VkCommandBufferAllocateInfo* pCreateInfo, VkCommandBuffer* pCommandBuffer) { layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); - VkResult result = dev_data->device_dispatch_table->AllocCommandBuffers(device, pCreateInfo, pCmdBuffer); + VkResult result = dev_data->device_dispatch_table->AllocateCommandBuffers(device, pCreateInfo, pCommandBuffer); if (VK_SUCCESS == result) { loader_platform_thread_lock_mutex(&globalLock); GLOBAL_CB_NODE* pCB = new GLOBAL_CB_NODE; memset(pCB, 0, sizeof(GLOBAL_CB_NODE)); - pCB->cmdBuffer = *pCmdBuffer; + pCB->commandBuffer = *pCommandBuffer; pCB->createInfo = *pCreateInfo; pCB->lastVtxBinding = MAX_BINDING; pCB->level = pCreateInfo->level; - dev_data->cmdBufferMap[*pCmdBuffer] = pCB; + dev_data->commandBufferMap[*pCommandBuffer] = pCB; loader_platform_thread_unlock_mutex(&globalLock); updateCBTracking(pCB); } return result; } -VK_LAYER_EXPORT VkResult VKAPI vkBeginCommandBuffer(VkCmdBuffer cmdBuffer, const VkCmdBufferBeginInfo* pBeginInfo) +VK_LAYER_EXPORT VkResult VKAPI vkBeginCommandBuffer(VkCommandBuffer commandBuffer, const VkCommandBufferBeginInfo* pBeginInfo) { VkBool32 skipCall = false; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); // Validate command buffer level - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { - if (pCB->level == VK_CMD_BUFFER_LEVEL_PRIMARY) { + if (pCB->level == VK_COMMAND_BUFFER_LEVEL_PRIMARY) { if (pBeginInfo->renderPass || pBeginInfo->framebuffer) { // These should be NULL for a Primary CB skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_BEGIN_CB_INVALID_STATE, "DS", - "vkAllocCommandBuffers(): Primary Command Buffer (%p) may not specify framebuffer or renderpass parameters", (void*)cmdBuffer); + "vkAllocateCommandBuffers(): Primary Command Buffer (%p) may not specify framebuffer or renderpass parameters", (void*)commandBuffer); } } else { if (!pBeginInfo->renderPass || !pBeginInfo->framebuffer) { // These should NOT be null for an Secondary CB skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_BEGIN_CB_INVALID_STATE, "DS", - "vkAllocCommandBuffers(): Secondary Command Buffers (%p) must specify framebuffer and renderpass parameters", (void*)cmdBuffer); + "vkAllocateCommandBuffers(): Secondary Command Buffers (%p) must specify framebuffer and renderpass parameters", (void*)commandBuffer); } } pCB->beginInfo = *pBeginInfo; } else { - // TODO : Need to pass cmdBuffer as objType here - skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", - "In vkBeginCommandBuffer() and unable to find CmdBuffer Node for CB %p!", (void*)cmdBuffer); + // TODO : Need to pass commandBuffer as objType here + skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_INVALID_COMMAND_BUFFER, "DS", + "In vkBeginCommandBuffer() and unable to find CommandBuffer Node for CB %p!", (void*)commandBuffer); } if (skipCall) { return VK_ERROR_VALIDATION_FAILED; } - VkResult result = dev_data->device_dispatch_table->BeginCommandBuffer(cmdBuffer, pBeginInfo); + VkResult result = dev_data->device_dispatch_table->BeginCommandBuffer(commandBuffer, pBeginInfo); if (VK_SUCCESS == result) { if (CB_NEW != pCB->state) - resetCB(dev_data, cmdBuffer); + resetCB(dev_data, commandBuffer); pCB->state = CB_UPDATE_ACTIVE; updateCBTracking(pCB); } return result; } -VK_LAYER_EXPORT VkResult VKAPI vkEndCommandBuffer(VkCmdBuffer cmdBuffer) +VK_LAYER_EXPORT VkResult VKAPI vkEndCommandBuffer(VkCommandBuffer commandBuffer) { VkBool32 skipCall = VK_FALSE; VkResult result = VK_SUCCESS; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); /* TODO: preference is to always call API function after reporting any validation errors */ if (pCB) { if (pCB->state != CB_UPDATE_ACTIVE) { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkEndCommandBuffer()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkEndCommandBuffer()"); } } if (VK_FALSE == skipCall) { - result = dev_data->device_dispatch_table->EndCommandBuffer(cmdBuffer); + result = dev_data->device_dispatch_table->EndCommandBuffer(commandBuffer); if (VK_SUCCESS == result) { updateCBTracking(pCB); pCB->state = CB_UPDATE_COMPLETE; // Reset CB status flags pCB->status = 0; - printCB(dev_data, cmdBuffer); + printCB(dev_data, commandBuffer); } } else { result = VK_ERROR_VALIDATION_FAILED; @@ -2322,22 +2322,22 @@ VK_LAYER_EXPORT VkResult VKAPI vkEndCommandBuffer(VkCmdBuffer cmdBuffer) return result; } -VK_LAYER_EXPORT VkResult VKAPI vkResetCommandBuffer(VkCmdBuffer cmdBuffer, VkCmdBufferResetFlags flags) +VK_LAYER_EXPORT VkResult VKAPI vkResetCommandBuffer(VkCommandBuffer commandBuffer, VkCommandBufferResetFlags flags) { - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - VkResult result = dev_data->device_dispatch_table->ResetCommandBuffer(cmdBuffer, flags); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + VkResult result = dev_data->device_dispatch_table->ResetCommandBuffer(commandBuffer, flags); if (VK_SUCCESS == result) { - resetCB(dev_data, cmdBuffer); - updateCBTracking(getCBNode(dev_data, cmdBuffer)); + resetCB(dev_data, commandBuffer); + updateCBTracking(getCBNode(dev_data, commandBuffer)); } return result; } -VK_LAYER_EXPORT void VKAPI vkCmdBindPipeline(VkCmdBuffer cmdBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline) +VK_LAYER_EXPORT void VKAPI vkCmdBindPipeline(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { updateCBTracking(pCB); @@ -2367,21 +2367,21 @@ VK_LAYER_EXPORT void VKAPI vkCmdBindPipeline(VkCmdBuffer cmdBuffer, VkPipelineBi } } } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdBindPipeline()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdBindPipeline()"); } } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdBindPipeline(cmdBuffer, pipelineBindPoint, pipeline); + dev_data->device_dispatch_table->CmdBindPipeline(commandBuffer, pipelineBindPoint, pipeline); } VK_LAYER_EXPORT void VKAPI vkCmdSetViewport( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t viewportCount, const VkViewport* pViewports) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { updateCBTracking(pCB); @@ -2392,21 +2392,21 @@ VK_LAYER_EXPORT void VKAPI vkCmdSetViewport( memcpy(pCB->viewports.data(), pViewports, viewportCount * sizeof(VkViewport)); loader_platform_thread_unlock_mutex(&globalLock); } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdSetViewport()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdSetViewport()"); } } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdSetViewport(cmdBuffer, viewportCount, pViewports); + dev_data->device_dispatch_table->CmdSetViewport(commandBuffer, viewportCount, pViewports); } VK_LAYER_EXPORT void VKAPI vkCmdSetScissor( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t scissorCount, const VkRect2D* pScissors) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { updateCBTracking(pCB); @@ -2417,18 +2417,18 @@ VK_LAYER_EXPORT void VKAPI vkCmdSetScissor( memcpy(pCB->scissors.data(), pScissors, scissorCount * sizeof(VkRect2D)); loader_platform_thread_unlock_mutex(&globalLock); } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdSetScissor()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdSetScissor()"); } } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdSetScissor(cmdBuffer, scissorCount, pScissors); + dev_data->device_dispatch_table->CmdSetScissor(commandBuffer, scissorCount, pScissors); } -VK_LAYER_EXPORT void VKAPI vkCmdSetLineWidth(VkCmdBuffer cmdBuffer, float lineWidth) +VK_LAYER_EXPORT void VKAPI vkCmdSetLineWidth(VkCommandBuffer commandBuffer, float lineWidth) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { updateCBTracking(pCB); @@ -2439,22 +2439,22 @@ VK_LAYER_EXPORT void VKAPI vkCmdSetLineWidth(VkCmdBuffer cmdBuffer, float lineWi pCB->lineWidth = lineWidth; loader_platform_thread_unlock_mutex(&globalLock); } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdBindDynamicLineWidthState()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdBindDynamicLineWidthState()"); } } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdSetLineWidth(cmdBuffer, lineWidth); + dev_data->device_dispatch_table->CmdSetLineWidth(commandBuffer, lineWidth); } VK_LAYER_EXPORT void VKAPI vkCmdSetDepthBias( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, float depthBiasConstantFactor, float depthBiasClamp, float depthBiasSlopeFactor) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { updateCBTracking(pCB); @@ -2464,18 +2464,18 @@ VK_LAYER_EXPORT void VKAPI vkCmdSetDepthBias( pCB->depthBiasClamp = depthBiasClamp; pCB->depthBiasSlopeFactor = depthBiasSlopeFactor; } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdSetDepthBias()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdSetDepthBias()"); } } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdSetDepthBias(cmdBuffer, depthBiasConstantFactor, depthBiasClamp, depthBiasSlopeFactor); + dev_data->device_dispatch_table->CmdSetDepthBias(commandBuffer, depthBiasConstantFactor, depthBiasClamp, depthBiasSlopeFactor); } -VK_LAYER_EXPORT void VKAPI vkCmdSetBlendConstants(VkCmdBuffer cmdBuffer, const float blendConstants[4]) +VK_LAYER_EXPORT void VKAPI vkCmdSetBlendConstants(VkCommandBuffer commandBuffer, const float blendConstants[4]) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { updateCBTracking(pCB); @@ -2483,21 +2483,21 @@ VK_LAYER_EXPORT void VKAPI vkCmdSetBlendConstants(VkCmdBuffer cmdBuffer, const f pCB->status |= CBSTATUS_BLEND_SET; memcpy(pCB->blendConstants, blendConstants, 4 * sizeof(float)); } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdSetBlendConstants()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdSetBlendConstants()"); } } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdSetBlendConstants(cmdBuffer, blendConstants); + dev_data->device_dispatch_table->CmdSetBlendConstants(commandBuffer, blendConstants); } VK_LAYER_EXPORT void VKAPI vkCmdSetDepthBounds( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, float minDepthBounds, float maxDepthBounds) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { updateCBTracking(pCB); @@ -2506,21 +2506,21 @@ VK_LAYER_EXPORT void VKAPI vkCmdSetDepthBounds( pCB->minDepthBounds = minDepthBounds; pCB->maxDepthBounds = maxDepthBounds; } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdSetDepthBounds()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdSetDepthBounds()"); } } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdSetDepthBounds(cmdBuffer, minDepthBounds, maxDepthBounds); + dev_data->device_dispatch_table->CmdSetDepthBounds(commandBuffer, minDepthBounds, maxDepthBounds); } VK_LAYER_EXPORT void VKAPI vkCmdSetStencilCompareMask( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t stencilCompareMask) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { updateCBTracking(pCB); @@ -2535,21 +2535,21 @@ VK_LAYER_EXPORT void VKAPI vkCmdSetStencilCompareMask( /* TODO: We aren't capturing the faceMask, do we need to? */ pCB->status |= CBSTATUS_STENCIL_READ_MASK_SET; } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdSetStencilCompareMask()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdSetStencilCompareMask()"); } } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdSetStencilCompareMask(cmdBuffer, faceMask, stencilCompareMask); + dev_data->device_dispatch_table->CmdSetStencilCompareMask(commandBuffer, faceMask, stencilCompareMask); } VK_LAYER_EXPORT void VKAPI vkCmdSetStencilWriteMask( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t stencilWriteMask) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { updateCBTracking(pCB); @@ -2562,21 +2562,21 @@ VK_LAYER_EXPORT void VKAPI vkCmdSetStencilWriteMask( } pCB->status |= CBSTATUS_STENCIL_WRITE_MASK_SET; } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdSetStencilWriteMask()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdSetStencilWriteMask()"); } } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdSetStencilWriteMask(cmdBuffer, faceMask, stencilWriteMask); + dev_data->device_dispatch_table->CmdSetStencilWriteMask(commandBuffer, faceMask, stencilWriteMask); } VK_LAYER_EXPORT void VKAPI vkCmdSetStencilReference( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t stencilReference) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { updateCBTracking(pCB); @@ -2589,18 +2589,18 @@ VK_LAYER_EXPORT void VKAPI vkCmdSetStencilReference( } pCB->status |= CBSTATUS_STENCIL_REFERENCE_SET; } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdSetStencilReference()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdSetStencilReference()"); } } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdSetStencilReference(cmdBuffer, faceMask, stencilReference); + dev_data->device_dispatch_table->CmdSetStencilReference(commandBuffer, faceMask, stencilReference); } -VK_LAYER_EXPORT void VKAPI vkCmdBindDescriptorSets(VkCmdBuffer cmdBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t firstSet, uint32_t setCount, const VkDescriptorSet* pDescriptorSets, uint32_t dynamicOffsetCount, const uint32_t* pDynamicOffsets) +VK_LAYER_EXPORT void VKAPI vkCmdBindDescriptorSets(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t firstSet, uint32_t setCount, const VkDescriptorSet* pDescriptorSets, uint32_t dynamicOffsetCount, const uint32_t* pDynamicOffsets) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); // TODO : Validate dynamic offsets // If any of the sets being bound include dynamic uniform or storage buffers, // then pDynamicOffsets must include one element for each array element @@ -2638,18 +2638,18 @@ VK_LAYER_EXPORT void VKAPI vkCmdBindDescriptorSets(VkCmdBuffer cmdBuffer, VkPipe skipCall |= addCmd(dev_data, pCB, CMD_BINDDESCRIPTORSETS); } } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdBindDescriptorSets()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdBindDescriptorSets()"); } } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdBindDescriptorSets(cmdBuffer, pipelineBindPoint, layout, firstSet, setCount, pDescriptorSets, dynamicOffsetCount, pDynamicOffsets); + dev_data->device_dispatch_table->CmdBindDescriptorSets(commandBuffer, pipelineBindPoint, layout, firstSet, setCount, pDescriptorSets, dynamicOffsetCount, pDynamicOffsets); } -VK_LAYER_EXPORT void VKAPI vkCmdBindIndexBuffer(VkCmdBuffer cmdBuffer, VkBuffer buffer, VkDeviceSize offset, VkIndexType indexType) +VK_LAYER_EXPORT void VKAPI vkCmdBindIndexBuffer(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkIndexType indexType) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { VkDeviceSize offset_align = 0; @@ -2669,26 +2669,26 @@ VK_LAYER_EXPORT void VKAPI vkCmdBindIndexBuffer(VkCmdBuffer cmdBuffer, VkBuffer "vkCmdBindIndexBuffer() offset (%#" PRIxLEAST64 ") does not fall on alignment (%s) boundary.", offset, string_VkIndexType(indexType)); } } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdBindIndexBuffer()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdBindIndexBuffer()"); } pCB->status |= CBSTATUS_INDEX_BUFFER_BOUND; updateCBTracking(pCB); skipCall |= addCmd(dev_data, pCB, CMD_BINDINDEXBUFFER); } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdBindIndexBuffer(cmdBuffer, buffer, offset, indexType); + dev_data->device_dispatch_table->CmdBindIndexBuffer(commandBuffer, buffer, offset, indexType); } VK_LAYER_EXPORT void VKAPI vkCmdBindVertexBuffers( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t startBinding, uint32_t bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { /* TODO: Need to track all the vertex buffers, not just last one */ @@ -2696,317 +2696,317 @@ VK_LAYER_EXPORT void VKAPI vkCmdBindVertexBuffers( updateCBTracking(pCB); addCmd(dev_data, pCB, CMD_BINDVERTEXBUFFER); } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdBindVertexBuffer()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdBindVertexBuffer()"); } } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdBindVertexBuffers(cmdBuffer, startBinding, bindingCount, pBuffers, pOffsets); + dev_data->device_dispatch_table->CmdBindVertexBuffers(commandBuffer, startBinding, bindingCount, pBuffers, pOffsets); } -VK_LAYER_EXPORT void VKAPI vkCmdDraw(VkCmdBuffer cmdBuffer, uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance) +VK_LAYER_EXPORT void VKAPI vkCmdDraw(VkCommandBuffer commandBuffer, uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { pCB->drawCount[DRAW]++; skipCall |= validate_draw_state(dev_data, pCB, VK_FALSE); - // TODO : Need to pass cmdBuffer as srcObj here + // TODO : Need to pass commandBuffer as srcObj here skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_INFO_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_NONE, "DS", "vkCmdDraw() call #%lu, reporting DS state:", g_drawCount[DRAW]++); - skipCall |= synchAndPrintDSConfig(dev_data, cmdBuffer); + skipCall |= synchAndPrintDSConfig(dev_data, commandBuffer); if (VK_FALSE == skipCall) { updateCBTracking(pCB); skipCall |= addCmd(dev_data, pCB, CMD_DRAW); } } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdDraw()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdDraw()"); } skipCall |= outsideRenderPass(dev_data, pCB, "vkCmdDraw"); } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdDraw(cmdBuffer, vertexCount, instanceCount, firstVertex, firstInstance); + dev_data->device_dispatch_table->CmdDraw(commandBuffer, vertexCount, instanceCount, firstVertex, firstInstance); } -VK_LAYER_EXPORT void VKAPI vkCmdDrawIndexed(VkCmdBuffer cmdBuffer, uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex, int32_t vertexOffset, uint32_t firstInstance) +VK_LAYER_EXPORT void VKAPI vkCmdDrawIndexed(VkCommandBuffer commandBuffer, uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex, int32_t vertexOffset, uint32_t firstInstance) { - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); VkBool32 skipCall = VK_FALSE; if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { pCB->drawCount[DRAW_INDEXED]++; skipCall |= validate_draw_state(dev_data, pCB, VK_TRUE); - // TODO : Need to pass cmdBuffer as srcObj here + // TODO : Need to pass commandBuffer as srcObj here skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_INFO_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_NONE, "DS", "vkCmdDrawIndexed() call #%lu, reporting DS state:", g_drawCount[DRAW_INDEXED]++); - skipCall |= synchAndPrintDSConfig(dev_data, cmdBuffer); + skipCall |= synchAndPrintDSConfig(dev_data, commandBuffer); if (VK_FALSE == skipCall) { updateCBTracking(pCB); skipCall |= addCmd(dev_data, pCB, CMD_DRAWINDEXED); } } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdDrawIndexed()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdDrawIndexed()"); } skipCall |= outsideRenderPass(dev_data, pCB, "vkCmdDrawIndexed"); } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdDrawIndexed(cmdBuffer, indexCount, instanceCount, firstIndex, vertexOffset, firstInstance); + dev_data->device_dispatch_table->CmdDrawIndexed(commandBuffer, indexCount, instanceCount, firstIndex, vertexOffset, firstInstance); } -VK_LAYER_EXPORT void VKAPI vkCmdDrawIndirect(VkCmdBuffer cmdBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t count, uint32_t stride) +VK_LAYER_EXPORT void VKAPI vkCmdDrawIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t count, uint32_t stride) { - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); VkBool32 skipCall = VK_FALSE; if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { pCB->drawCount[DRAW_INDIRECT]++; skipCall |= validate_draw_state(dev_data, pCB, VK_FALSE); - // TODO : Need to pass cmdBuffer as srcObj here + // TODO : Need to pass commandBuffer as srcObj here skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_INFO_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_NONE, "DS", "vkCmdDrawIndirect() call #%lu, reporting DS state:", g_drawCount[DRAW_INDIRECT]++); - skipCall |= synchAndPrintDSConfig(dev_data, cmdBuffer); + skipCall |= synchAndPrintDSConfig(dev_data, commandBuffer); if (VK_FALSE == skipCall) { updateCBTracking(pCB); skipCall |= addCmd(dev_data, pCB, CMD_DRAWINDIRECT); } } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdDrawIndirect()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdDrawIndirect()"); } skipCall |= outsideRenderPass(dev_data, pCB, "vkCmdDrawIndirect"); } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdDrawIndirect(cmdBuffer, buffer, offset, count, stride); + dev_data->device_dispatch_table->CmdDrawIndirect(commandBuffer, buffer, offset, count, stride); } -VK_LAYER_EXPORT void VKAPI vkCmdDrawIndexedIndirect(VkCmdBuffer cmdBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t count, uint32_t stride) +VK_LAYER_EXPORT void VKAPI vkCmdDrawIndexedIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t count, uint32_t stride) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { pCB->drawCount[DRAW_INDEXED_INDIRECT]++; skipCall |= validate_draw_state(dev_data, pCB, VK_TRUE); - // TODO : Need to pass cmdBuffer as srcObj here + // TODO : Need to pass commandBuffer as srcObj here skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_INFO_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_NONE, "DS", "vkCmdDrawIndexedIndirect() call #%lu, reporting DS state:", g_drawCount[DRAW_INDEXED_INDIRECT]++); - skipCall |= synchAndPrintDSConfig(dev_data, cmdBuffer); + skipCall |= synchAndPrintDSConfig(dev_data, commandBuffer); if (VK_FALSE == skipCall) { updateCBTracking(pCB); skipCall |= addCmd(dev_data, pCB, CMD_DRAWINDEXEDINDIRECT); } } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdDrawIndexedIndirect()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdDrawIndexedIndirect()"); } skipCall |= outsideRenderPass(dev_data, pCB, "vkCmdDrawIndexedIndirect"); } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdDrawIndexedIndirect(cmdBuffer, buffer, offset, count, stride); + dev_data->device_dispatch_table->CmdDrawIndexedIndirect(commandBuffer, buffer, offset, count, stride); } -VK_LAYER_EXPORT void VKAPI vkCmdDispatch(VkCmdBuffer cmdBuffer, uint32_t x, uint32_t y, uint32_t z) +VK_LAYER_EXPORT void VKAPI vkCmdDispatch(VkCommandBuffer commandBuffer, uint32_t x, uint32_t y, uint32_t z) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { updateCBTracking(pCB); skipCall |= addCmd(dev_data, pCB, CMD_DISPATCH); } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdDispatch()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdDispatch()"); } skipCall |= insideRenderPass(dev_data, pCB, "vkCmdDispatch"); } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdDispatch(cmdBuffer, x, y, z); + dev_data->device_dispatch_table->CmdDispatch(commandBuffer, x, y, z); } -VK_LAYER_EXPORT void VKAPI vkCmdDispatchIndirect(VkCmdBuffer cmdBuffer, VkBuffer buffer, VkDeviceSize offset) +VK_LAYER_EXPORT void VKAPI vkCmdDispatchIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { updateCBTracking(pCB); skipCall |= addCmd(dev_data, pCB, CMD_DISPATCHINDIRECT); } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdDispatchIndirect()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdDispatchIndirect()"); } skipCall |= insideRenderPass(dev_data, pCB, "vkCmdDispatchIndirect"); } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdDispatchIndirect(cmdBuffer, buffer, offset); + dev_data->device_dispatch_table->CmdDispatchIndirect(commandBuffer, buffer, offset); } -VK_LAYER_EXPORT void VKAPI vkCmdCopyBuffer(VkCmdBuffer cmdBuffer, VkBuffer srcBuffer, VkBuffer destBuffer, uint32_t regionCount, const VkBufferCopy* pRegions) +VK_LAYER_EXPORT void VKAPI vkCmdCopyBuffer(VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferCopy* pRegions) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { updateCBTracking(pCB); skipCall |= addCmd(dev_data, pCB, CMD_COPYBUFFER); } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdCopyBuffer()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdCopyBuffer()"); } skipCall |= insideRenderPass(dev_data, pCB, "vkCmdCopyBuffer"); } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdCopyBuffer(cmdBuffer, srcBuffer, destBuffer, regionCount, pRegions); + dev_data->device_dispatch_table->CmdCopyBuffer(commandBuffer, srcBuffer, dstBuffer, regionCount, pRegions); } -VK_LAYER_EXPORT void VKAPI vkCmdCopyImage(VkCmdBuffer cmdBuffer, +VK_LAYER_EXPORT void VKAPI vkCmdCopyImage(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, - VkImage destImage, - VkImageLayout destImageLayout, + VkImage dstImage, + VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageCopy* pRegions) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { updateCBTracking(pCB); skipCall |= addCmd(dev_data, pCB, CMD_COPYIMAGE); } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdCopyImage()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdCopyImage()"); } skipCall |= insideRenderPass(dev_data, pCB, "vkCmdCopyImage"); } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdCopyImage(cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout, regionCount, pRegions); + dev_data->device_dispatch_table->CmdCopyImage(commandBuffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions); } -VK_LAYER_EXPORT void VKAPI vkCmdBlitImage(VkCmdBuffer cmdBuffer, +VK_LAYER_EXPORT void VKAPI vkCmdBlitImage(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, - VkImage destImage, VkImageLayout destImageLayout, + VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageBlit* pRegions, VkFilter filter) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { updateCBTracking(pCB); skipCall |= addCmd(dev_data, pCB, CMD_BLITIMAGE); } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdBlitImage()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdBlitImage()"); } skipCall |= insideRenderPass(dev_data, pCB, "vkCmdBlitImage"); } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdBlitImage(cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout, regionCount, pRegions, filter); + dev_data->device_dispatch_table->CmdBlitImage(commandBuffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions, filter); } -VK_LAYER_EXPORT void VKAPI vkCmdCopyBufferToImage(VkCmdBuffer cmdBuffer, +VK_LAYER_EXPORT void VKAPI vkCmdCopyBufferToImage(VkCommandBuffer commandBuffer, VkBuffer srcBuffer, - VkImage destImage, VkImageLayout destImageLayout, + VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkBufferImageCopy* pRegions) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { updateCBTracking(pCB); skipCall |= addCmd(dev_data, pCB, CMD_COPYBUFFERTOIMAGE); } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdCopyBufferToImage()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdCopyBufferToImage()"); } skipCall |= insideRenderPass(dev_data, pCB, "vkCmdCopyBufferToImage"); } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdCopyBufferToImage(cmdBuffer, srcBuffer, destImage, destImageLayout, regionCount, pRegions); + dev_data->device_dispatch_table->CmdCopyBufferToImage(commandBuffer, srcBuffer, dstImage, dstImageLayout, regionCount, pRegions); } -VK_LAYER_EXPORT void VKAPI vkCmdCopyImageToBuffer(VkCmdBuffer cmdBuffer, +VK_LAYER_EXPORT void VKAPI vkCmdCopyImageToBuffer(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, - VkBuffer destBuffer, + VkBuffer dstBuffer, uint32_t regionCount, const VkBufferImageCopy* pRegions) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { updateCBTracking(pCB); skipCall |= addCmd(dev_data, pCB, CMD_COPYIMAGETOBUFFER); } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdCopyImageToBuffer()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdCopyImageToBuffer()"); } skipCall |= insideRenderPass(dev_data, pCB, "vkCmdCopyImageToBuffer"); } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdCopyImageToBuffer(cmdBuffer, srcImage, srcImageLayout, destBuffer, regionCount, pRegions); + dev_data->device_dispatch_table->CmdCopyImageToBuffer(commandBuffer, srcImage, srcImageLayout, dstBuffer, regionCount, pRegions); } -VK_LAYER_EXPORT void VKAPI vkCmdUpdateBuffer(VkCmdBuffer cmdBuffer, VkBuffer destBuffer, VkDeviceSize destOffset, VkDeviceSize dataSize, const uint32_t* pData) +VK_LAYER_EXPORT void VKAPI vkCmdUpdateBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const uint32_t* pData) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { updateCBTracking(pCB); skipCall |= addCmd(dev_data, pCB, CMD_UPDATEBUFFER); } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdUpdateBuffer()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdUpdateBuffer()"); } skipCall |= insideRenderPass(dev_data, pCB, "vkCmdCopyUpdateBuffer"); } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdUpdateBuffer(cmdBuffer, destBuffer, destOffset, dataSize, pData); + dev_data->device_dispatch_table->CmdUpdateBuffer(commandBuffer, dstBuffer, dstOffset, dataSize, pData); } -VK_LAYER_EXPORT void VKAPI vkCmdFillBuffer(VkCmdBuffer cmdBuffer, VkBuffer destBuffer, VkDeviceSize destOffset, VkDeviceSize size, uint32_t data) +VK_LAYER_EXPORT void VKAPI vkCmdFillBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize size, uint32_t data) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { updateCBTracking(pCB); skipCall |= addCmd(dev_data, pCB, CMD_FILLBUFFER); } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdFillBuffer()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdFillBuffer()"); } skipCall |= insideRenderPass(dev_data, pCB, "vkCmdCopyFillBuffer"); } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdFillBuffer(cmdBuffer, destBuffer, destOffset, size, data); + dev_data->device_dispatch_table->CmdFillBuffer(commandBuffer, dstBuffer, dstOffset, size, data); } VK_LAYER_EXPORT void VKAPI vkCmdClearAttachments( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t attachmentCount, const VkClearAttachment* pAttachments, uint32_t rectCount, const VkClearRect* pRects) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { // Warn if this is issued prior to Draw Cmd if (!hasDrawCmd(pCB)) { - // TODO : cmdBuffer should be srcObj + // TODO : commandBuffer should be srcObj skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_WARN_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_CLEAR_CMD_BEFORE_DRAW, "DS", "vkCmdClearAttachments() issued on CB object 0x%" PRIxLEAST64 " prior to any Draw Cmds." - " It is recommended you use RenderPass LOAD_OP_CLEAR on Attachments prior to any Draw.", reinterpret_cast<uint64_t>(cmdBuffer)); + " It is recommended you use RenderPass LOAD_OP_CLEAR on Attachments prior to any Draw.", reinterpret_cast<uint64_t>(commandBuffer)); } updateCBTracking(pCB); skipCall |= addCmd(dev_data, pCB, CMD_CLEARATTACHMENTS); } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdClearAttachments()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdClearAttachments()"); } skipCall |= outsideRenderPass(dev_data, pCB, "vkCmdClearAttachments"); } @@ -3028,7 +3028,7 @@ VK_LAYER_EXPORT void VKAPI vkCmdClearAttachments( } if (VK_FALSE == found) { skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, DRAWSTATE_MISSING_ATTACHMENT_REFERENCE, "DS", + (uint64_t)commandBuffer, 0, DRAWSTATE_MISSING_ATTACHMENT_REFERENCE, "DS", "vkCmdClearAttachments() attachment index %d not found in attachment reference array of active subpass %d", attachment->colorAttachment, pCB->activeSubpass); } @@ -3036,7 +3036,7 @@ VK_LAYER_EXPORT void VKAPI vkCmdClearAttachments( /* TODO: Is this a good test for depth/stencil? */ if (!pSD->pDepthStencilAttachment || pSD->pDepthStencilAttachment->attachment != attachment->colorAttachment) { skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, DRAWSTATE_MISSING_ATTACHMENT_REFERENCE, "DS", + (uint64_t)commandBuffer, 0, DRAWSTATE_MISSING_ATTACHMENT_REFERENCE, "DS", "vkCmdClearAttachments() attachment index %d does not match depthStencilAttachment.attachment (%d) found in active subpass %d", attachment->colorAttachment, (pSD->pDepthStencilAttachment) ? pSD->pDepthStencilAttachment->attachment : VK_ATTACHMENT_UNUSED, @@ -3046,236 +3046,236 @@ VK_LAYER_EXPORT void VKAPI vkCmdClearAttachments( } } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdClearAttachments(cmdBuffer, attachmentCount, pAttachments, rectCount, pRects); + dev_data->device_dispatch_table->CmdClearAttachments(commandBuffer, attachmentCount, pAttachments, rectCount, pRects); } VK_LAYER_EXPORT void VKAPI vkCmdClearColorImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearColorValue *pColor, uint32_t rangeCount, const VkImageSubresourceRange* pRanges) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { updateCBTracking(pCB); skipCall |= addCmd(dev_data, pCB, CMD_CLEARCOLORIMAGE); } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdClearColorImage()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdClearColorImage()"); } skipCall |= insideRenderPass(dev_data, pCB, "vkCmdClearColorImage"); } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdClearColorImage(cmdBuffer, image, imageLayout, pColor, rangeCount, pRanges); + dev_data->device_dispatch_table->CmdClearColorImage(commandBuffer, image, imageLayout, pColor, rangeCount, pRanges); } VK_LAYER_EXPORT void VKAPI vkCmdClearDepthStencilImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearDepthStencilValue *pDepthStencil, uint32_t rangeCount, const VkImageSubresourceRange* pRanges) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { updateCBTracking(pCB); skipCall |= addCmd(dev_data, pCB, CMD_CLEARDEPTHSTENCILIMAGE); } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdClearDepthStencilImage()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdClearDepthStencilImage()"); } skipCall |= insideRenderPass(dev_data, pCB, "vkCmdClearDepthStencilImage"); } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdClearDepthStencilImage(cmdBuffer, image, imageLayout, pDepthStencil, rangeCount, pRanges); + dev_data->device_dispatch_table->CmdClearDepthStencilImage(commandBuffer, image, imageLayout, pDepthStencil, rangeCount, pRanges); } -VK_LAYER_EXPORT void VKAPI vkCmdResolveImage(VkCmdBuffer cmdBuffer, +VK_LAYER_EXPORT void VKAPI vkCmdResolveImage(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, - VkImage destImage, VkImageLayout destImageLayout, + VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageResolve* pRegions) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { updateCBTracking(pCB); skipCall |= addCmd(dev_data, pCB, CMD_RESOLVEIMAGE); } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdResolveImage()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdResolveImage()"); } skipCall |= insideRenderPass(dev_data, pCB, "vkCmdResolveImage"); } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdResolveImage(cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout, regionCount, pRegions); + dev_data->device_dispatch_table->CmdResolveImage(commandBuffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions); } -VK_LAYER_EXPORT void VKAPI vkCmdSetEvent(VkCmdBuffer cmdBuffer, VkEvent event, VkPipelineStageFlags stageMask) +VK_LAYER_EXPORT void VKAPI vkCmdSetEvent(VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { updateCBTracking(pCB); skipCall |= addCmd(dev_data, pCB, CMD_SETEVENT); } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdSetEvent()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdSetEvent()"); } skipCall |= insideRenderPass(dev_data, pCB, "vkCmdSetEvent"); } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdSetEvent(cmdBuffer, event, stageMask); + dev_data->device_dispatch_table->CmdSetEvent(commandBuffer, event, stageMask); } -VK_LAYER_EXPORT void VKAPI vkCmdResetEvent(VkCmdBuffer cmdBuffer, VkEvent event, VkPipelineStageFlags stageMask) +VK_LAYER_EXPORT void VKAPI vkCmdResetEvent(VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { updateCBTracking(pCB); skipCall |= addCmd(dev_data, pCB, CMD_RESETEVENT); } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdResetEvent()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdResetEvent()"); } skipCall |= insideRenderPass(dev_data, pCB, "vkCmdResetEvent"); } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdResetEvent(cmdBuffer, event, stageMask); + dev_data->device_dispatch_table->CmdResetEvent(commandBuffer, event, stageMask); } -VK_LAYER_EXPORT void VKAPI vkCmdWaitEvents(VkCmdBuffer cmdBuffer, uint32_t eventCount, const VkEvent* pEvents, VkPipelineStageFlags sourceStageMask, VkPipelineStageFlags destStageMask, uint32_t memBarrierCount, const void* const* ppMemBarriers) +VK_LAYER_EXPORT void VKAPI vkCmdWaitEvents(VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent* pEvents, VkPipelineStageFlags sourceStageMask, VkPipelineStageFlags dstStageMask, uint32_t memoryBarrierCount, const void* const* ppMemoryBarriers) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { updateCBTracking(pCB); skipCall |= addCmd(dev_data, pCB, CMD_WAITEVENTS); } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdWaitEvents()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdWaitEvents()"); } } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdWaitEvents(cmdBuffer, eventCount, pEvents, sourceStageMask, destStageMask, memBarrierCount, ppMemBarriers); + dev_data->device_dispatch_table->CmdWaitEvents(commandBuffer, eventCount, pEvents, sourceStageMask, dstStageMask, memoryBarrierCount, ppMemoryBarriers); } -VK_LAYER_EXPORT void VKAPI vkCmdPipelineBarrier(VkCmdBuffer cmdBuffer, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags destStageMask, VkDependencyFlags dependencyFlags, uint32_t memBarrierCount, const void* const* ppMemBarriers) +VK_LAYER_EXPORT void VKAPI vkCmdPipelineBarrier(VkCommandBuffer commandBuffer, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, VkDependencyFlags dependencyFlags, uint32_t memoryBarrierCount, const void* const* ppMemoryBarriers) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { updateCBTracking(pCB); skipCall |= addCmd(dev_data, pCB, CMD_PIPELINEBARRIER); } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdPipelineBarrier()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdPipelineBarrier()"); } } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdPipelineBarrier(cmdBuffer, srcStageMask, destStageMask, dependencyFlags, memBarrierCount, ppMemBarriers); + dev_data->device_dispatch_table->CmdPipelineBarrier(commandBuffer, srcStageMask, dstStageMask, dependencyFlags, memoryBarrierCount, ppMemoryBarriers); } -VK_LAYER_EXPORT void VKAPI vkCmdBeginQuery(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t slot, VkFlags flags) +VK_LAYER_EXPORT void VKAPI vkCmdBeginQuery(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t slot, VkFlags flags) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { updateCBTracking(pCB); skipCall |= addCmd(dev_data, pCB, CMD_BEGINQUERY); } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdBeginQuery()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdBeginQuery()"); } } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdBeginQuery(cmdBuffer, queryPool, slot, flags); + dev_data->device_dispatch_table->CmdBeginQuery(commandBuffer, queryPool, slot, flags); } -VK_LAYER_EXPORT void VKAPI vkCmdEndQuery(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t slot) +VK_LAYER_EXPORT void VKAPI vkCmdEndQuery(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t slot) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { updateCBTracking(pCB); skipCall |= addCmd(dev_data, pCB, CMD_ENDQUERY); } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdEndQuery()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdEndQuery()"); } } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdEndQuery(cmdBuffer, queryPool, slot); + dev_data->device_dispatch_table->CmdEndQuery(commandBuffer, queryPool, slot); } -VK_LAYER_EXPORT void VKAPI vkCmdResetQueryPool(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount) +VK_LAYER_EXPORT void VKAPI vkCmdResetQueryPool(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { updateCBTracking(pCB); skipCall |= addCmd(dev_data, pCB, CMD_RESETQUERYPOOL); } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdResetQueryPool()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdResetQueryPool()"); } skipCall |= insideRenderPass(dev_data, pCB, "vkCmdQueryPool"); } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdResetQueryPool(cmdBuffer, queryPool, startQuery, queryCount); + dev_data->device_dispatch_table->CmdResetQueryPool(commandBuffer, queryPool, startQuery, queryCount); } -VK_LAYER_EXPORT void VKAPI vkCmdCopyQueryPoolResults(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t startQuery, - uint32_t queryCount, VkBuffer destBuffer, VkDeviceSize destOffset, +VK_LAYER_EXPORT void VKAPI vkCmdCopyQueryPoolResults(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t startQuery, + uint32_t queryCount, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize stride, VkQueryResultFlags flags) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { updateCBTracking(pCB); skipCall |= addCmd(dev_data, pCB, CMD_COPYQUERYPOOLRESULTS); } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdCopyQueryPoolResults()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdCopyQueryPoolResults()"); } skipCall |= insideRenderPass(dev_data, pCB, "vkCmdCopyQueryPoolResults"); } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdCopyQueryPoolResults(cmdBuffer, queryPool, - startQuery, queryCount, destBuffer, destOffset, stride, flags); + dev_data->device_dispatch_table->CmdCopyQueryPoolResults(commandBuffer, queryPool, + startQuery, queryCount, dstBuffer, dstOffset, stride, flags); } -VK_LAYER_EXPORT void VKAPI vkCmdWriteTimestamp(VkCmdBuffer cmdBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, uint32_t slot) +VK_LAYER_EXPORT void VKAPI vkCmdWriteTimestamp(VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, uint32_t slot) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pCB->state == CB_UPDATE_ACTIVE) { updateCBTracking(pCB); skipCall |= addCmd(dev_data, pCB, CMD_WRITETIMESTAMP); } else { - skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdWriteTimestamp()"); + skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdWriteTimestamp()"); } } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdWriteTimestamp(cmdBuffer, pipelineStage, queryPool, slot); + dev_data->device_dispatch_table->CmdWriteTimestamp(commandBuffer, pipelineStage, queryPool, slot); } -VK_LAYER_EXPORT VkResult VKAPI vkCreateFramebuffer(VkDevice device, const VkFramebufferCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkFramebuffer* pFramebuffer) +VK_LAYER_EXPORT VkResult VKAPI vkCreateFramebuffer(VkDevice device, const VkFramebufferCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkFramebuffer* pFramebuffer) { layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); VkResult result = dev_data->device_dispatch_table->CreateFramebuffer(device, pCreateInfo, pAllocator, pFramebuffer); @@ -3393,12 +3393,12 @@ bool validateDependencies(const layer_data* my_data, VkDevice device, const VkRe } for (uint32_t i = 0; i < pCreateInfo->dependencyCount; ++i) { const VkSubpassDependency& dependency = pCreateInfo->pDependencies[i]; - if (dependency.srcSubpass > dependency.destSubpass) { + if (dependency.srcSubpass > dependency.dstSubpass) { skip_call |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, DRAWSTATE_INVALID_RENDERPASS, "DS", "Dependency graph must be specified such that an earlier pass cannot depend on a later pass."); } - subpass_to_node[dependency.destSubpass].prev.push_back(dependency.srcSubpass); - subpass_to_node[dependency.srcSubpass].next.push_back(dependency.destSubpass); + subpass_to_node[dependency.dstSubpass].prev.push_back(dependency.srcSubpass); + subpass_to_node[dependency.srcSubpass].next.push_back(dependency.dstSubpass); } // Find for each attachment the subpasses that use them. for (uint32_t i = 0; i < pCreateInfo->subpassCount; ++i) { @@ -3443,7 +3443,7 @@ bool validateDependencies(const layer_data* my_data, VkDevice device, const VkRe return skip_call; } -VK_LAYER_EXPORT VkResult VKAPI vkCreateRenderPass(VkDevice device, const VkRenderPassCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkRenderPass* pRenderPass) +VK_LAYER_EXPORT VkResult VKAPI vkCreateRenderPass(VkDevice device, const VkRenderPassCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkRenderPass* pRenderPass) { layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); if (validateDependencies(dev_data, device, pCreateInfo)) { @@ -3536,11 +3536,11 @@ static void deleteRenderPasses(layer_data* my_data) } my_data->renderPassMap.clear(); } -VK_LAYER_EXPORT void VKAPI vkCmdBeginRenderPass(VkCmdBuffer cmdBuffer, const VkRenderPassBeginInfo *pRenderPassBegin, VkRenderPassContents contents) +VK_LAYER_EXPORT void VKAPI vkCmdBeginRenderPass(VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo *pRenderPassBegin, VkRenderPassContents contents) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { if (pRenderPassBegin && pRenderPassBegin->renderPass) { skipCall |= insideRenderPass(dev_data, pCB, "vkCmdBeginRenderPass"); @@ -3558,14 +3558,14 @@ VK_LAYER_EXPORT void VKAPI vkCmdBeginRenderPass(VkCmdBuffer cmdBuffer, const VkR } } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdBeginRenderPass(cmdBuffer, pRenderPassBegin, contents); + dev_data->device_dispatch_table->CmdBeginRenderPass(commandBuffer, pRenderPassBegin, contents); } -VK_LAYER_EXPORT void VKAPI vkCmdNextSubpass(VkCmdBuffer cmdBuffer, VkRenderPassContents contents) +VK_LAYER_EXPORT void VKAPI vkCmdNextSubpass(VkCommandBuffer commandBuffer, VkRenderPassContents contents) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { updateCBTracking(pCB); skipCall |= addCmd(dev_data, pCB, CMD_NEXTSUBPASS); @@ -3576,14 +3576,14 @@ VK_LAYER_EXPORT void VKAPI vkCmdNextSubpass(VkCmdBuffer cmdBuffer, VkRenderPassC skipCall |= outsideRenderPass(dev_data, pCB, "vkCmdNextSubpass"); } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdNextSubpass(cmdBuffer, contents); + dev_data->device_dispatch_table->CmdNextSubpass(commandBuffer, contents); } -VK_LAYER_EXPORT void VKAPI vkCmdEndRenderPass(VkCmdBuffer cmdBuffer) +VK_LAYER_EXPORT void VKAPI vkCmdEndRenderPass(VkCommandBuffer commandBuffer) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { skipCall |= outsideRenderPass(dev_data, pCB, "vkEndRenderpass"); updateCBTracking(pCB); @@ -3592,31 +3592,31 @@ VK_LAYER_EXPORT void VKAPI vkCmdEndRenderPass(VkCmdBuffer cmdBuffer) pCB->activeSubpass = 0; } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdEndRenderPass(cmdBuffer); + dev_data->device_dispatch_table->CmdEndRenderPass(commandBuffer); } -VK_LAYER_EXPORT void VKAPI vkCmdExecuteCommands(VkCmdBuffer cmdBuffer, uint32_t cmdBuffersCount, const VkCmdBuffer* pCmdBuffers) +VK_LAYER_EXPORT void VKAPI vkCmdExecuteCommands(VkCommandBuffer commandBuffer, uint32_t commandBuffersCount, const VkCommandBuffer* pCommandBuffers) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (pCB) { GLOBAL_CB_NODE* pSubCB = NULL; - for (uint32_t i=0; i<cmdBuffersCount; i++) { - pSubCB = getCBNode(dev_data, pCmdBuffers[i]); + for (uint32_t i=0; i<commandBuffersCount; i++) { + pSubCB = getCBNode(dev_data, pCommandBuffers[i]); if (!pSubCB) { - skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_INVALID_SECONDARY_CMD_BUFFER, "DS", - "vkCmdExecuteCommands() called w/ invalid Cmd Buffer %p in element %u of pCmdBuffers array.", (void*)pCmdBuffers[i], i); - } else if (VK_CMD_BUFFER_LEVEL_PRIMARY == pSubCB->createInfo.level) { - skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_INVALID_SECONDARY_CMD_BUFFER, "DS", - "vkCmdExecuteCommands() called w/ Primary Cmd Buffer %p in element %u of pCmdBuffers array. All cmd buffers in pCmdBuffers array must be secondary.", (void*)pCmdBuffers[i], i); + skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_INVALID_SECONDARY_COMMAND_BUFFER, "DS", + "vkCmdExecuteCommands() called w/ invalid Cmd Buffer %p in element %u of pCommandBuffers array.", (void*)pCommandBuffers[i], i); + } else if (VK_COMMAND_BUFFER_LEVEL_PRIMARY == pSubCB->createInfo.level) { + skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_INVALID_SECONDARY_COMMAND_BUFFER, "DS", + "vkCmdExecuteCommands() called w/ Primary Cmd Buffer %p in element %u of pCommandBuffers array. All cmd buffers in pCommandBuffers array must be secondary.", (void*)pCommandBuffers[i], i); } } updateCBTracking(pCB); skipCall |= addCmd(dev_data, pCB, CMD_EXECUTECOMMANDS); } if (VK_FALSE == skipCall) - dev_data->device_dispatch_table->CmdExecuteCommands(cmdBuffer, cmdBuffersCount, pCmdBuffers); + dev_data->device_dispatch_table->CmdExecuteCommands(commandBuffer, commandBuffersCount, pCommandBuffers); } VK_LAYER_EXPORT VkResult VKAPI vkDbgCreateMsgCallback( @@ -3647,13 +3647,13 @@ VK_LAYER_EXPORT VkResult VKAPI vkDbgDestroyMsgCallback( return res; } -VK_LAYER_EXPORT void VKAPI vkCmdDbgMarkerBegin(VkCmdBuffer cmdBuffer, const char* pMarker) +VK_LAYER_EXPORT void VKAPI vkCmdDbgMarkerBegin(VkCommandBuffer commandBuffer, const char* pMarker) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (!dev_data->device_extensions.debug_marker_enabled) { - skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)cmdBuffer, 0, DRAWSTATE_INVALID_EXTENSION, "DS", + skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)commandBuffer, 0, DRAWSTATE_INVALID_EXTENSION, "DS", "Attempt to use CmdDbgMarkerBegin but extension disabled!"); return; } else if (pCB) { @@ -3661,16 +3661,16 @@ VK_LAYER_EXPORT void VKAPI vkCmdDbgMarkerBegin(VkCmdBuffer cmdBuffer, const char skipCall |= addCmd(dev_data, pCB, CMD_DBGMARKERBEGIN); } if (VK_FALSE == skipCall) - debug_marker_dispatch_table(cmdBuffer)->CmdDbgMarkerBegin(cmdBuffer, pMarker); + debug_marker_dispatch_table(commandBuffer)->CmdDbgMarkerBegin(commandBuffer, pMarker); } -VK_LAYER_EXPORT void VKAPI vkCmdDbgMarkerEnd(VkCmdBuffer cmdBuffer) +VK_LAYER_EXPORT void VKAPI vkCmdDbgMarkerEnd(VkCommandBuffer commandBuffer) { VkBool32 skipCall = VK_FALSE; - layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); + layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); if (!dev_data->device_extensions.debug_marker_enabled) { - skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)cmdBuffer, 0, DRAWSTATE_INVALID_EXTENSION, "DS", + skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)commandBuffer, 0, DRAWSTATE_INVALID_EXTENSION, "DS", "Attempt to use CmdDbgMarkerEnd but extension disabled!"); return; } else if (pCB) { @@ -3678,7 +3678,7 @@ VK_LAYER_EXPORT void VKAPI vkCmdDbgMarkerEnd(VkCmdBuffer cmdBuffer) skipCall |= addCmd(dev_data, pCB, CMD_DBGMARKEREND); } if (VK_FALSE == skipCall) - debug_marker_dispatch_table(cmdBuffer)->CmdDbgMarkerEnd(cmdBuffer); + debug_marker_dispatch_table(commandBuffer)->CmdDbgMarkerEnd(commandBuffer); } VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI vkGetDeviceProcAddr(VkDevice dev, const char* funcName) @@ -3772,14 +3772,14 @@ VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI vkGetDeviceProcAddr(VkDevice dev, const return (PFN_vkVoidFunction) vkCreateDescriptorPool; if (!strcmp(funcName, "vkResetDescriptorPool")) return (PFN_vkVoidFunction) vkResetDescriptorPool; - if (!strcmp(funcName, "vkAllocDescriptorSets")) - return (PFN_vkVoidFunction) vkAllocDescriptorSets; + if (!strcmp(funcName, "vkAllocateDescriptorSets")) + return (PFN_vkVoidFunction) vkAllocateDescriptorSets; if (!strcmp(funcName, "vkFreeDescriptorSets")) return (PFN_vkVoidFunction) vkFreeDescriptorSets; if (!strcmp(funcName, "vkUpdateDescriptorSets")) return (PFN_vkVoidFunction) vkUpdateDescriptorSets; - if (!strcmp(funcName, "vkAllocCommandBuffers")) - return (PFN_vkVoidFunction) vkAllocCommandBuffers; + if (!strcmp(funcName, "vkAllocateCommandBuffers")) + return (PFN_vkVoidFunction) vkAllocateCommandBuffers; if (!strcmp(funcName, "vkBeginCommandBuffer")) return (PFN_vkVoidFunction) vkBeginCommandBuffer; if (!strcmp(funcName, "vkEndCommandBuffer")) diff --git a/layers/draw_state.h b/layers/draw_state.h index 6ded670e..a5833fd6 100755 --- a/layers/draw_state.h +++ b/layers/draw_state.h @@ -39,7 +39,7 @@ typedef enum _DRAW_STATE_ERROR DRAWSTATE_INVALID_LAYOUT, // Invalid DS layout DRAWSTATE_INVALID_PIPELINE, // Invalid Pipeline handle referenced DRAWSTATE_INVALID_PIPELINE_CREATE_STATE, // Attempt to create a pipeline with invalid state - DRAWSTATE_INVALID_CMD_BUFFER, // Invalid CmdBuffer referenced + DRAWSTATE_INVALID_COMMAND_BUFFER, // Invalid CommandBuffer referenced DRAWSTATE_VTX_INDEX_OUT_OF_BOUNDS, // binding in vkCmdBindVertexData() too large for PSO's pVertexBindingDescriptions array DRAWSTATE_VTX_INDEX_ALIGNMENT_ERROR, // binding offset in vkCmdBindIndexBuffer() out of alignment based on indexType //DRAWSTATE_MISSING_DOT_PROGRAM, // No "dot" program in order to generate png image @@ -52,10 +52,10 @@ typedef enum _DRAW_STATE_ERROR DRAWSTATE_INVALID_UPDATE_INDEX, // Index of requested update is invalid for specified descriptors set DRAWSTATE_INVALID_UPDATE_STRUCT, // Struct in DS Update tree is of invalid type DRAWSTATE_NUM_SAMPLES_MISMATCH, // Number of samples in bound PSO does not match number in FB of current RenderPass - DRAWSTATE_NO_END_CMD_BUFFER, // Must call vkEndCommandBuffer() before QueueSubmit on that cmdBuffer - DRAWSTATE_NO_BEGIN_CMD_BUFFER, // Binding cmds or calling End on CB that never had vkBeginCommandBuffer() called on it - DRAWSTATE_CMD_BUFFER_SINGLE_SUBMIT_VIOLATION, // Cmd Buffer created with VK_CMD_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT flag is submitted multiple times - DRAWSTATE_INVALID_SECONDARY_CMD_BUFFER, // vkCmdExecuteCommands() called with a primary cmdBuffer in pCmdBuffers array + DRAWSTATE_NO_END_COMMAND_BUFFER, // Must call vkEndCommandBuffer() before QueueSubmit on that commandBuffer + DRAWSTATE_NO_BEGIN_COMMAND_BUFFER, // Binding cmds or calling End on CB that never had vkBeginCommandBuffer() called on it + DRAWSTATE_COMMAND_BUFFER_SINGLE_SUBMIT_VIOLATION, // Cmd Buffer created with VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT flag is submitted multiple times + DRAWSTATE_INVALID_SECONDARY_COMMAND_BUFFER, // vkCmdExecuteCommands() called with a primary commandBuffer in pCommandBuffers array DRAWSTATE_VIEWPORT_NOT_BOUND, // Draw submitted with no viewport state bound DRAWSTATE_SCISSOR_NOT_BOUND, // Draw submitted with no scissor state bound DRAWSTATE_LINE_WIDTH_NOT_BOUND, // Draw submitted with no line width state bound @@ -69,7 +69,7 @@ typedef enum _DRAW_STATE_ERROR DRAWSTATE_INVALID_RENDERPASS_CMD, // Invalid cmd submitted while a RenderPass is active DRAWSTATE_NO_ACTIVE_RENDERPASS, // Rendering cmd submitted without an active RenderPass DRAWSTATE_DESCRIPTOR_SET_NOT_UPDATED, // DescriptorSet bound but it was never updated. This is a warning code. - DRAWSTATE_CLEAR_CMD_BEFORE_DRAW, // Clear cmd issued before any Draw in CmdBuffer, should use RenderPass Ops instead + DRAWSTATE_CLEAR_CMD_BEFORE_DRAW, // Clear cmd issued before any Draw in CommandBuffer, should use RenderPass Ops instead DRAWSTATE_BEGIN_CB_INVALID_STATE, // Primary/Secondary CB created with mismatched FB/RP information DRAWSTATE_VIEWPORT_SCISSOR_MISMATCH, // Count for viewports and scissors mismatch and/or state doesn't match count DRAWSTATE_INVALID_IMAGE_ASPECT, // Image aspect is invalid for the current operation @@ -110,7 +110,7 @@ typedef struct _PIPELINE_NODE { VkPipelineInputAssemblyStateCreateInfo iaStateCI; VkPipelineTessellationStateCreateInfo tessStateCI; VkPipelineViewportStateCreateInfo vpStateCI; - VkPipelineRasterStateCreateInfo rsStateCI; + VkPipelineRasterizationStateCreateInfo rsStateCI; VkPipelineMultisampleStateCreateInfo msStateCI; VkPipelineColorBlendStateCreateInfo cbStateCI; VkPipelineDepthStencilStateCreateInfo dsStateCI; @@ -303,9 +303,9 @@ typedef struct stencil_data { // Cmd Buffer Wrapper Struct typedef struct _GLOBAL_CB_NODE { - VkCmdBuffer cmdBuffer; - VkCmdBufferAllocInfo createInfo; - VkCmdBufferBeginInfo beginInfo; + VkCommandBuffer commandBuffer; + VkCommandBufferAllocateInfo createInfo; + VkCommandBufferBeginInfo beginInfo; VkFence fence; // fence tracking this cmd buffer uint64_t numCmds; // number of cmds in this CB uint64_t drawCount[NUM_DRAW_TYPES]; // Count of each type of draw in this CB @@ -334,6 +334,6 @@ typedef struct _GLOBAL_CB_NODE { VkRenderPass activeRenderPass; uint32_t activeSubpass; VkFramebuffer framebuffer; - VkCmdBufferLevel level; + VkCommandBufferLevel level; vector<VkDescriptorSet> boundDescriptorSets; } GLOBAL_CB_NODE; diff --git a/layers/generic.h b/layers/generic.h index c1e56215..cc1c7a64 100644 --- a/layers/generic.h +++ b/layers/generic.h @@ -48,7 +48,7 @@ static const VkLayerProperties globalLayerProps[] = { { "Generic", VK_API_VERSION, // specVersion - VK_MAKE_VERSION(0, 1, 0), // implVersion + VK_MAKE_VERSION(0, 1, 0), // implementationVersion "layer: Generic", } }; @@ -57,7 +57,7 @@ static const VkLayerProperties deviceLayerProps[] = { { "Generic", VK_API_VERSION, // specVersion - VK_MAKE_VERSION(0, 1, 0), // implVersion + VK_MAKE_VERSION(0, 1, 0), // implementationVersion "layer: Generic", } }; diff --git a/layers/image.cpp b/layers/image.cpp index b9d49b32..f63a9af6 100644 --- a/layers/image.cpp +++ b/layers/image.cpp @@ -112,7 +112,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkDbgDestroyMsgCallback( return res; } -VK_LAYER_EXPORT VkResult VKAPI vkCreateInstance(const VkInstanceCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkInstance* pInstance) +VK_LAYER_EXPORT VkResult VKAPI vkCreateInstance(const VkInstanceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkInstance* pInstance) { layer_data *my_data = get_my_data_ptr(get_dispatch_key(*pInstance), layer_data_map); VkLayerInstanceDispatchTable *pTable = my_data->instance_dispatch_table; @@ -127,7 +127,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateInstance(const VkInstanceCreateInfo* pCre return result; } -VK_LAYER_EXPORT void VKAPI vkDestroyInstance(VkInstance instance, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks* pAllocator) { // Grab the key before the instance is destroyed. dispatch_key key = get_dispatch_key(instance); @@ -148,7 +148,7 @@ VK_LAYER_EXPORT void VKAPI vkDestroyInstance(VkInstance instance, const VkAllocC } -VK_LAYER_EXPORT VkResult VKAPI vkCreateDevice(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkDevice* pDevice) +VK_LAYER_EXPORT VkResult VKAPI vkCreateDevice(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDevice* pDevice) { layer_data *instance_data = get_my_data_ptr(get_dispatch_key(physicalDevice), layer_data_map); layer_data *device_data = get_my_data_ptr(get_dispatch_key(*pDevice), layer_data_map); @@ -162,7 +162,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateDevice(VkPhysicalDevice physicalDevice, c return result; } -VK_LAYER_EXPORT void VKAPI vkDestroyDevice(VkDevice device, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroyDevice(VkDevice device, const VkAllocationCallbacks* pAllocator) { dispatch_key key = get_dispatch_key(device); layer_data *my_data = get_my_data_ptr(key, layer_data_map); @@ -240,7 +240,7 @@ bool is_depth_format(VkFormat format) return result; } -VK_LAYER_EXPORT VkResult VKAPI vkCreateImage(VkDevice device, const VkImageCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkImage* pImage) +VK_LAYER_EXPORT VkResult VKAPI vkCreateImage(VkDevice device, const VkImageCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkImage* pImage) { VkBool32 skipCall = VK_FALSE; layer_data *device_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); @@ -267,14 +267,14 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateImage(VkDevice device, const VkImageCreat return result; } -VK_LAYER_EXPORT void VKAPI vkDestroyImage(VkDevice device, VkImage image, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroyImage(VkDevice device, VkImage image, const VkAllocationCallbacks* pAllocator) { layer_data *device_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); device_data->imageMap.erase(image); device_data->device_dispatch_table->DestroyImage(device, image, pAllocator); } -VK_LAYER_EXPORT VkResult VKAPI vkCreateRenderPass(VkDevice device, const VkRenderPassCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkRenderPass* pRenderPass) +VK_LAYER_EXPORT VkResult VKAPI vkCreateRenderPass(VkDevice device, const VkRenderPassCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkRenderPass* pRenderPass) { layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); VkBool32 skipCall = VK_FALSE; @@ -352,7 +352,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateRenderPass(VkDevice device, const VkRende return result; } -VK_LAYER_EXPORT VkResult VKAPI vkCreateImageView(VkDevice device, const VkImageViewCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkImageView* pView) +VK_LAYER_EXPORT VkResult VKAPI vkCreateImageView(VkDevice device, const VkImageViewCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkImageView* pView) { VkBool32 skipCall = VK_FALSE; layer_data *device_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); @@ -370,12 +370,12 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateImageView(VkDevice device, const VkImageV << pCreateInfo->image << " that only has " << imageEntry->second.arraySize << " mip levels."; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, IMAGE_VIEW_CREATE_ERROR, "IMAGE", ss.str().c_str()); } - if (!pCreateInfo->subresourceRange.numLevels) { + if (!pCreateInfo->subresourceRange.levelCount) { std::stringstream ss; ss << "vkCreateImageView called with 0 in pCreateInfo->subresourceRange.mipLevels."; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, IMAGE_VIEW_CREATE_ERROR, "IMAGE", ss.str().c_str()); } - if (!pCreateInfo->subresourceRange.numLayers) { + if (!pCreateInfo->subresourceRange.layerCount) { std::stringstream ss; ss << "vkCreateImageView called with 0 in pCreateInfo->subresourceRange.arraySize."; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, IMAGE_VIEW_CREATE_ERROR, "IMAGE", ss.str().c_str()); @@ -460,7 +460,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateImageView(VkDevice device, const VkImageV } VK_LAYER_EXPORT void VKAPI vkCmdClearColorImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearColorValue *pColor, @@ -468,24 +468,24 @@ VK_LAYER_EXPORT void VKAPI vkCmdClearColorImage( const VkImageSubresourceRange *pRanges) { VkBool32 skipCall = VK_FALSE; - layer_data *device_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *device_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); // For each range, image aspect must be color only for (uint32_t i = 0; i < rangeCount; i++) { if (pRanges[i].aspectMask != VK_IMAGE_ASPECT_COLOR_BIT) { char const str[] = "vkCmdClearColorImage aspectMasks for all subresource ranges must be set to VK_IMAGE_ASPECT_COLOR_BIT"; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_INVALID_IMAGE_ASPECT, "IMAGE", str); + (uint64_t)commandBuffer, 0, IMAGE_INVALID_IMAGE_ASPECT, "IMAGE", str); } } if (VK_FALSE == skipCall) { - device_data->device_dispatch_table->CmdClearColorImage(cmdBuffer, image, imageLayout, - pColor, rangeCount, pRanges); + device_data->device_dispatch_table->CmdClearColorImage(commandBuffer, image, imageLayout, + pColor, rangeCount, pRanges); } } VK_LAYER_EXPORT void VKAPI vkCmdClearDepthStencilImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearDepthStencilValue *pDepthStencil, @@ -493,7 +493,7 @@ VK_LAYER_EXPORT void VKAPI vkCmdClearDepthStencilImage( const VkImageSubresourceRange *pRanges) { VkBool32 skipCall = VK_FALSE; - layer_data *device_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *device_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); // For each range, Image aspect must be depth or stencil or both for (uint32_t i = 0; i < rangeCount; i++) { if (((pRanges[i].aspectMask & VK_IMAGE_ASPECT_DEPTH_BIT) != VK_IMAGE_ASPECT_DEPTH_BIT) && @@ -502,102 +502,102 @@ VK_LAYER_EXPORT void VKAPI vkCmdClearDepthStencilImage( char const str[] = "vkCmdClearDepthStencilImage aspectMasks for all subresource ranges must be " "set to VK_IMAGE_ASPECT_DEPTH_BIT and/or VK_IMAGE_ASPECT_STENCIL_BIT"; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_INVALID_IMAGE_ASPECT, "IMAGE", str); + (uint64_t)commandBuffer, 0, IMAGE_INVALID_IMAGE_ASPECT, "IMAGE", str); } } if (VK_FALSE == skipCall) { - device_data->device_dispatch_table->CmdClearDepthStencilImage(cmdBuffer, + device_data->device_dispatch_table->CmdClearDepthStencilImage(commandBuffer, image, imageLayout, pDepthStencil, rangeCount, pRanges); } } VK_LAYER_EXPORT void VKAPI vkCmdCopyImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, - VkImage destImage, - VkImageLayout destImageLayout, + VkImage dstImage, + VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageCopy *pRegions) { VkBool32 skipCall = VK_FALSE; - layer_data *device_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *device_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); auto srcImageEntry = device_data->imageMap.find(srcImage); - auto destImageEntry = device_data->imageMap.find(destImage); + auto dstImageEntry = device_data->imageMap.find(dstImage); // For each region, src and dst number of layers should not be zero // For each region, src and dst number of layers must match // For each region, src aspect mask must match dest aspect mask // For each region, color aspects cannot be mixed with depth/stencil aspects for (uint32_t i = 0; i < regionCount; i++) { - if(pRegions[i].srcSubresource.numLayers == 0) + if(pRegions[i].srcSubresource.layerCount == 0) { char const str[] = "vkCmdCopyImage: number of layers in source subresource is zero"; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_WARN_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_MISMATCHED_IMAGE_ASPECT, "IMAGE", str); + (uint64_t)commandBuffer, 0, IMAGE_MISMATCHED_IMAGE_ASPECT, "IMAGE", str); } - if(pRegions[i].destSubresource.numLayers == 0) + if(pRegions[i].dstSubresource.layerCount == 0) { char const str[] = "vkCmdCopyImage: number of layers in destination subresource is zero"; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_WARN_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_MISMATCHED_IMAGE_ASPECT, "IMAGE", str); + (uint64_t)commandBuffer, 0, IMAGE_MISMATCHED_IMAGE_ASPECT, "IMAGE", str); } - if(pRegions[i].srcSubresource.numLayers != pRegions[i].destSubresource.numLayers) + if(pRegions[i].srcSubresource.layerCount != pRegions[i].dstSubresource.layerCount) { char const str[] = "vkCmdCopyImage: number of layers in source and destination subresources must match"; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_MISMATCHED_IMAGE_ASPECT, "IMAGE", str); + (uint64_t)commandBuffer, 0, IMAGE_MISMATCHED_IMAGE_ASPECT, "IMAGE", str); } - if (pRegions[i].srcSubresource.aspect != pRegions[i].destSubresource.aspect) { + if (pRegions[i].srcSubresource.aspect != pRegions[i].dstSubresource.aspect) { char const str[] = "vkCmdCopyImage: Src and dest aspectMasks for each region must match"; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_MISMATCHED_IMAGE_ASPECT, "IMAGE", str); + (uint64_t)commandBuffer, 0, IMAGE_MISMATCHED_IMAGE_ASPECT, "IMAGE", str); } if ((pRegions[i].srcSubresource.aspect & VK_IMAGE_ASPECT_COLOR_BIT) && (pRegions[i].srcSubresource.aspect & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT))) { char const str[] = "vkCmdCopyImage aspectMask cannot specify both COLOR and DEPTH/STENCIL aspects"; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_INVALID_IMAGE_ASPECT, "IMAGE", str); + (uint64_t)commandBuffer, 0, IMAGE_INVALID_IMAGE_ASPECT, "IMAGE", str); } } if ((srcImageEntry != device_data->imageMap.end()) - && (destImageEntry != device_data->imageMap.end())) { - if (srcImageEntry->second.imageType != destImageEntry->second.imageType) { + && (dstImageEntry != device_data->imageMap.end())) { + if (srcImageEntry->second.imageType != dstImageEntry->second.imageType) { char const str[] = "vkCmdCopyImage called with unmatched source and dest image types."; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_MISMATCHED_IMAGE_TYPE, "IMAGE", str); + (uint64_t)commandBuffer, 0, IMAGE_MISMATCHED_IMAGE_TYPE, "IMAGE", str); } // Check that format is same size or exact stencil/depth if (is_depth_format(srcImageEntry->second.format)) { - if (srcImageEntry->second.format != destImageEntry->second.format) { + if (srcImageEntry->second.format != dstImageEntry->second.format) { char const str[] = "vkCmdCopyImage called with unmatched source and dest image depth/stencil formats."; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_MISMATCHED_IMAGE_FORMAT, "IMAGE", str); + (uint64_t)commandBuffer, 0, IMAGE_MISMATCHED_IMAGE_FORMAT, "IMAGE", str); } } else { size_t srcSize = vk_format_get_size(srcImageEntry->second.format); - size_t destSize = vk_format_get_size(destImageEntry->second.format); + size_t destSize = vk_format_get_size(dstImageEntry->second.format); if (srcSize != destSize) { char const str[] = "vkCmdCopyImage called with unmatched source and dest image format sizes."; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_MISMATCHED_IMAGE_FORMAT, "IMAGE", str); + (uint64_t)commandBuffer, 0, IMAGE_MISMATCHED_IMAGE_FORMAT, "IMAGE", str); } } } if (VK_FALSE == skipCall) { - device_data->device_dispatch_table->CmdCopyImage(cmdBuffer, srcImage, - srcImageLayout, destImage, destImageLayout, regionCount, pRegions); + device_data->device_dispatch_table->CmdCopyImage(commandBuffer, srcImage, + srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions); } } void VKAPI vkCmdClearAttachments( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t attachmentCount, const VkClearAttachment* pAttachments, uint32_t rectCount, @@ -605,7 +605,7 @@ void VKAPI vkCmdClearAttachments( { VkBool32 skipCall = VK_FALSE; VkImageAspectFlags aspectMask; - layer_data *device_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *device_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); for (uint32_t i = 0; i < attachmentCount; i++) { aspectMask = pAttachments[i].aspectMask; if (aspectMask & VK_IMAGE_ASPECT_COLOR_BIT) { @@ -613,7 +613,7 @@ void VKAPI vkCmdClearAttachments( // VK_IMAGE_ASPECT_COLOR_BIT is not the only bit set for this attachment char const str[] = "vkCmdClearAttachments aspectMask [%d] must set only VK_IMAGE_ASPECT_COLOR_BIT of a color attachment."; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_INVALID_IMAGE_ASPECT, "IMAGE", str, i); + (uint64_t)commandBuffer, 0, IMAGE_INVALID_IMAGE_ASPECT, "IMAGE", str, i); } } else { // Image aspect must be depth or stencil or both @@ -622,35 +622,35 @@ void VKAPI vkCmdClearAttachments( { char const str[] = "vkCmdClearAttachments aspectMask [%d] must be set to VK_IMAGE_ASPECT_DEPTH_BIT and/or VK_IMAGE_ASPECT_STENCIL_BIT"; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_INVALID_IMAGE_ASPECT, "IMAGE", str, i); + (uint64_t)commandBuffer, 0, IMAGE_INVALID_IMAGE_ASPECT, "IMAGE", str, i); } } } if (VK_FALSE == skipCall) { - device_data->device_dispatch_table->CmdClearAttachments(cmdBuffer, + device_data->device_dispatch_table->CmdClearAttachments(commandBuffer, attachmentCount, pAttachments, rectCount, pRects); } } VK_LAYER_EXPORT void VKAPI vkCmdCopyImageToBuffer( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, - VkBuffer destBuffer, + VkBuffer dstBuffer, uint32_t regionCount, const VkBufferImageCopy *pRegions) { VkBool32 skipCall = VK_FALSE; - layer_data *device_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *device_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); // For each region, the number of layers in the image subresource should not be zero // Image aspect must be ONE OF color, depth, stencil for (uint32_t i = 0; i < regionCount; i++) { - if(pRegions[i].imageSubresource.numLayers == 0) + if(pRegions[i].imageSubresource.layerCount == 0) { char const str[] = "vkCmdCopyImageToBuffer: number of layers in image subresource is zero"; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_WARN_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_MISMATCHED_IMAGE_ASPECT, "IMAGE", str); + (uint64_t)commandBuffer, 0, IMAGE_MISMATCHED_IMAGE_ASPECT, "IMAGE", str); } VkImageAspectFlags aspect = pRegions[i].imageSubresource.aspect; @@ -659,34 +659,34 @@ VK_LAYER_EXPORT void VKAPI vkCmdCopyImageToBuffer( (aspect != VK_IMAGE_ASPECT_STENCIL_BIT)) { char const str[] = "vkCmdCopyImageToBuffer: aspectMasks for each region must specify only COLOR or DEPTH or STENCIL"; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_INVALID_IMAGE_ASPECT, "IMAGE", str); + (uint64_t)commandBuffer, 0, IMAGE_INVALID_IMAGE_ASPECT, "IMAGE", str); } } if (VK_FALSE == skipCall) { - device_data->device_dispatch_table->CmdCopyImageToBuffer(cmdBuffer, - srcImage, srcImageLayout, destBuffer, regionCount, pRegions); + device_data->device_dispatch_table->CmdCopyImageToBuffer(commandBuffer, + srcImage, srcImageLayout, dstBuffer, regionCount, pRegions); } } VK_LAYER_EXPORT void VKAPI vkCmdCopyBufferToImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkBuffer srcBuffer, - VkImage destImage, - VkImageLayout destImageLayout, + VkImage dstImage, + VkImageLayout dstImageLayout, uint32_t regionCount, const VkBufferImageCopy *pRegions) { VkBool32 skipCall = VK_FALSE; - layer_data *device_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *device_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); // For each region, the number of layers in the image subresource should not be zero // Image aspect must be ONE OF color, depth, stencil for (uint32_t i = 0; i < regionCount; i++) { - if(pRegions[i].imageSubresource.numLayers == 0) + if(pRegions[i].imageSubresource.layerCount == 0) { char const str[] = "vkCmdCopyBufferToImage: number of layers in image subresource is zero"; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_WARN_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_MISMATCHED_IMAGE_ASPECT, "IMAGE", str); + (uint64_t)commandBuffer, 0, IMAGE_MISMATCHED_IMAGE_ASPECT, "IMAGE", str); } VkImageAspectFlags aspect = pRegions[i].imageSubresource.aspect; @@ -695,47 +695,47 @@ VK_LAYER_EXPORT void VKAPI vkCmdCopyBufferToImage( (aspect != VK_IMAGE_ASPECT_STENCIL_BIT)) { char const str[] = "vkCmdCopyBufferToImage: aspectMasks for each region must specify only COLOR or DEPTH or STENCIL"; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_INVALID_IMAGE_ASPECT, "IMAGE", str); + (uint64_t)commandBuffer, 0, IMAGE_INVALID_IMAGE_ASPECT, "IMAGE", str); } } if (VK_FALSE == skipCall) { - device_data->device_dispatch_table->CmdCopyBufferToImage(cmdBuffer, - srcBuffer, destImage, destImageLayout, regionCount, pRegions); + device_data->device_dispatch_table->CmdCopyBufferToImage(commandBuffer, + srcBuffer, dstImage, dstImageLayout, regionCount, pRegions); } } VK_LAYER_EXPORT void VKAPI vkCmdBlitImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, - VkImage destImage, - VkImageLayout destImageLayout, + VkImage dstImage, + VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageBlit *pRegions, VkFilter filter) { VkBool32 skipCall = VK_FALSE; - layer_data *device_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *device_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); auto srcImageEntry = device_data->imageMap.find(srcImage); - auto destImageEntry = device_data->imageMap.find(destImage); + auto dstImageEntry = device_data->imageMap.find(dstImage); if ((srcImageEntry != device_data->imageMap.end()) && - (destImageEntry != device_data->imageMap.end())) { + (dstImageEntry != device_data->imageMap.end())) { VkFormat srcFormat = srcImageEntry->second.format; - VkFormat dstFormat = destImageEntry->second.format; + VkFormat dstFormat = dstImageEntry->second.format; // Validate consistency for signed and unsigned formats if ((vk_format_is_sint(srcFormat) && !vk_format_is_sint(dstFormat)) || (vk_format_is_uint(srcFormat) && !vk_format_is_uint(dstFormat))) { std::stringstream ss; - ss << "vkCmdBlitImage: If one of srcImage and destImage images has signed/unsigned integer format, " + ss << "vkCmdBlitImage: If one of srcImage and dstImage images has signed/unsigned integer format, " << "the other one must also have signed/unsigned integer format. " << "Source format is " << string_VkFormat(srcFormat) << " Destinatino format is " << string_VkFormat(dstFormat); skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_INVALID_FORMAT, "IMAGE", ss.str().c_str()); + (uint64_t)commandBuffer, 0, IMAGE_INVALID_FORMAT, "IMAGE", ss.str().c_str()); } // Validate aspect bits and formats for depth/stencil images @@ -743,67 +743,67 @@ VK_LAYER_EXPORT void VKAPI vkCmdBlitImage( vk_format_is_depth_or_stencil(dstFormat)) { if (srcFormat != dstFormat) { std::stringstream ss; - ss << "vkCmdBlitImage: If one of srcImage and destImage images has a format of depth, stencil or depth " + ss << "vkCmdBlitImage: If one of srcImage and dstImage images has a format of depth, stencil or depth " << "stencil, the other one must have exactly the same format. " << "Source format is " << string_VkFormat(srcFormat) << " Destinatino format is " << string_VkFormat(dstFormat); skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_INVALID_FORMAT, "IMAGE", ss.str().c_str()); + (uint64_t)commandBuffer, 0, IMAGE_INVALID_FORMAT, "IMAGE", ss.str().c_str()); } for (uint32_t i = 0; i < regionCount; i++) { - if(pRegions[i].srcSubresource.numLayers == 0) + if(pRegions[i].srcSubresource.layerCount == 0) { char const str[] = "vkCmdBlitImage: number of layers in source subresource is zero"; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_WARN_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_MISMATCHED_IMAGE_ASPECT, "IMAGE", str); + (uint64_t)commandBuffer, 0, IMAGE_MISMATCHED_IMAGE_ASPECT, "IMAGE", str); } - if(pRegions[i].destSubresource.numLayers == 0) + if(pRegions[i].dstSubresource.layerCount == 0) { char const str[] = "vkCmdBlitImage: number of layers in destination subresource is zero"; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_WARN_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_MISMATCHED_IMAGE_ASPECT, "IMAGE", str); + (uint64_t)commandBuffer, 0, IMAGE_MISMATCHED_IMAGE_ASPECT, "IMAGE", str); } - if(pRegions[i].srcSubresource.numLayers != pRegions[i].destSubresource.numLayers) + if(pRegions[i].srcSubresource.layerCount != pRegions[i].dstSubresource.layerCount) { char const str[] = "vkCmdBlitImage: number of layers in source and destination subresources must match"; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_MISMATCHED_IMAGE_ASPECT, "IMAGE", str); + (uint64_t)commandBuffer, 0, IMAGE_MISMATCHED_IMAGE_ASPECT, "IMAGE", str); } VkImageAspectFlags srcAspect = pRegions[i].srcSubresource.aspect; - VkImageAspectFlags dstAspect = pRegions[i].destSubresource.aspect; + VkImageAspectFlags dstAspect = pRegions[i].dstSubresource.aspect; if (srcAspect != dstAspect) { std::stringstream ss; ss << "vkCmdBlitImage: Image aspects of depth/stencil images should match"; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_WARN_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_INVALID_IMAGE_ASPECT, "IMAGE", ss.str().c_str()); + (uint64_t)commandBuffer, 0, IMAGE_INVALID_IMAGE_ASPECT, "IMAGE", ss.str().c_str()); } if (vk_format_is_depth_and_stencil(srcFormat)) { if (srcAspect != (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) { std::stringstream ss; ss << "vkCmdBlitImage: Combination depth/stencil image formats must have both VK_IMAGE_ASPECT_DEPTH_BIT " - << "and VK_IMAGE_ASPECT_STENCIL_BIT set in both the srcImage and destImage"; + << "and VK_IMAGE_ASPECT_STENCIL_BIT set in both the srcImage and dstImage"; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_INVALID_IMAGE_ASPECT, "IMAGE", ss.str().c_str()); + (uint64_t)commandBuffer, 0, IMAGE_INVALID_IMAGE_ASPECT, "IMAGE", ss.str().c_str()); } } else if (vk_format_is_stencil_only(srcFormat)) { if (srcAspect != VK_IMAGE_ASPECT_STENCIL_BIT) { std::stringstream ss; ss << "vkCmdBlitImage: Stencil-only image formats must have only the VK_IMAGE_ASPECT_STENCIL_BIT " - << "set in both the srcImage and destImage"; + << "set in both the srcImage and dstImage"; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_INVALID_IMAGE_ASPECT, "IMAGE", ss.str().c_str()); + (uint64_t)commandBuffer, 0, IMAGE_INVALID_IMAGE_ASPECT, "IMAGE", ss.str().c_str()); } } else if (vk_format_is_depth_only(srcFormat)) { if (srcAspect != VK_IMAGE_ASPECT_DEPTH_BIT) { std::stringstream ss; ss << "vkCmdBlitImage: Depth-only image formats must have only the VK_IMAGE_ASPECT_DEPTH " - << "set in both the srcImage and destImage"; + << "set in both the srcImage and dstImage"; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_INVALID_IMAGE_ASPECT, "IMAGE", ss.str().c_str()); + (uint64_t)commandBuffer, 0, IMAGE_INVALID_IMAGE_ASPECT, "IMAGE", ss.str().c_str()); } } } @@ -817,81 +817,81 @@ VK_LAYER_EXPORT void VKAPI vkCmdBlitImage( ss << "vkCmdBlitImage: If the format of srcImage is a depth, stencil, depth stencil or integer-based format " << "then filter must be VK_FILTER_NEAREST."; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_INVALID_FILTER, "IMAGE", ss.str().c_str()); + (uint64_t)commandBuffer, 0, IMAGE_INVALID_FILTER, "IMAGE", ss.str().c_str()); } } } - device_data->device_dispatch_table->CmdBlitImage(cmdBuffer, srcImage, - srcImageLayout, destImage, destImageLayout, regionCount, pRegions, filter); + device_data->device_dispatch_table->CmdBlitImage(commandBuffer, srcImage, + srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions, filter); } VK_LAYER_EXPORT void VKAPI vkCmdResolveImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, - VkImage destImage, - VkImageLayout destImageLayout, + VkImage dstImage, + VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageResolve *pRegions) { VkBool32 skipCall = VK_FALSE; - layer_data *device_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *device_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); auto srcImageEntry = device_data->imageMap.find(srcImage); - auto destImageEntry = device_data->imageMap.find(destImage); + auto dstImageEntry = device_data->imageMap.find(dstImage); // For each region, the number of layers in the image subresource should not be zero // For each region, src and dest image aspect must be color only for (uint32_t i = 0; i < regionCount; i++) { - if(pRegions[i].srcSubresource.numLayers == 0) + if(pRegions[i].srcSubresource.layerCount == 0) { char const str[] = "vkCmdResolveImage: number of layers in source subresource is zero"; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_WARN_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_MISMATCHED_IMAGE_ASPECT, "IMAGE", str); + (uint64_t)commandBuffer, 0, IMAGE_MISMATCHED_IMAGE_ASPECT, "IMAGE", str); } - if(pRegions[i].destSubresource.numLayers == 0) + if(pRegions[i].dstSubresource.layerCount == 0) { char const str[] = "vkCmdResolveImage: number of layers in destination subresource is zero"; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_WARN_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_MISMATCHED_IMAGE_ASPECT, "IMAGE", str); + (uint64_t)commandBuffer, 0, IMAGE_MISMATCHED_IMAGE_ASPECT, "IMAGE", str); } if ((pRegions[i].srcSubresource.aspect != VK_IMAGE_ASPECT_COLOR_BIT) || - (pRegions[i].destSubresource.aspect != VK_IMAGE_ASPECT_COLOR_BIT)) { + (pRegions[i].dstSubresource.aspect != VK_IMAGE_ASPECT_COLOR_BIT)) { char const str[] = "vkCmdResolveImage: src and dest aspectMasks for each region must specify only VK_IMAGE_ASPECT_COLOR_BIT"; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_INVALID_IMAGE_ASPECT, "IMAGE", str); + (uint64_t)commandBuffer, 0, IMAGE_INVALID_IMAGE_ASPECT, "IMAGE", str); } } if ((srcImageEntry != device_data->imageMap.end()) && - (destImageEntry != device_data->imageMap.end())) { - if (srcImageEntry->second.format != destImageEntry->second.format) { + (dstImageEntry != device_data->imageMap.end())) { + if (srcImageEntry->second.format != dstImageEntry->second.format) { char const str[] = "vkCmdResolveImage called with unmatched source and dest formats."; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_MISMATCHED_IMAGE_FORMAT, "IMAGE", str); + (uint64_t)commandBuffer, 0, IMAGE_MISMATCHED_IMAGE_FORMAT, "IMAGE", str); } - if (srcImageEntry->second.imageType != destImageEntry->second.imageType) { + if (srcImageEntry->second.imageType != dstImageEntry->second.imageType) { char const str[] = "vkCmdResolveImage called with unmatched source and dest image types."; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_MISMATCHED_IMAGE_TYPE, "IMAGE", str); + (uint64_t)commandBuffer, 0, IMAGE_MISMATCHED_IMAGE_TYPE, "IMAGE", str); } if (srcImageEntry->second.samples <= 1) { char const str[] = "vkCmdResolveImage called with source sample count less than 2."; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_INVALID_RESOLVE_SAMPLES, "IMAGE", str); + (uint64_t)commandBuffer, 0, IMAGE_INVALID_RESOLVE_SAMPLES, "IMAGE", str); } - if (destImageEntry->second.samples > 1) { + if (dstImageEntry->second.samples > 1) { char const str[] = "vkCmdResolveImage called with dest sample count greater than 1."; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, - (uint64_t)cmdBuffer, 0, IMAGE_INVALID_RESOLVE_SAMPLES, "IMAGE", str); + (uint64_t)commandBuffer, 0, IMAGE_INVALID_RESOLVE_SAMPLES, "IMAGE", str); } } if (VK_FALSE == skipCall) { - device_data->device_dispatch_table->CmdResolveImage(cmdBuffer, srcImage, - srcImageLayout, destImage, destImageLayout, regionCount, pRegions); + device_data->device_dispatch_table->CmdResolveImage(commandBuffer, srcImage, + srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions); } } diff --git a/layers/image.h b/layers/image.h index 868ecfef..dcfb81a9 100644 --- a/layers/image.h +++ b/layers/image.h @@ -52,7 +52,7 @@ typedef struct _IMAGE_STATE uint32_t samples; VkImageType imageType; VkExtent3D extent; - _IMAGE_STATE():mipLevels(0), arraySize(0), format(VK_FORMAT_UNDEFINED), samples(0), imageType(VK_IMAGE_TYPE_NUM), extent{} {}; + _IMAGE_STATE():mipLevels(0), arraySize(0), format(VK_FORMAT_UNDEFINED), samples(0), imageType(VK_IMAGE_TYPE_RANGE_SIZE), extent{} {}; _IMAGE_STATE(const VkImageCreateInfo* pCreateInfo): mipLevels(pCreateInfo->mipLevels), arraySize(pCreateInfo->arrayLayers), diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp index 258e7e55..b2bd0ebc 100644 --- a/layers/mem_tracker.cpp +++ b/layers/mem_tracker.cpp @@ -56,7 +56,7 @@ struct layer_data { bool wsi_enabled; uint64_t currentFenceId; // Maps for tracking key structs related to MemTracker state - unordered_map<VkCmdBuffer, MT_CB_INFO> cbMap; + unordered_map<VkCommandBuffer, MT_CB_INFO> cbMap; unordered_map<VkDeviceMemory, MT_MEM_OBJ_INFO> memObjMap; unordered_map<VkFence, MT_FENCE_INFO> fenceMap; // Map fence to fence info unordered_map<VkQueue, MT_QUEUE_INFO> queueMap; @@ -136,14 +136,14 @@ static void add_swap_chain_info(layer_data* my_data, // Add new CBInfo for this cb to map container static void add_cmd_buf_info(layer_data* my_data, - const VkCmdBuffer cb) + const VkCommandBuffer cb) { - my_data->cbMap[cb].cmdBuffer = cb; + my_data->cbMap[cb].commandBuffer = cb; } // Return ptr to Info in CB map, or NULL if not found static MT_CB_INFO* get_cmd_buf_info(layer_data* my_data, - const VkCmdBuffer cb) + const VkCommandBuffer cb) { auto item = my_data->cbMap.find(cb); if (item != my_data->cbMap.end()) { @@ -354,11 +354,11 @@ static MT_MEM_OBJ_INFO* get_mem_obj_info(layer_data* my_data, static void add_mem_obj_info(layer_data* my_data, void* object, const VkDeviceMemory mem, - const VkMemoryAllocInfo* pAllocInfo) + const VkMemoryAllocateInfo* pAllocateInfo) { assert(object != NULL); - memcpy(&my_data->memObjMap[mem].allocInfo, pAllocInfo, sizeof(VkMemoryAllocInfo)); + memcpy(&my_data->memObjMap[mem].allocInfo, pAllocateInfo, sizeof(VkMemoryAllocateInfo)); // TODO: Update for real hardware, actually process allocation info structures my_data->memObjMap[mem].allocInfo.pNext = NULL; my_data->memObjMap[mem].object = object; @@ -370,7 +370,7 @@ static void add_mem_obj_info(layer_data* my_data, // Find Mem Obj Info and add CB reference to list container static VkBool32 update_cmd_buf_and_mem_references( layer_data *my_data, - const VkCmdBuffer cb, + const VkCommandBuffer cb, const VkDeviceMemory mem, const char *apiName) { @@ -388,8 +388,8 @@ static VkBool32 update_cmd_buf_and_mem_references( } else { // Search for cmd buffer object in memory object's binding list VkBool32 found = VK_FALSE; - if (pMemInfo->pCmdBufferBindings.size() > 0) { - for (list<VkCmdBuffer>::iterator it = pMemInfo->pCmdBufferBindings.begin(); it != pMemInfo->pCmdBufferBindings.end(); ++it) { + if (pMemInfo->pCommandBufferBindings.size() > 0) { + for (list<VkCommandBuffer>::iterator it = pMemInfo->pCommandBufferBindings.begin(); it != pMemInfo->pCommandBufferBindings.end(); ++it) { if ((*it) == cb) { found = VK_TRUE; break; @@ -398,7 +398,7 @@ static VkBool32 update_cmd_buf_and_mem_references( } // If not present, add to list if (found == VK_FALSE) { - pMemInfo->pCmdBufferBindings.push_front(cb); + pMemInfo->pCommandBufferBindings.push_front(cb); pMemInfo->refCount++; } // Now update CBInfo's Mem reference list @@ -430,7 +430,7 @@ static VkBool32 update_cmd_buf_and_mem_references( // Free bindings related to CB static VkBool32 clear_cmd_buf_and_mem_references(layer_data* my_data, - const VkCmdBuffer cb) + const VkCommandBuffer cb) { VkBool32 skipCall = VK_FALSE; MT_CB_INFO* pCBInfo = get_cmd_buf_info(my_data, cb); @@ -442,7 +442,7 @@ static VkBool32 clear_cmd_buf_and_mem_references(layer_data* my_data, list<VkDeviceMemory> mem_obj_list = pCBInfo->pMemObjList; for (list<VkDeviceMemory>::iterator it=mem_obj_list.begin(); it!=mem_obj_list.end(); ++it) { MT_MEM_OBJ_INFO* pInfo = get_mem_obj_info(my_data, *it); - pInfo->pCmdBufferBindings.remove(cb); + pInfo->pCommandBufferBindings.remove(cb); pInfo->refCount--; } } @@ -455,7 +455,7 @@ static VkBool32 clear_cmd_buf_and_mem_references(layer_data* my_data, static VkBool32 delete_cmd_buf_info_list(layer_data* my_data) { VkBool32 skipCall = VK_FALSE; - for (unordered_map<VkCmdBuffer, MT_CB_INFO>::iterator ii=my_data->cbMap.begin(); ii!=my_data->cbMap.end(); ++ii) { + for (unordered_map<VkCommandBuffer, MT_CB_INFO>::iterator ii=my_data->cbMap.begin(); ii!=my_data->cbMap.end(); ++ii) { skipCall |= clear_cmd_buf_and_mem_references(my_data, (*ii).first); } my_data->cbMap.clear(); @@ -467,23 +467,23 @@ static VkBool32 reportMemReferencesAndCleanUp(layer_data* my_data, MT_MEM_OBJ_INFO* pMemObjInfo) { VkBool32 skipCall = VK_FALSE; - size_t cmdBufRefCount = pMemObjInfo->pCmdBufferBindings.size(); + size_t cmdBufRefCount = pMemObjInfo->pCommandBufferBindings.size(); size_t objRefCount = pMemObjInfo->pObjBindings.size(); - if ((pMemObjInfo->pCmdBufferBindings.size() + pMemObjInfo->pObjBindings.size()) != 0) { + if ((pMemObjInfo->pCommandBufferBindings.size() + pMemObjInfo->pObjBindings.size()) != 0) { skipCall = log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, (uint64_t) pMemObjInfo->mem, 0, MEMTRACK_FREED_MEM_REF, "MEM", "Attempting to free memory object %#" PRIxLEAST64 " which still contains %lu references", (uint64_t) pMemObjInfo->mem, (cmdBufRefCount + objRefCount)); } - if (cmdBufRefCount > 0 && pMemObjInfo->pCmdBufferBindings.size() > 0) { - for (list<VkCmdBuffer>::const_iterator it = pMemObjInfo->pCmdBufferBindings.begin(); it != pMemObjInfo->pCmdBufferBindings.end(); ++it) { - // TODO : cmdBuffer should be source Obj here + if (cmdBufRefCount > 0 && pMemObjInfo->pCommandBufferBindings.size() > 0) { + for (list<VkCommandBuffer>::const_iterator it = pMemObjInfo->pCommandBufferBindings.begin(); it != pMemObjInfo->pCommandBufferBindings.end(); ++it) { + // TODO : CommandBuffer should be source Obj here log_msg(my_data->report_data, VK_DBG_REPORT_INFO_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)(*it), 0, MEMTRACK_FREED_MEM_REF, "MEM", "Command Buffer %p still has a reference to mem obj %#" PRIxLEAST64, (*it), (uint64_t) pMemObjInfo->mem); } // Clear the list of hanging references - pMemObjInfo->pCmdBufferBindings.clear(); + pMemObjInfo->pCommandBufferBindings.clear(); } if (objRefCount > 0 && pMemObjInfo->pObjBindings.size() > 0) { @@ -514,7 +514,7 @@ static VkBool32 deleteMemObjInfo(layer_data* my_data, // Check if fence for given CB is completed static VkBool32 checkCBCompleted(layer_data* my_data, - const VkCmdBuffer cb, + const VkCommandBuffer cb, VkBool32 *complete) { VkBool32 skipCall = VK_FALSE; @@ -558,13 +558,13 @@ static VkBool32 freeMemObjInfo(layer_data* my_data, // Clear any CB bindings for completed CBs // TODO : Is there a better place to do this? - VkBool32 cmdBufferComplete = VK_FALSE; + VkBool32 commandBufferComplete = VK_FALSE; assert(pInfo->object != VK_NULL_HANDLE); - list<VkCmdBuffer>::iterator it = pInfo->pCmdBufferBindings.begin(); - list<VkCmdBuffer>::iterator temp; - while (pInfo->pCmdBufferBindings.size() > 0 && it != pInfo->pCmdBufferBindings.end()) { - skipCall |= checkCBCompleted(my_data, *it, &cmdBufferComplete); - if (VK_TRUE == cmdBufferComplete) { + list<VkCommandBuffer>::iterator it = pInfo->pCommandBufferBindings.begin(); + list<VkCommandBuffer>::iterator temp; + while (pInfo->pCommandBufferBindings.size() > 0 && it != pInfo->pCommandBufferBindings.end()) { + skipCall |= checkCBCompleted(my_data, *it, &commandBufferComplete); + if (VK_TRUE == commandBufferComplete) { temp = it; ++temp; skipCall |= clear_cmd_buf_and_mem_references(my_data, *it); @@ -825,7 +825,7 @@ static void print_mem_list(layer_data* my_data, log_msg(my_data->report_data, VK_DBG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, 0, 0, MEMTRACK_NONE, "MEM", " Ref Count: %u", pInfo->refCount); if (0 != pInfo->allocInfo.allocationSize) { - string pAllocInfoMsg = vk_print_vkmemoryallocinfo(&pInfo->allocInfo, "MEM(INFO): "); + string pAllocInfoMsg = vk_print_vkmemoryallocateinfo(&pInfo->allocInfo, "MEM(INFO): "); log_msg(my_data->report_data, VK_DBG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, 0, 0, MEMTRACK_NONE, "MEM", " Mem Alloc info:\n%s", pAllocInfoMsg.c_str()); } else { @@ -843,10 +843,10 @@ static void print_mem_list(layer_data* my_data, } log_msg(my_data->report_data, VK_DBG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, 0, 0, MEMTRACK_NONE, "MEM", - " VK Command Buffer (CB) binding list of size %lu elements", pInfo->pCmdBufferBindings.size()); - if (pInfo->pCmdBufferBindings.size() > 0) + " VK Command Buffer (CB) binding list of size %lu elements", pInfo->pCommandBufferBindings.size()); + if (pInfo->pCommandBufferBindings.size() > 0) { - for (list<VkCmdBuffer>::iterator it = pInfo->pCmdBufferBindings.begin(); it != pInfo->pCmdBufferBindings.end(); ++it) { + for (list<VkCommandBuffer>::iterator it = pInfo->pCommandBufferBindings.begin(); it != pInfo->pCommandBufferBindings.end(); ++it) { log_msg(my_data->report_data, VK_DBG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, 0, 0, MEMTRACK_NONE, "MEM", " VK CB %p", (*it)); } @@ -877,7 +877,7 @@ static void printCBList(layer_data* my_data, log_msg(my_data->report_data, VK_DBG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, 0, 0, MEMTRACK_NONE, "MEM", " CB Info (%p) has CB %p, fenceId %" PRIx64", and fence %#" PRIxLEAST64, - (void*)pCBInfo, (void*)pCBInfo->cmdBuffer, pCBInfo->fenceId, + (void*)pCBInfo, (void*)pCBInfo->commandBuffer, pCBInfo->fenceId, (uint64_t) pCBInfo->lastSubmittedFence); if (pCBInfo->pMemObjList.size() <= 0) @@ -925,7 +925,7 @@ static void init_mem_tracker( } // hook DestroyInstance to remove tableInstanceMap entry -VK_LAYER_EXPORT void VKAPI vkDestroyInstance(VkInstance instance, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks* pAllocator) { // Grab the key before the instance is destroyed. dispatch_key key = get_dispatch_key(instance); @@ -952,7 +952,7 @@ VK_LAYER_EXPORT void VKAPI vkDestroyInstance(VkInstance instance, const VkAllocC VkResult VKAPI vkCreateInstance( const VkInstanceCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkInstance* pInstance) { layer_data *my_data = get_my_data_ptr(get_dispatch_key(*pInstance), layer_data_map); @@ -994,7 +994,7 @@ static void createDeviceRegisterExtensions(const VkDeviceCreateInfo* pCreateInfo VK_LAYER_EXPORT VkResult VKAPI vkCreateDevice( VkPhysicalDevice gpu, const VkDeviceCreateInfo *pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkDevice *pDevice) { layer_data *my_device_data = get_my_data_ptr(get_dispatch_key(*pDevice), layer_data_map); @@ -1010,7 +1010,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateDevice( VK_LAYER_EXPORT void VKAPI vkDestroyDevice( VkDevice device, - const VkAllocCallbacks* pAllocator) + const VkAllocationCallbacks* pAllocator) { dispatch_key key = get_dispatch_key(device); layer_data *my_device_data = get_my_data_ptr(key, layer_data_map); @@ -1195,17 +1195,17 @@ VK_LAYER_EXPORT VkResult VKAPI vkQueueSubmit( return result; } -VK_LAYER_EXPORT VkResult VKAPI vkAllocMemory( +VK_LAYER_EXPORT VkResult VKAPI vkAllocateMemory( VkDevice device, - const VkMemoryAllocInfo *pAllocInfo, - const VkAllocCallbacks* pAllocator, - VkDeviceMemory *pMem) + const VkMemoryAllocateInfo *pAllocateInfo, + const VkAllocationCallbacks* pAllocator, + VkDeviceMemory *pMemory) { layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); - VkResult result = my_data->device_dispatch_table->AllocMemory(device, pAllocInfo, pAllocator, pMem); + VkResult result = my_data->device_dispatch_table->AllocateMemory(device, pAllocateInfo, pAllocator, pMemory); // TODO : Track allocations and overall size here loader_platform_thread_lock_mutex(&globalLock); - add_mem_obj_info(my_data, device, *pMem, pAllocInfo); + add_mem_obj_info(my_data, device, *pMemory, pAllocateInfo); print_mem_list(my_data, device); loader_platform_thread_unlock_mutex(&globalLock); return result; @@ -1214,7 +1214,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkAllocMemory( VK_LAYER_EXPORT void VKAPI vkFreeMemory( VkDevice device, VkDeviceMemory mem, - const VkAllocCallbacks* pAllocator) + const VkAllocationCallbacks* pAllocator) { layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); /* From spec : A memory object is freed by calling vkFreeMemory() when it is no longer needed. Before @@ -1265,7 +1265,7 @@ VK_LAYER_EXPORT void VKAPI vkUnmapMemory( my_data->device_dispatch_table->UnmapMemory(device, mem); } -VK_LAYER_EXPORT void VKAPI vkDestroyFence(VkDevice device, VkFence fence, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroyFence(VkDevice device, VkFence fence, const VkAllocationCallbacks* pAllocator) { layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); loader_platform_thread_lock_mutex(&globalLock); @@ -1278,7 +1278,7 @@ VK_LAYER_EXPORT void VKAPI vkDestroyFence(VkDevice device, VkFence fence, const my_data->device_dispatch_table->DestroyFence(device, fence, pAllocator); } -VK_LAYER_EXPORT void VKAPI vkDestroyBuffer(VkDevice device, VkBuffer buffer, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroyBuffer(VkDevice device, VkBuffer buffer, const VkAllocationCallbacks* pAllocator) { layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); VkBool32 skipCall = VK_FALSE; @@ -1294,7 +1294,7 @@ VK_LAYER_EXPORT void VKAPI vkDestroyBuffer(VkDevice device, VkBuffer buffer, con } } -VK_LAYER_EXPORT void VKAPI vkDestroyImage(VkDevice device, VkImage image, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroyImage(VkDevice device, VkImage image, const VkAllocationCallbacks* pAllocator) { layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); VkBool32 skipCall = VK_FALSE; @@ -1314,7 +1314,7 @@ VkResult VKAPI vkBindBufferMemory( VkDevice device, VkBuffer buffer, VkDeviceMemory mem, - VkDeviceSize memOffset) + VkDeviceSize memoryOffset) { layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); VkResult result = VK_ERROR_VALIDATION_FAILED; @@ -1325,7 +1325,7 @@ VkResult VKAPI vkBindBufferMemory( print_mem_list(my_data, device); loader_platform_thread_unlock_mutex(&globalLock); if (VK_FALSE == skipCall) { - result = my_data->device_dispatch_table->BindBufferMemory(device, buffer, mem, memOffset); + result = my_data->device_dispatch_table->BindBufferMemory(device, buffer, mem, memoryOffset); } return result; } @@ -1334,7 +1334,7 @@ VkResult VKAPI vkBindImageMemory( VkDevice device, VkImage image, VkDeviceMemory mem, - VkDeviceSize memOffset) + VkDeviceSize memoryOffset) { layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); VkResult result = VK_ERROR_VALIDATION_FAILED; @@ -1345,7 +1345,7 @@ VkResult VKAPI vkBindImageMemory( print_mem_list(my_data, device); loader_platform_thread_unlock_mutex(&globalLock); if (VK_FALSE == skipCall) { - result = my_data->device_dispatch_table->BindImageMemory(device, image, mem, memOffset); + result = my_data->device_dispatch_table->BindImageMemory(device, image, mem, memoryOffset); } return result; } @@ -1426,7 +1426,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkQueueBindSparse( VK_LAYER_EXPORT VkResult VKAPI vkCreateFence( VkDevice device, const VkFenceCreateInfo *pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkFence *pFence) { layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); @@ -1566,7 +1566,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkDeviceWaitIdle( VK_LAYER_EXPORT VkResult VKAPI vkCreateBuffer( VkDevice device, const VkBufferCreateInfo *pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkBuffer *pBuffer) { layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); @@ -1582,7 +1582,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateBuffer( VK_LAYER_EXPORT VkResult VKAPI vkCreateImage( VkDevice device, const VkImageCreateInfo *pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkImage *pImage) { layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); @@ -1598,7 +1598,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateImage( VK_LAYER_EXPORT VkResult VKAPI vkCreateImageView( VkDevice device, const VkImageViewCreateInfo *pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkImageView *pView) { layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); @@ -1617,7 +1617,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateImageView( VK_LAYER_EXPORT VkResult VKAPI vkCreateBufferView( VkDevice device, const VkBufferViewCreateInfo *pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkBufferView *pView) { layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); @@ -1634,99 +1634,99 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateBufferView( return result; } -VK_LAYER_EXPORT VkResult VKAPI vkAllocCommandBuffers( +VK_LAYER_EXPORT VkResult VKAPI vkAllocateCommandBuffers( VkDevice device, - const VkCmdBufferAllocInfo *pCreateInfo, - VkCmdBuffer *pCmdBuffer) + const VkCommandBufferAllocateInfo *pCreateInfo, + VkCommandBuffer *pCommandBuffer) { layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); - VkResult result = my_data->device_dispatch_table->AllocCommandBuffers(device, pCreateInfo, pCmdBuffer); + VkResult result = my_data->device_dispatch_table->AllocateCommandBuffers(device, pCreateInfo, pCommandBuffer); // At time of cmd buffer creation, create global cmd buffer info for the returned cmd buffer loader_platform_thread_lock_mutex(&globalLock); - if (*pCmdBuffer) - add_cmd_buf_info(my_data, *pCmdBuffer); + if (*pCommandBuffer) + add_cmd_buf_info(my_data, *pCommandBuffer); printCBList(my_data, device); loader_platform_thread_unlock_mutex(&globalLock); return result; } VK_LAYER_EXPORT VkResult VKAPI vkBeginCommandBuffer( - VkCmdBuffer cmdBuffer, - const VkCmdBufferBeginInfo *pBeginInfo) + VkCommandBuffer commandBuffer, + const VkCommandBufferBeginInfo *pBeginInfo) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); VkResult result = VK_ERROR_VALIDATION_FAILED; VkBool32 skipCall = VK_FALSE; - VkBool32 cmdBufferComplete = VK_FALSE; + VkBool32 commandBufferComplete = VK_FALSE; loader_platform_thread_lock_mutex(&globalLock); // This implicitly resets the Cmd Buffer so make sure any fence is done and then clear memory references - skipCall = checkCBCompleted(my_data, cmdBuffer, &cmdBufferComplete); + skipCall = checkCBCompleted(my_data, commandBuffer, &commandBufferComplete); - if (VK_FALSE == cmdBufferComplete) { - skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)cmdBuffer, 0, + if (VK_FALSE == commandBufferComplete) { + skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)commandBuffer, 0, MEMTRACK_RESET_CB_WHILE_IN_FLIGHT, "MEM", "Calling vkBeginCommandBuffer() on active CB %p before it has completed. " - "You must check CB flag before this call.", cmdBuffer); + "You must check CB flag before this call.", commandBuffer); } loader_platform_thread_unlock_mutex(&globalLock); if (VK_FALSE == skipCall) { - result = my_data->device_dispatch_table->BeginCommandBuffer(cmdBuffer, pBeginInfo); + result = my_data->device_dispatch_table->BeginCommandBuffer(commandBuffer, pBeginInfo); } loader_platform_thread_lock_mutex(&globalLock); - clear_cmd_buf_and_mem_references(my_data, cmdBuffer); + clear_cmd_buf_and_mem_references(my_data, commandBuffer); loader_platform_thread_unlock_mutex(&globalLock); return result; } VK_LAYER_EXPORT VkResult VKAPI vkEndCommandBuffer( - VkCmdBuffer cmdBuffer) + VkCommandBuffer commandBuffer) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); // TODO : Anything to do here? - VkResult result = my_data->device_dispatch_table->EndCommandBuffer(cmdBuffer); + VkResult result = my_data->device_dispatch_table->EndCommandBuffer(commandBuffer); return result; } VK_LAYER_EXPORT VkResult VKAPI vkResetCommandBuffer( - VkCmdBuffer cmdBuffer, - VkCmdBufferResetFlags flags) + VkCommandBuffer commandBuffer, + VkCommandBufferResetFlags flags) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); VkResult result = VK_ERROR_VALIDATION_FAILED; VkBool32 skipCall = VK_FALSE; - VkBool32 cmdBufferComplete = VK_FALSE; + VkBool32 commandBufferComplete = VK_FALSE; loader_platform_thread_lock_mutex(&globalLock); // Verify that CB is complete (not in-flight) - skipCall = checkCBCompleted(my_data, cmdBuffer, &cmdBufferComplete); - if (VK_FALSE == cmdBufferComplete) { - skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)cmdBuffer, 0, + skipCall = checkCBCompleted(my_data, commandBuffer, &commandBufferComplete); + if (VK_FALSE == commandBufferComplete) { + skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)commandBuffer, 0, MEMTRACK_RESET_CB_WHILE_IN_FLIGHT, "MEM", "Resetting CB %p before it has completed. You must check CB " - "flag before calling vkResetCommandBuffer().", cmdBuffer); + "flag before calling vkResetCommandBuffer().", commandBuffer); } // Clear memory references as this point. - skipCall |= clear_cmd_buf_and_mem_references(my_data, cmdBuffer); + skipCall |= clear_cmd_buf_and_mem_references(my_data, commandBuffer); loader_platform_thread_unlock_mutex(&globalLock); if (VK_FALSE == skipCall) { - result = my_data->device_dispatch_table->ResetCommandBuffer(cmdBuffer, flags); + result = my_data->device_dispatch_table->ResetCommandBuffer(commandBuffer, flags); } return result; } // TODO : For any vkCmdBind* calls that include an object which has mem bound to it, -// need to account for that mem now having binding to given cmdBuffer +// need to account for that mem now having binding to given commandBuffer VK_LAYER_EXPORT void VKAPI vkCmdBindPipeline( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); #if 0 - // TODO : If memory bound to pipeline, then need to tie that mem to cmdBuffer + // TODO : If memory bound to pipeline, then need to tie that mem to commandBuffer if (getPipeline(pipeline)) { - MT_CB_INFO *pCBInfo = get_cmd_buf_info(my_data, cmdBuffer); + MT_CB_INFO *pCBInfo = get_cmd_buf_info(my_data, commandBuffer); if (pCBInfo) { pCBInfo->pipelines[pipelineBindPoint] = pipeline; } else { - "Attempt to bind Pipeline %p to non-existant command buffer %p!", (void*)pipeline, cmdBuffer); - layerCbMsg(VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, cmdBuffer, 0, MEMTRACK_INVALID_CB, (char *) "DS", (char *) str); + "Attempt to bind Pipeline %p to non-existant command buffer %p!", (void*)pipeline, commandBuffer); + layerCbMsg(VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, commandBuffer, 0, MEMTRACK_INVALID_CB, (char *) "DS", (char *) str); } } else { @@ -1734,179 +1734,179 @@ VK_LAYER_EXPORT void VKAPI vkCmdBindPipeline( layerCbMsg(VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_PIPELINE, pipeline, 0, MEMTRACK_INVALID_OBJECT, (char *) "DS", (char *) str); } #endif - my_data->device_dispatch_table->CmdBindPipeline(cmdBuffer, pipelineBindPoint, pipeline); + my_data->device_dispatch_table->CmdBindPipeline(commandBuffer, pipelineBindPoint, pipeline); } VK_LAYER_EXPORT void VKAPI vkCmdSetViewport( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t viewportCount, const VkViewport* pViewports) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); VkBool32 skipCall = VK_FALSE; loader_platform_thread_lock_mutex(&globalLock); - MT_CB_INFO *pCmdBuf = get_cmd_buf_info(my_data, cmdBuffer); + MT_CB_INFO *pCmdBuf = get_cmd_buf_info(my_data, commandBuffer); if (!pCmdBuf) { - skipCall = log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)cmdBuffer, 0, - MEMTRACK_INVALID_CB, "MEM", "Unable to find command buffer object %p, was it ever created?", (void*)cmdBuffer); + skipCall = log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)commandBuffer, 0, + MEMTRACK_INVALID_CB, "MEM", "Unable to find command buffer object %p, was it ever created?", (void*)commandBuffer); } loader_platform_thread_unlock_mutex(&globalLock); if (VK_FALSE == skipCall) { - my_data->device_dispatch_table->CmdSetViewport(cmdBuffer, viewportCount, pViewports); + my_data->device_dispatch_table->CmdSetViewport(commandBuffer, viewportCount, pViewports); } } VK_LAYER_EXPORT void VKAPI vkCmdSetScissor( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t scissorCount, const VkRect2D* pScissors) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); VkBool32 skipCall = VK_FALSE; loader_platform_thread_lock_mutex(&globalLock); - MT_CB_INFO *pCmdBuf = get_cmd_buf_info(my_data, cmdBuffer); + MT_CB_INFO *pCmdBuf = get_cmd_buf_info(my_data, commandBuffer); if (!pCmdBuf) { - skipCall = log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)cmdBuffer, 0, - MEMTRACK_INVALID_CB, "MEM", "Unable to find command buffer object %p, was it ever created?", (void*)cmdBuffer); + skipCall = log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)commandBuffer, 0, + MEMTRACK_INVALID_CB, "MEM", "Unable to find command buffer object %p, was it ever created?", (void*)commandBuffer); } loader_platform_thread_unlock_mutex(&globalLock); if (VK_FALSE == skipCall) { - my_data->device_dispatch_table->CmdSetScissor(cmdBuffer, scissorCount, pScissors); + my_data->device_dispatch_table->CmdSetScissor(commandBuffer, scissorCount, pScissors); } } -VK_LAYER_EXPORT void VKAPI vkCmdSetLineWidth(VkCmdBuffer cmdBuffer, float lineWidth) +VK_LAYER_EXPORT void VKAPI vkCmdSetLineWidth(VkCommandBuffer commandBuffer, float lineWidth) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); VkBool32 skipCall = VK_FALSE; loader_platform_thread_lock_mutex(&globalLock); - MT_CB_INFO *pCmdBuf = get_cmd_buf_info(my_data, cmdBuffer); + MT_CB_INFO *pCmdBuf = get_cmd_buf_info(my_data, commandBuffer); if (!pCmdBuf) { - skipCall = log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)cmdBuffer, 0, - MEMTRACK_INVALID_CB, "MEM", "Unable to find command buffer object %p, was it ever created?", (void*)cmdBuffer); + skipCall = log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)commandBuffer, 0, + MEMTRACK_INVALID_CB, "MEM", "Unable to find command buffer object %p, was it ever created?", (void*)commandBuffer); } loader_platform_thread_unlock_mutex(&globalLock); if (VK_FALSE == skipCall) { - my_data->device_dispatch_table->CmdSetLineWidth(cmdBuffer, lineWidth); + my_data->device_dispatch_table->CmdSetLineWidth(commandBuffer, lineWidth); } } VK_LAYER_EXPORT void VKAPI vkCmdSetDepthBias( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, float depthBiasConstantFactor, float depthBiasClamp, float depthBiasSlopeFactor) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); VkBool32 skipCall = VK_FALSE; loader_platform_thread_lock_mutex(&globalLock); - MT_CB_INFO *pCmdBuf = get_cmd_buf_info(my_data, cmdBuffer); + MT_CB_INFO *pCmdBuf = get_cmd_buf_info(my_data, commandBuffer); if (!pCmdBuf) { - skipCall = log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)cmdBuffer, 0, - MEMTRACK_INVALID_CB, "MEM", "Unable to find command buffer object %p, was it ever created?", (void*)cmdBuffer); + skipCall = log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)commandBuffer, 0, + MEMTRACK_INVALID_CB, "MEM", "Unable to find command buffer object %p, was it ever created?", (void*)commandBuffer); } loader_platform_thread_unlock_mutex(&globalLock); if (VK_FALSE == skipCall) { - my_data->device_dispatch_table->CmdSetDepthBias(cmdBuffer, depthBiasConstantFactor, depthBiasClamp, depthBiasSlopeFactor); + my_data->device_dispatch_table->CmdSetDepthBias(commandBuffer, depthBiasConstantFactor, depthBiasClamp, depthBiasSlopeFactor); } } VK_LAYER_EXPORT void VKAPI vkCmdSetBlendConstants( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, const float blendConstants[4]) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); VkBool32 skipCall = VK_FALSE; loader_platform_thread_lock_mutex(&globalLock); - MT_CB_INFO *pCmdBuf = get_cmd_buf_info(my_data, cmdBuffer); + MT_CB_INFO *pCmdBuf = get_cmd_buf_info(my_data, commandBuffer); if (!pCmdBuf) { - skipCall = log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)cmdBuffer, 0, - MEMTRACK_INVALID_CB, "MEM", "Unable to find command buffer object %p, was it ever created?", (void*)cmdBuffer); + skipCall = log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)commandBuffer, 0, + MEMTRACK_INVALID_CB, "MEM", "Unable to find command buffer object %p, was it ever created?", (void*)commandBuffer); } loader_platform_thread_unlock_mutex(&globalLock); if (VK_FALSE == skipCall) { - my_data->device_dispatch_table->CmdSetBlendConstants(cmdBuffer, blendConstants); + my_data->device_dispatch_table->CmdSetBlendConstants(commandBuffer, blendConstants); } } VK_LAYER_EXPORT void VKAPI vkCmdSetDepthBounds( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, float minDepthBounds, float maxDepthBounds) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); VkBool32 skipCall = VK_FALSE; loader_platform_thread_lock_mutex(&globalLock); - MT_CB_INFO *pCmdBuf = get_cmd_buf_info(my_data, cmdBuffer); + MT_CB_INFO *pCmdBuf = get_cmd_buf_info(my_data, commandBuffer); if (!pCmdBuf) { - skipCall = log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)cmdBuffer, 0, - MEMTRACK_INVALID_CB, "MEM", "Unable to find command buffer object %p, was it ever created?", (void*)cmdBuffer); + skipCall = log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)commandBuffer, 0, + MEMTRACK_INVALID_CB, "MEM", "Unable to find command buffer object %p, was it ever created?", (void*)commandBuffer); } loader_platform_thread_unlock_mutex(&globalLock); if (VK_FALSE == skipCall) { - my_data->device_dispatch_table->CmdSetDepthBounds(cmdBuffer, minDepthBounds, maxDepthBounds); + my_data->device_dispatch_table->CmdSetDepthBounds(commandBuffer, minDepthBounds, maxDepthBounds); } } VK_LAYER_EXPORT void VKAPI vkCmdSetStencilCompareMask( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t stencilCompareMask) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); VkBool32 skipCall = VK_FALSE; loader_platform_thread_lock_mutex(&globalLock); - MT_CB_INFO *pCmdBuf = get_cmd_buf_info(my_data, cmdBuffer); + MT_CB_INFO *pCmdBuf = get_cmd_buf_info(my_data, commandBuffer); if (!pCmdBuf) { - skipCall = log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)cmdBuffer, 0, - MEMTRACK_INVALID_CB, "MEM", "Unable to find command buffer object %p, was it ever created?", (void*)cmdBuffer); + skipCall = log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)commandBuffer, 0, + MEMTRACK_INVALID_CB, "MEM", "Unable to find command buffer object %p, was it ever created?", (void*)commandBuffer); } loader_platform_thread_unlock_mutex(&globalLock); if (VK_FALSE == skipCall) { - my_data->device_dispatch_table->CmdSetStencilCompareMask(cmdBuffer, faceMask, stencilCompareMask); + my_data->device_dispatch_table->CmdSetStencilCompareMask(commandBuffer, faceMask, stencilCompareMask); } } VK_LAYER_EXPORT void VKAPI vkCmdSetStencilWriteMask( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t stencilWriteMask) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); VkBool32 skipCall = VK_FALSE; loader_platform_thread_lock_mutex(&globalLock); - MT_CB_INFO *pCmdBuf = get_cmd_buf_info(my_data, cmdBuffer); + MT_CB_INFO *pCmdBuf = get_cmd_buf_info(my_data, commandBuffer); if (!pCmdBuf) { - skipCall = log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)cmdBuffer, 0, - MEMTRACK_INVALID_CB, "MEM", "Unable to find command buffer object %p, was it ever created?", (void*)cmdBuffer); + skipCall = log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)commandBuffer, 0, + MEMTRACK_INVALID_CB, "MEM", "Unable to find command buffer object %p, was it ever created?", (void*)commandBuffer); } loader_platform_thread_unlock_mutex(&globalLock); if (VK_FALSE == skipCall) { - my_data->device_dispatch_table->CmdSetStencilWriteMask(cmdBuffer, faceMask, stencilWriteMask); + my_data->device_dispatch_table->CmdSetStencilWriteMask(commandBuffer, faceMask, stencilWriteMask); } } VK_LAYER_EXPORT void VKAPI vkCmdSetStencilReference( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t stencilReference) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); VkBool32 skipCall = VK_FALSE; loader_platform_thread_lock_mutex(&globalLock); - MT_CB_INFO *pCmdBuf = get_cmd_buf_info(my_data, cmdBuffer); + MT_CB_INFO *pCmdBuf = get_cmd_buf_info(my_data, commandBuffer); if (!pCmdBuf) { - skipCall = log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)cmdBuffer, 0, - MEMTRACK_INVALID_CB, "MEM", "Unable to find command buffer object %p, was it ever created?", (void*)cmdBuffer); + skipCall = log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)commandBuffer, 0, + MEMTRACK_INVALID_CB, "MEM", "Unable to find command buffer object %p, was it ever created?", (void*)commandBuffer); } loader_platform_thread_unlock_mutex(&globalLock); if (VK_FALSE == skipCall) { - my_data->device_dispatch_table->CmdSetStencilReference(cmdBuffer, faceMask, stencilReference); + my_data->device_dispatch_table->CmdSetStencilReference(commandBuffer, faceMask, stencilReference); } } VK_LAYER_EXPORT void VKAPI vkCmdBindDescriptorSets( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t firstSet, @@ -1915,378 +1915,378 @@ VK_LAYER_EXPORT void VKAPI vkCmdBindDescriptorSets( uint32_t dynamicOffsetCount, const uint32_t *pDynamicOffsets) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); // TODO : Somewhere need to verify that all textures referenced by shaders in DS are in some type of *SHADER_READ* state my_data->device_dispatch_table->CmdBindDescriptorSets( - cmdBuffer, pipelineBindPoint, layout, firstSet, setCount, pDescriptorSets, dynamicOffsetCount, pDynamicOffsets); + commandBuffer, pipelineBindPoint, layout, firstSet, setCount, pDescriptorSets, dynamicOffsetCount, pDynamicOffsets); } VK_LAYER_EXPORT void VKAPI vkCmdBindVertexBuffers( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t startBinding, uint32_t bindingCount, const VkBuffer *pBuffers, const VkDeviceSize *pOffsets) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); // TODO : Somewhere need to verify that VBs have correct usage state flagged - my_data->device_dispatch_table->CmdBindVertexBuffers(cmdBuffer, startBinding, bindingCount, pBuffers, pOffsets); + my_data->device_dispatch_table->CmdBindVertexBuffers(commandBuffer, startBinding, bindingCount, pBuffers, pOffsets); } VK_LAYER_EXPORT void VKAPI vkCmdBindIndexBuffer( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkIndexType indexType) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); // TODO : Somewhere need to verify that IBs have correct usage state flagged - my_data->device_dispatch_table->CmdBindIndexBuffer(cmdBuffer, buffer, offset, indexType); + my_data->device_dispatch_table->CmdBindIndexBuffer(commandBuffer, buffer, offset, indexType); } VK_LAYER_EXPORT void VKAPI vkCmdDrawIndirect( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t count, uint32_t stride) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); VkDeviceMemory mem; loader_platform_thread_lock_mutex(&globalLock); - VkBool32 skipCall = get_mem_binding_from_object(my_data, cmdBuffer, (uint64_t)buffer, VK_OBJECT_TYPE_BUFFER, &mem); - skipCall |= update_cmd_buf_and_mem_references(my_data, cmdBuffer, mem, "vkCmdDrawIndirect"); + VkBool32 skipCall = get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)buffer, VK_OBJECT_TYPE_BUFFER, &mem); + skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdDrawIndirect"); loader_platform_thread_unlock_mutex(&globalLock); if (VK_FALSE == skipCall) { - my_data->device_dispatch_table->CmdDrawIndirect(cmdBuffer, buffer, offset, count, stride); + my_data->device_dispatch_table->CmdDrawIndirect(commandBuffer, buffer, offset, count, stride); } } VK_LAYER_EXPORT void VKAPI vkCmdDrawIndexedIndirect( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t count, uint32_t stride) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); VkDeviceMemory mem; loader_platform_thread_lock_mutex(&globalLock); - VkBool32 skipCall = get_mem_binding_from_object(my_data, cmdBuffer, (uint64_t)buffer, VK_OBJECT_TYPE_BUFFER, &mem); - skipCall |= update_cmd_buf_and_mem_references(my_data, cmdBuffer, mem, "vkCmdDrawIndexedIndirect"); + VkBool32 skipCall = get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)buffer, VK_OBJECT_TYPE_BUFFER, &mem); + skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdDrawIndexedIndirect"); loader_platform_thread_unlock_mutex(&globalLock); if (VK_FALSE == skipCall) { - my_data->device_dispatch_table->CmdDrawIndexedIndirect(cmdBuffer, buffer, offset, count, stride); + my_data->device_dispatch_table->CmdDrawIndexedIndirect(commandBuffer, buffer, offset, count, stride); } } VK_LAYER_EXPORT void VKAPI vkCmdDispatchIndirect( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); VkDeviceMemory mem; loader_platform_thread_lock_mutex(&globalLock); - VkBool32 skipCall = get_mem_binding_from_object(my_data, cmdBuffer, (uint64_t)buffer, VK_OBJECT_TYPE_BUFFER, &mem); - skipCall |= update_cmd_buf_and_mem_references(my_data, cmdBuffer, mem, "vkCmdDispatchIndirect"); + VkBool32 skipCall = get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)buffer, VK_OBJECT_TYPE_BUFFER, &mem); + skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdDispatchIndirect"); loader_platform_thread_unlock_mutex(&globalLock); if (VK_FALSE == skipCall) { - my_data->device_dispatch_table->CmdDispatchIndirect(cmdBuffer, buffer, offset); + my_data->device_dispatch_table->CmdDispatchIndirect(commandBuffer, buffer, offset); } } VK_LAYER_EXPORT void VKAPI vkCmdCopyBuffer( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkBuffer srcBuffer, - VkBuffer destBuffer, + VkBuffer dstBuffer, uint32_t regionCount, const VkBufferCopy *pRegions) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); VkDeviceMemory mem; VkBool32 skipCall = VK_FALSE; loader_platform_thread_lock_mutex(&globalLock); - skipCall = get_mem_binding_from_object(my_data, cmdBuffer, (uint64_t)srcBuffer, VK_OBJECT_TYPE_BUFFER, &mem); - skipCall |= update_cmd_buf_and_mem_references(my_data, cmdBuffer, mem, "vkCmdCopyBuffer"); - skipCall |= get_mem_binding_from_object(my_data, cmdBuffer, (uint64_t)destBuffer, VK_OBJECT_TYPE_BUFFER, &mem); - skipCall |= update_cmd_buf_and_mem_references(my_data, cmdBuffer, mem, "vkCmdCopyBuffer"); + skipCall = get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)srcBuffer, VK_OBJECT_TYPE_BUFFER, &mem); + skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdCopyBuffer"); + skipCall |= get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)dstBuffer, VK_OBJECT_TYPE_BUFFER, &mem); + skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdCopyBuffer"); // Validate that SRC & DST buffers have correct usage flags set - skipCall |= validate_buffer_usage_flags(my_data, cmdBuffer, srcBuffer, VK_BUFFER_USAGE_TRANSFER_SOURCE_BIT, true, "vkCmdCopyBuffer()", "VK_BUFFER_USAGE_TRANSFER_SOURCE_BIT"); - skipCall |= validate_buffer_usage_flags(my_data, cmdBuffer, destBuffer, VK_BUFFER_USAGE_TRANSFER_DESTINATION_BIT, true, "vkCmdCopyBuffer()", "VK_BUFFER_USAGE_TRANSFER_DESTINATION_BIT"); + skipCall |= validate_buffer_usage_flags(my_data, commandBuffer, srcBuffer, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, true, "vkCmdCopyBuffer()", "VK_BUFFER_USAGE_TRANSFER_SRC_BIT"); + skipCall |= validate_buffer_usage_flags(my_data, commandBuffer, dstBuffer, VK_BUFFER_USAGE_TRANSFER_DST_BIT, true, "vkCmdCopyBuffer()", "VK_BUFFER_USAGE_TRANSFER_DST_BIT"); loader_platform_thread_unlock_mutex(&globalLock); if (VK_FALSE == skipCall) { - my_data->device_dispatch_table->CmdCopyBuffer(cmdBuffer, srcBuffer, destBuffer, regionCount, pRegions); + my_data->device_dispatch_table->CmdCopyBuffer(commandBuffer, srcBuffer, dstBuffer, regionCount, pRegions); } } VK_LAYER_EXPORT void VKAPI vkCmdCopyQueryPoolResults( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount, - VkBuffer destBuffer, - VkDeviceSize destOffset, + VkBuffer dstBuffer, + VkDeviceSize dstOffset, VkDeviceSize destStride, VkQueryResultFlags flags) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); VkDeviceMemory mem; VkBool32 skipCall = VK_FALSE; loader_platform_thread_lock_mutex(&globalLock); - skipCall |= get_mem_binding_from_object(my_data, cmdBuffer, (uint64_t)destBuffer, VK_OBJECT_TYPE_BUFFER, &mem); - skipCall |= update_cmd_buf_and_mem_references(my_data, cmdBuffer, mem, "vkCmdCopyQueryPoolResults"); + skipCall |= get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)dstBuffer, VK_OBJECT_TYPE_BUFFER, &mem); + skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdCopyQueryPoolResults"); // Validate that DST buffer has correct usage flags set - skipCall |= validate_buffer_usage_flags(my_data, cmdBuffer, destBuffer, VK_BUFFER_USAGE_TRANSFER_DESTINATION_BIT, true, "vkCmdCopyQueryPoolResults()", "VK_BUFFER_USAGE_TRANSFER_DESTINATION_BIT"); + skipCall |= validate_buffer_usage_flags(my_data, commandBuffer, dstBuffer, VK_BUFFER_USAGE_TRANSFER_DST_BIT, true, "vkCmdCopyQueryPoolResults()", "VK_BUFFER_USAGE_TRANSFER_DST_BIT"); loader_platform_thread_unlock_mutex(&globalLock); if (VK_FALSE == skipCall) { - my_data->device_dispatch_table->CmdCopyQueryPoolResults(cmdBuffer, queryPool, startQuery, queryCount, destBuffer, destOffset, destStride, flags); + my_data->device_dispatch_table->CmdCopyQueryPoolResults(commandBuffer, queryPool, startQuery, queryCount, dstBuffer, dstOffset, destStride, flags); } } VK_LAYER_EXPORT void VKAPI vkCmdCopyImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, - VkImage destImage, - VkImageLayout destImageLayout, + VkImage dstImage, + VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageCopy *pRegions) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); VkDeviceMemory mem; VkBool32 skipCall = VK_FALSE; loader_platform_thread_lock_mutex(&globalLock); // Validate that src & dst images have correct usage flags set - skipCall = get_mem_binding_from_object(my_data, cmdBuffer, (uint64_t)srcImage, VK_OBJECT_TYPE_IMAGE, &mem); - skipCall |= update_cmd_buf_and_mem_references(my_data, cmdBuffer, mem, "vkCmdCopyImage"); - skipCall |= get_mem_binding_from_object(my_data, cmdBuffer, (uint64_t)destImage, VK_OBJECT_TYPE_IMAGE, &mem); - skipCall |= update_cmd_buf_and_mem_references(my_data, cmdBuffer, mem, "vkCmdCopyImage"); - skipCall |= validate_image_usage_flags(my_data, cmdBuffer, srcImage, VK_IMAGE_USAGE_TRANSFER_SOURCE_BIT, true, "vkCmdCopyImage()", "VK_IMAGE_USAGE_TRANSFER_SOURCE_BIT"); - skipCall |= validate_image_usage_flags(my_data, cmdBuffer, destImage, VK_IMAGE_USAGE_TRANSFER_DESTINATION_BIT, true, "vkCmdCopyImage()", "VK_IMAGE_USAGE_TRANSFER_DESTINATION_BIT"); + skipCall = get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)srcImage, VK_OBJECT_TYPE_IMAGE, &mem); + skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdCopyImage"); + skipCall |= get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)dstImage, VK_OBJECT_TYPE_IMAGE, &mem); + skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdCopyImage"); + skipCall |= validate_image_usage_flags(my_data, commandBuffer, srcImage, VK_IMAGE_USAGE_TRANSFER_SRC_BIT, true, "vkCmdCopyImage()", "VK_IMAGE_USAGE_TRANSFER_SRC_BIT"); + skipCall |= validate_image_usage_flags(my_data, commandBuffer, dstImage, VK_IMAGE_USAGE_TRANSFER_DST_BIT, true, "vkCmdCopyImage()", "VK_IMAGE_USAGE_TRANSFER_DST_BIT"); loader_platform_thread_unlock_mutex(&globalLock); if (VK_FALSE == skipCall) { my_data->device_dispatch_table->CmdCopyImage( - cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout, regionCount, pRegions); + commandBuffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions); } } VK_LAYER_EXPORT void VKAPI vkCmdBlitImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, - VkImage destImage, - VkImageLayout destImageLayout, + VkImage dstImage, + VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageBlit *pRegions, VkFilter filter) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); VkDeviceMemory mem; VkBool32 skipCall = VK_FALSE; loader_platform_thread_lock_mutex(&globalLock); // Validate that src & dst images have correct usage flags set - skipCall = get_mem_binding_from_object(my_data, cmdBuffer, (uint64_t)srcImage, VK_OBJECT_TYPE_IMAGE, &mem); - skipCall |= update_cmd_buf_and_mem_references(my_data, cmdBuffer, mem, "vkCmdBlitImage"); - skipCall |= get_mem_binding_from_object(my_data, cmdBuffer, (uint64_t)destImage, VK_OBJECT_TYPE_IMAGE, &mem); - skipCall |= update_cmd_buf_and_mem_references(my_data, cmdBuffer, mem, "vkCmdBlitImage"); - skipCall |= validate_image_usage_flags(my_data, cmdBuffer, srcImage, VK_IMAGE_USAGE_TRANSFER_SOURCE_BIT, true, "vkCmdBlitImage()", "VK_IMAGE_USAGE_TRANSFER_SOURCE_BIT"); - skipCall |= validate_image_usage_flags(my_data, cmdBuffer, destImage, VK_IMAGE_USAGE_TRANSFER_DESTINATION_BIT, true, "vkCmdBlitImage()", "VK_IMAGE_USAGE_TRANSFER_DESTINATION_BIT"); + skipCall = get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)srcImage, VK_OBJECT_TYPE_IMAGE, &mem); + skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdBlitImage"); + skipCall |= get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)dstImage, VK_OBJECT_TYPE_IMAGE, &mem); + skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdBlitImage"); + skipCall |= validate_image_usage_flags(my_data, commandBuffer, srcImage, VK_IMAGE_USAGE_TRANSFER_SRC_BIT, true, "vkCmdBlitImage()", "VK_IMAGE_USAGE_TRANSFER_SRC_BIT"); + skipCall |= validate_image_usage_flags(my_data, commandBuffer, dstImage, VK_IMAGE_USAGE_TRANSFER_DST_BIT, true, "vkCmdBlitImage()", "VK_IMAGE_USAGE_TRANSFER_DST_BIT"); loader_platform_thread_unlock_mutex(&globalLock); if (VK_FALSE == skipCall) { my_data->device_dispatch_table->CmdBlitImage( - cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout, regionCount, pRegions, filter); + commandBuffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions, filter); } } VK_LAYER_EXPORT void VKAPI vkCmdCopyBufferToImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkBuffer srcBuffer, - VkImage destImage, - VkImageLayout destImageLayout, + VkImage dstImage, + VkImageLayout dstImageLayout, uint32_t regionCount, const VkBufferImageCopy *pRegions) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); VkDeviceMemory mem; VkBool32 skipCall = VK_FALSE; loader_platform_thread_lock_mutex(&globalLock); - skipCall = get_mem_binding_from_object(my_data, cmdBuffer, (uint64_t)destImage, VK_OBJECT_TYPE_IMAGE, &mem); - skipCall |= update_cmd_buf_and_mem_references(my_data, cmdBuffer, mem, "vkCmdCopyBufferToImage"); - skipCall |= get_mem_binding_from_object(my_data, cmdBuffer, (uint64_t)srcBuffer, VK_OBJECT_TYPE_BUFFER, &mem); - skipCall |= update_cmd_buf_and_mem_references(my_data, cmdBuffer, mem, "vkCmdCopyBufferToImage"); + skipCall = get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)dstImage, VK_OBJECT_TYPE_IMAGE, &mem); + skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdCopyBufferToImage"); + skipCall |= get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)srcBuffer, VK_OBJECT_TYPE_BUFFER, &mem); + skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdCopyBufferToImage"); // Validate that src buff & dst image have correct usage flags set - skipCall |= validate_buffer_usage_flags(my_data, cmdBuffer, srcBuffer, VK_BUFFER_USAGE_TRANSFER_SOURCE_BIT, true, "vkCmdCopyBufferToImage()", "VK_BUFFER_USAGE_TRANSFER_SOURCE_BIT"); - skipCall |= validate_image_usage_flags(my_data, cmdBuffer, destImage, VK_IMAGE_USAGE_TRANSFER_DESTINATION_BIT, true, "vkCmdCopyBufferToImage()", "VK_IMAGE_USAGE_TRANSFER_DESTINATION_BIT"); + skipCall |= validate_buffer_usage_flags(my_data, commandBuffer, srcBuffer, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, true, "vkCmdCopyBufferToImage()", "VK_BUFFER_USAGE_TRANSFER_SRC_BIT"); + skipCall |= validate_image_usage_flags(my_data, commandBuffer, dstImage, VK_IMAGE_USAGE_TRANSFER_DST_BIT, true, "vkCmdCopyBufferToImage()", "VK_IMAGE_USAGE_TRANSFER_DST_BIT"); loader_platform_thread_unlock_mutex(&globalLock); if (VK_FALSE == skipCall) { my_data->device_dispatch_table->CmdCopyBufferToImage( - cmdBuffer, srcBuffer, destImage, destImageLayout, regionCount, pRegions); + commandBuffer, srcBuffer, dstImage, dstImageLayout, regionCount, pRegions); } } VK_LAYER_EXPORT void VKAPI vkCmdCopyImageToBuffer( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, - VkBuffer destBuffer, + VkBuffer dstBuffer, uint32_t regionCount, const VkBufferImageCopy *pRegions) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); VkDeviceMemory mem; VkBool32 skipCall = VK_FALSE; loader_platform_thread_lock_mutex(&globalLock); - skipCall = get_mem_binding_from_object(my_data, cmdBuffer, (uint64_t)srcImage, VK_OBJECT_TYPE_IMAGE, &mem); - skipCall |= update_cmd_buf_and_mem_references(my_data, cmdBuffer, mem, "vkCmdCopyImageToBuffer"); - skipCall |= get_mem_binding_from_object(my_data, cmdBuffer, (uint64_t)destBuffer, VK_OBJECT_TYPE_BUFFER, &mem); - skipCall |= update_cmd_buf_and_mem_references(my_data, cmdBuffer, mem, "vkCmdCopyImageToBuffer"); + skipCall = get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)srcImage, VK_OBJECT_TYPE_IMAGE, &mem); + skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdCopyImageToBuffer"); + skipCall |= get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)dstBuffer, VK_OBJECT_TYPE_BUFFER, &mem); + skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdCopyImageToBuffer"); // Validate that dst buff & src image have correct usage flags set - skipCall |= validate_image_usage_flags(my_data, cmdBuffer, srcImage, VK_IMAGE_USAGE_TRANSFER_SOURCE_BIT, true, "vkCmdCopyImageToBuffer()", "VK_IMAGE_USAGE_TRANSFER_SOURCE_BIT"); - skipCall |= validate_buffer_usage_flags(my_data, cmdBuffer, destBuffer, VK_BUFFER_USAGE_TRANSFER_DESTINATION_BIT, true, "vkCmdCopyImageToBuffer()", "VK_BUFFER_USAGE_TRANSFER_DESTINATION_BIT"); + skipCall |= validate_image_usage_flags(my_data, commandBuffer, srcImage, VK_IMAGE_USAGE_TRANSFER_SRC_BIT, true, "vkCmdCopyImageToBuffer()", "VK_IMAGE_USAGE_TRANSFER_SRC_BIT"); + skipCall |= validate_buffer_usage_flags(my_data, commandBuffer, dstBuffer, VK_BUFFER_USAGE_TRANSFER_DST_BIT, true, "vkCmdCopyImageToBuffer()", "VK_BUFFER_USAGE_TRANSFER_DST_BIT"); loader_platform_thread_unlock_mutex(&globalLock); if (VK_FALSE == skipCall) { my_data->device_dispatch_table->CmdCopyImageToBuffer( - cmdBuffer, srcImage, srcImageLayout, destBuffer, regionCount, pRegions); + commandBuffer, srcImage, srcImageLayout, dstBuffer, regionCount, pRegions); } } VK_LAYER_EXPORT void VKAPI vkCmdUpdateBuffer( - VkCmdBuffer cmdBuffer, - VkBuffer destBuffer, - VkDeviceSize destOffset, + VkCommandBuffer commandBuffer, + VkBuffer dstBuffer, + VkDeviceSize dstOffset, VkDeviceSize dataSize, const uint32_t *pData) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); VkDeviceMemory mem; VkBool32 skipCall = VK_FALSE; loader_platform_thread_lock_mutex(&globalLock); - skipCall = get_mem_binding_from_object(my_data, cmdBuffer, (uint64_t)destBuffer, VK_OBJECT_TYPE_BUFFER, &mem); - skipCall |= update_cmd_buf_and_mem_references(my_data, cmdBuffer, mem, "vkCmdUpdateBuffer"); + skipCall = get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)dstBuffer, VK_OBJECT_TYPE_BUFFER, &mem); + skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdUpdateBuffer"); // Validate that dst buff has correct usage flags set - skipCall |= validate_buffer_usage_flags(my_data, cmdBuffer, destBuffer, VK_BUFFER_USAGE_TRANSFER_DESTINATION_BIT, true, "vkCmdUpdateBuffer()", "VK_BUFFER_USAGE_TRANSFER_DESTINATION_BIT"); + skipCall |= validate_buffer_usage_flags(my_data, commandBuffer, dstBuffer, VK_BUFFER_USAGE_TRANSFER_DST_BIT, true, "vkCmdUpdateBuffer()", "VK_BUFFER_USAGE_TRANSFER_DST_BIT"); loader_platform_thread_unlock_mutex(&globalLock); if (VK_FALSE == skipCall) { - my_data->device_dispatch_table->CmdUpdateBuffer(cmdBuffer, destBuffer, destOffset, dataSize, pData); + my_data->device_dispatch_table->CmdUpdateBuffer(commandBuffer, dstBuffer, dstOffset, dataSize, pData); } } VK_LAYER_EXPORT void VKAPI vkCmdFillBuffer( - VkCmdBuffer cmdBuffer, - VkBuffer destBuffer, - VkDeviceSize destOffset, + VkCommandBuffer commandBuffer, + VkBuffer dstBuffer, + VkDeviceSize dstOffset, VkDeviceSize size, uint32_t data) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); VkDeviceMemory mem; VkBool32 skipCall = VK_FALSE; loader_platform_thread_lock_mutex(&globalLock); - skipCall = get_mem_binding_from_object(my_data, cmdBuffer, (uint64_t)destBuffer, VK_OBJECT_TYPE_BUFFER, &mem); - skipCall |= update_cmd_buf_and_mem_references(my_data, cmdBuffer, mem, "vkCmdFillBuffer"); + skipCall = get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)dstBuffer, VK_OBJECT_TYPE_BUFFER, &mem); + skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdFillBuffer"); // Validate that dst buff has correct usage flags set - skipCall |= validate_buffer_usage_flags(my_data, cmdBuffer, destBuffer, VK_BUFFER_USAGE_TRANSFER_DESTINATION_BIT, true, "vkCmdFillBuffer()", "VK_BUFFER_USAGE_TRANSFER_DESTINATION_BIT"); + skipCall |= validate_buffer_usage_flags(my_data, commandBuffer, dstBuffer, VK_BUFFER_USAGE_TRANSFER_DST_BIT, true, "vkCmdFillBuffer()", "VK_BUFFER_USAGE_TRANSFER_DST_BIT"); loader_platform_thread_unlock_mutex(&globalLock); if (VK_FALSE == skipCall) { - my_data->device_dispatch_table->CmdFillBuffer(cmdBuffer, destBuffer, destOffset, size, data); + my_data->device_dispatch_table->CmdFillBuffer(commandBuffer, dstBuffer, dstOffset, size, data); } } VK_LAYER_EXPORT void VKAPI vkCmdClearColorImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearColorValue *pColor, uint32_t rangeCount, const VkImageSubresourceRange *pRanges) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); // TODO : Verify memory is in VK_IMAGE_STATE_CLEAR state VkDeviceMemory mem; VkBool32 skipCall = VK_FALSE; loader_platform_thread_lock_mutex(&globalLock); - skipCall = get_mem_binding_from_object(my_data, cmdBuffer, (uint64_t)image, VK_OBJECT_TYPE_IMAGE, &mem); - skipCall |= update_cmd_buf_and_mem_references(my_data, cmdBuffer, mem, "vkCmdClearColorImage"); + skipCall = get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)image, VK_OBJECT_TYPE_IMAGE, &mem); + skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdClearColorImage"); loader_platform_thread_unlock_mutex(&globalLock); if (VK_FALSE == skipCall) { - my_data->device_dispatch_table->CmdClearColorImage(cmdBuffer, image, imageLayout, pColor, rangeCount, pRanges); + my_data->device_dispatch_table->CmdClearColorImage(commandBuffer, image, imageLayout, pColor, rangeCount, pRanges); } } VK_LAYER_EXPORT void VKAPI vkCmdClearDepthStencilImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearDepthStencilValue* pDepthStencil, uint32_t rangeCount, const VkImageSubresourceRange* pRanges) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); // TODO : Verify memory is in VK_IMAGE_STATE_CLEAR state VkDeviceMemory mem; VkBool32 skipCall = VK_FALSE; loader_platform_thread_lock_mutex(&globalLock); - skipCall = get_mem_binding_from_object(my_data, cmdBuffer, (uint64_t)image, VK_OBJECT_TYPE_IMAGE, &mem); - skipCall |= update_cmd_buf_and_mem_references(my_data, cmdBuffer, mem, "vkCmdClearDepthStencilImage"); + skipCall = get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)image, VK_OBJECT_TYPE_IMAGE, &mem); + skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdClearDepthStencilImage"); loader_platform_thread_unlock_mutex(&globalLock); if (VK_FALSE == skipCall) { my_data->device_dispatch_table->CmdClearDepthStencilImage( - cmdBuffer, image, imageLayout, pDepthStencil, rangeCount, pRanges); + commandBuffer, image, imageLayout, pDepthStencil, rangeCount, pRanges); } } VK_LAYER_EXPORT void VKAPI vkCmdResolveImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, - VkImage destImage, - VkImageLayout destImageLayout, + VkImage dstImage, + VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageResolve *pRegions) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); VkBool32 skipCall = VK_FALSE; loader_platform_thread_lock_mutex(&globalLock); VkDeviceMemory mem; - skipCall = get_mem_binding_from_object(my_data, cmdBuffer, (uint64_t)srcImage, VK_OBJECT_TYPE_IMAGE, &mem); - skipCall |= update_cmd_buf_and_mem_references(my_data, cmdBuffer, mem, "vkCmdResolveImage"); - skipCall |= get_mem_binding_from_object(my_data, cmdBuffer, (uint64_t)destImage, VK_OBJECT_TYPE_IMAGE, &mem); - skipCall |= update_cmd_buf_and_mem_references(my_data, cmdBuffer, mem, "vkCmdResolveImage"); + skipCall = get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)srcImage, VK_OBJECT_TYPE_IMAGE, &mem); + skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdResolveImage"); + skipCall |= get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)dstImage, VK_OBJECT_TYPE_IMAGE, &mem); + skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdResolveImage"); loader_platform_thread_unlock_mutex(&globalLock); if (VK_FALSE == skipCall) { my_data->device_dispatch_table->CmdResolveImage( - cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout, regionCount, pRegions); + commandBuffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions); } } VK_LAYER_EXPORT void VKAPI vkCmdBeginQuery( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t slot, VkFlags flags) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - my_data->device_dispatch_table->CmdBeginQuery(cmdBuffer, queryPool, slot, flags); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + my_data->device_dispatch_table->CmdBeginQuery(commandBuffer, queryPool, slot, flags); } VK_LAYER_EXPORT void VKAPI vkCmdEndQuery( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t slot) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - my_data->device_dispatch_table->CmdEndQuery(cmdBuffer, queryPool, slot); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + my_data->device_dispatch_table->CmdEndQuery(commandBuffer, queryPool, slot); } VK_LAYER_EXPORT void VKAPI vkCmdResetQueryPool( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount) { - layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); - my_data->device_dispatch_table->CmdResetQueryPool(cmdBuffer, queryPool, startQuery, queryCount); + layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); + my_data->device_dispatch_table->CmdResetQueryPool(commandBuffer, queryPool, startQuery, queryCount); } VK_LAYER_EXPORT VkResult VKAPI vkDbgCreateMsgCallback( @@ -2433,7 +2433,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkAcquireNextImageKHR( VK_LAYER_EXPORT VkResult VKAPI vkCreateSemaphore( VkDevice device, const VkSemaphoreCreateInfo *pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkSemaphore *pSemaphore) { layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); @@ -2449,7 +2449,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateSemaphore( VK_LAYER_EXPORT void VKAPI vkDestroySemaphore( VkDevice device, VkSemaphore semaphore, - const VkAllocCallbacks* pAllocator) + const VkAllocationCallbacks* pAllocator) { layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); loader_platform_thread_lock_mutex(&globalLock); @@ -2483,8 +2483,8 @@ VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI vkGetDeviceProcAddr( return (PFN_vkVoidFunction) vkDestroyDevice; if (!strcmp(funcName, "vkQueueSubmit")) return (PFN_vkVoidFunction) vkQueueSubmit; - if (!strcmp(funcName, "vkAllocMemory")) - return (PFN_vkVoidFunction) vkAllocMemory; + if (!strcmp(funcName, "vkAllocateMemory")) + return (PFN_vkVoidFunction) vkAllocateMemory; if (!strcmp(funcName, "vkFreeMemory")) return (PFN_vkVoidFunction) vkFreeMemory; if (!strcmp(funcName, "vkMapMemory")) @@ -2531,8 +2531,8 @@ VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI vkGetDeviceProcAddr( return (PFN_vkVoidFunction) vkCreateImageView; if (!strcmp(funcName, "vkCreateBufferView")) return (PFN_vkVoidFunction) vkCreateBufferView; - if (!strcmp(funcName, "vkAllocCommandBuffers")) - return (PFN_vkVoidFunction) vkAllocCommandBuffers; + if (!strcmp(funcName, "vkAllocateCommandBuffers")) + return (PFN_vkVoidFunction) vkAllocateCommandBuffers; if (!strcmp(funcName, "vkBeginCommandBuffer")) return (PFN_vkVoidFunction) vkBeginCommandBuffer; if (!strcmp(funcName, "vkEndCommandBuffer")) diff --git a/layers/mem_tracker.h b/layers/mem_tracker.h index b09c2474..b638ce4e 100644 --- a/layers/mem_tracker.h +++ b/layers/mem_tracker.h @@ -99,9 +99,9 @@ struct MT_MEM_OBJ_INFO { void* object; // Dispatchable object used to create this memory (device of swapchain) uint32_t refCount; // Count of references (obj bindings or CB use) VkDeviceMemory mem; - VkMemoryAllocInfo allocInfo; + VkMemoryAllocateInfo allocInfo; list<MT_OBJ_HANDLE_TYPE> pObjBindings; // list container of objects bound to this memory - list<VkCmdBuffer> pCmdBufferBindings; // list container of cmd buffers that reference this mem object + list<VkCommandBuffer> pCommandBufferBindings; // list container of cmd buffers that reference this mem object }; // This only applies to Buffers and Images, which can have memory bound to them @@ -115,10 +115,10 @@ struct MT_OBJ_BINDING_INFO { // Track all command buffers typedef struct _MT_CB_INFO { - VkCmdBufferAllocInfo createInfo; - VkPipeline pipelines[VK_PIPELINE_BIND_POINT_NUM]; + VkCommandBufferAllocateInfo createInfo; + VkPipeline pipelines[VK_PIPELINE_BIND_POINT_RANGE_SIZE]; uint32_t attachmentCount; - VkCmdBuffer cmdBuffer; + VkCommandBuffer commandBuffer; uint64_t fenceId; VkFence lastSubmittedFence; VkQueue lastSubmittedQueue; @@ -139,7 +139,7 @@ struct MT_FENCE_INFO { struct MT_QUEUE_INFO { uint64_t lastRetiredId; uint64_t lastSubmittedId; - list<VkCmdBuffer> pQueueCmdBuffers; + list<VkCommandBuffer> pQueueCommandBuffers; list<VkDeviceMemory> pMemRefList; }; diff --git a/layers/multi.cpp b/layers/multi.cpp index 52344625..14cb9545 100644 --- a/layers/multi.cpp +++ b/layers/multi.cpp @@ -40,7 +40,7 @@ static device_table_map multi1_device_table_map; /******************************** Layer multi1 functions **************************/ /* hook DestroyDevice to remove tableMap entry */ -VK_LAYER_EXPORT void VKAPI multi1DestroyDevice(VkDevice device, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI multi1DestroyDevice(VkDevice device, const VkAllocationCallbacks* pAllocator) { VkLayerDispatchTable *pDisp = get_dispatch_table(multi1_device_table_map, device); dispatch_key key = get_dispatch_key(device); @@ -51,7 +51,7 @@ VK_LAYER_EXPORT void VKAPI multi1DestroyDevice(VkDevice device, const VkAllocCal printf("Completed multi1 layer vkDestroyDevice()\n"); } -VK_LAYER_EXPORT VkResult VKAPI multi1CreateSampler(VkDevice device, const VkSamplerCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkSampler* pSampler) +VK_LAYER_EXPORT VkResult VKAPI multi1CreateSampler(VkDevice device, const VkSamplerCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSampler* pSampler) { VkLayerDispatchTable *pDisp = get_dispatch_table(multi1_device_table_map, device); @@ -66,7 +66,7 @@ VK_LAYER_EXPORT VkResult VKAPI multi1CreateGraphicsPipelines( VkPipelineCache pipelineCache, uint32_t count, const VkGraphicsPipelineCreateInfo* pCreateInfos, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines) { VkLayerDispatchTable *pDisp = get_dispatch_table(multi1_device_table_map, device); @@ -140,7 +140,7 @@ VK_LAYER_EXPORT void VKAPI multi2GetPhysicalDeviceFeatures( } /* hook DestroyInstance to remove tableInstanceMap entry */ -VK_LAYER_EXPORT void VKAPI multi2DestroyInstance(VkInstance instance, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI multi2DestroyInstance(VkInstance instance, const VkAllocationCallbacks* pAllocator) { VkLayerInstanceDispatchTable *pDisp = get_dispatch_table(multi2_instance_table_map, instance); dispatch_key key = get_dispatch_key(instance); diff --git a/layers/object_track.h b/layers/object_track.h index f3a1252e..4982b870 100644 --- a/layers/object_track.h +++ b/layers/object_track.h @@ -115,8 +115,8 @@ static inline const char* string_VkDbgObjectType(VkDbgObjectType input_value) { switch ((VkDbgObjectType)input_value) { - case VK_OBJECT_TYPE_CMD_POOL: - return "VK_OBJECT_TYPE_CMD_POOL"; + case VK_OBJECT_TYPE_COMMAND_POOL: + return "VK_OBJECT_TYPE_COMMAND_POOL"; case VK_OBJECT_TYPE_BUFFER: return "VK_OBJECT_TYPE_BUFFER"; case VK_OBJECT_TYPE_BUFFER_VIEW: @@ -422,9 +422,9 @@ static void create_obj(VkDevice dispatchable_object, VkDevice object, VkDbgObjec static void create_obj(VkDevice dispatchable_object, VkDescriptorSet object, VkDbgObjectType objType); static void create_obj(VkDevice dispatchable_object, VkQueue vkObj, VkDbgObjectType objType); static VkBool32 validate_object(VkQueue dispatchable_object, VkImage object); -static VkBool32 validate_object(VkCmdBuffer dispatchable_object, VkImage object); -static VkBool32 validate_object(VkQueue dispatchable_object, VkCmdBuffer object); -static VkBool32 validate_object(VkCmdBuffer dispatchable_object, VkDescriptorSet object); +static VkBool32 validate_object(VkCommandBuffer dispatchable_object, VkImage object); +static VkBool32 validate_object(VkQueue dispatchable_object, VkCommandBuffer object); +static VkBool32 validate_object(VkCommandBuffer dispatchable_object, VkDescriptorSet object); static VkBool32 validate_object(VkInstance dispatchable_object, VkInstance object); static VkBool32 validate_object(VkDevice dispatchable_object, VkDevice object); static VkBool32 validate_object(VkDevice dispatchable_object, VkDescriptorPool object); @@ -446,7 +446,7 @@ extern unordered_map<const void*, OBJTRACK_NODE*> VkDescriptorSetMap; extern unordered_map<const void*, OBJTRACK_NODE*> VkBufferMap; extern unordered_map<const void*, OBJTRACK_NODE*> VkFenceMap; extern unordered_map<const void*, OBJTRACK_NODE*> VkSemaphoreMap; -extern unordered_map<const void*, OBJTRACK_NODE*> VkCmdBufferMap; +extern unordered_map<const void*, OBJTRACK_NODE*> VkCommandBufferMap; extern unordered_map<const void*, OBJTRACK_NODE*> VkSwapchainKHRMap; static VkBool32 validate_object(VkQueue dispatchable_object, VkImage object) @@ -459,7 +459,7 @@ static VkBool32 validate_object(VkQueue dispatchable_object, VkImage object) return VK_FALSE; } -static VkBool32 validate_object(VkCmdBuffer dispatchable_object, VkImage object) +static VkBool32 validate_object(VkCommandBuffer dispatchable_object, VkImage object) { if ((VkImageMap.find((void*)object) == VkImageMap.end()) && (swapchainImageMap.find((void*)object) == swapchainImageMap.end())) { @@ -469,16 +469,16 @@ static VkBool32 validate_object(VkCmdBuffer dispatchable_object, VkImage object) return VK_FALSE; } -static VkBool32 validate_object(VkQueue dispatchable_object, VkCmdBuffer object) +static VkBool32 validate_object(VkQueue dispatchable_object, VkCommandBuffer object) { - if (VkCmdBufferMap.find(object) == VkCmdBufferMap.end()) { + if (VkCommandBufferMap.find(object) == VkCommandBufferMap.end()) { return log_msg(mdd(dispatchable_object), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, reinterpret_cast<uint64_t>(object), 0, OBJTRACK_INVALID_OBJECT, "OBJTRACK", - "Invalid VkCmdBuffer Object %p",reinterpret_cast<uint64_t>(object)); + "Invalid VkCommandBuffer Object %p",reinterpret_cast<uint64_t>(object)); } return VK_FALSE; } -static VkBool32 validate_object(VkCmdBuffer dispatchable_object, VkDescriptorSet object) +static VkBool32 validate_object(VkCommandBuffer dispatchable_object, VkDescriptorSet object) { if (VkDescriptorSetMap.find((void*)object) == VkDescriptorSetMap.end()) { return log_msg(mdd(dispatchable_object), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, (uint64_t) object, 0, OBJTRACK_INVALID_OBJECT, "OBJTRACK", @@ -523,11 +523,11 @@ static VkBool32 validate_object(VkQueue dispatchable_object, VkSemaphore object) return VK_FALSE; } -static VkBool32 validate_object(VkDevice dispatchable_object, VkCmdBuffer object) +static VkBool32 validate_object(VkDevice dispatchable_object, VkCommandBuffer object) { - if (VkCmdBufferMap.find(object) == VkCmdBufferMap.end()) { + if (VkCommandBufferMap.find(object) == VkCommandBufferMap.end()) { return log_msg(mdd(dispatchable_object), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, reinterpret_cast<uint64_t>(object), 0, OBJTRACK_INVALID_OBJECT, "OBJTRACK", - "Invalid VkCmdBuffer Object %p",reinterpret_cast<uint64_t>(object)); + "Invalid VkCommandBuffer Object %p",reinterpret_cast<uint64_t>(object)); } return VK_FALSE; } @@ -548,7 +548,7 @@ static void create_obj(VkInstance dispatchable_object, VkPhysicalDevice vkObj, V numTotalObjs++; } -static void create_obj(VkDevice dispatchable_object, VkCmdBuffer vkObj, VkDbgObjectType objType) +static void create_obj(VkDevice dispatchable_object, VkCommandBuffer vkObj, VkDbgObjectType objType) { log_msg(mdd(dispatchable_object), VK_DBG_REPORT_INFO_BIT, objType, reinterpret_cast<uint64_t>(vkObj), 0, OBJTRACK_NONE, "OBJTRACK", "OBJ[%llu] : CREATE %s object 0x%" PRIxLEAST64 , object_track_index++, string_VkDbgObjectType(objType), @@ -558,7 +558,7 @@ static void create_obj(VkDevice dispatchable_object, VkCmdBuffer vkObj, VkDbgObj pNewObjNode->objType = objType; pNewObjNode->status = OBJSTATUS_NONE; pNewObjNode->vkObj = reinterpret_cast<uint64_t>(vkObj); - VkCmdBufferMap[vkObj] = pNewObjNode; + VkCommandBufferMap[vkObj] = pNewObjNode; uint32_t objIndex = objTypeToIndex(objType); numObjs[objIndex]++; numTotalObjs++; @@ -634,7 +634,7 @@ static void destroy_obj(VkDevice dispatchable_object, VkSwapchainKHR object) VkResult explicit_CreateInstance( const VkInstanceCreateInfo *pCreateInfo, - const VkAllocCallbacks * pAllocator, + const VkAllocationCallbacks * pAllocator, VkInstance * pInstance) { @@ -674,7 +674,7 @@ VkResult explicit_CreateDevice( VkPhysicalDevice gpu, const VkDeviceCreateInfo *pCreateInfo, - const VkAllocCallbacks *pAllocator, + const VkAllocationCallbacks *pAllocator, VkDevice *pDevice) { loader_platform_thread_lock_mutex(&objLock); @@ -798,27 +798,27 @@ explicit_QueueBindSparse( } VkResult -explicit_AllocDescriptorSets( +explicit_AllocateDescriptorSets( VkDevice device, - const VkDescriptorSetAllocInfo *pAllocInfo, + const VkDescriptorSetAllocateInfo *pAllocateInfo, VkDescriptorSet *pDescriptorSets) { VkBool32 skipCall = VK_FALSE; loader_platform_thread_lock_mutex(&objLock); skipCall |= validate_object(device, device); - skipCall |= validate_object(device, pAllocInfo->descriptorPool); - for (uint32_t i = 0; i < pAllocInfo->setLayoutCount; i++) { - skipCall |= validate_object(device, pAllocInfo->pSetLayouts[i]); + skipCall |= validate_object(device, pAllocateInfo->descriptorPool); + for (uint32_t i = 0; i < pAllocateInfo->setLayoutCount; i++) { + skipCall |= validate_object(device, pAllocateInfo->pSetLayouts[i]); } loader_platform_thread_unlock_mutex(&objLock); if (skipCall) return VK_ERROR_VALIDATION_FAILED; - VkResult result = get_dispatch_table(ObjectTracker_device_table_map, device)->AllocDescriptorSets( - device, pAllocInfo, pDescriptorSets); + VkResult result = get_dispatch_table(ObjectTracker_device_table_map, device)->AllocateDescriptorSets( + device, pAllocateInfo, pDescriptorSets); loader_platform_thread_lock_mutex(&objLock); - for (uint32_t i = 0; i < pAllocInfo->setLayoutCount; i++) { + for (uint32_t i = 0; i < pAllocateInfo->setLayoutCount; i++) { create_obj(device, pDescriptorSets[i], VK_OBJECT_TYPE_DESCRIPTOR_SET); } loader_platform_thread_unlock_mutex(&objLock); @@ -854,7 +854,7 @@ void explicit_FreeMemory( VkDevice device, VkDeviceMemory mem, - const VkAllocCallbacks* pAllocator) + const VkAllocationCallbacks* pAllocator) { loader_platform_thread_lock_mutex(&objLock); validate_object(device, device); diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp index 2181e44f..ce64cf4c 100644 --- a/layers/param_checker.cpp +++ b/layers/param_checker.cpp @@ -287,8 +287,8 @@ bool ValidateEnumerator(VkFormatFeatureFlagBits const& enumerator) VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT | VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT | - VK_FORMAT_FEATURE_BLIT_SOURCE_BIT | - VK_FORMAT_FEATURE_BLIT_DESTINATION_BIT); + VK_FORMAT_FEATURE_BLIT_SRC_BIT | + VK_FORMAT_FEATURE_BLIT_DST_BIT); if(enumerator & (~allFlags)) { return false; @@ -346,13 +346,13 @@ std::string EnumeratorString(VkFormatFeatureFlagBits const& enumerator) { strings.push_back("VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT"); } - if(enumerator & VK_FORMAT_FEATURE_BLIT_SOURCE_BIT) + if(enumerator & VK_FORMAT_FEATURE_BLIT_SRC_BIT) { - strings.push_back("VK_FORMAT_FEATURE_BLIT_SOURCE_BIT"); + strings.push_back("VK_FORMAT_FEATURE_BLIT_SRC_BIT"); } - if(enumerator & VK_FORMAT_FEATURE_BLIT_DESTINATION_BIT) + if(enumerator & VK_FORMAT_FEATURE_BLIT_DST_BIT) { - strings.push_back("VK_FORMAT_FEATURE_BLIT_DESTINATION_BIT"); + strings.push_back("VK_FORMAT_FEATURE_BLIT_DST_BIT"); } std::string enumeratorString; @@ -377,9 +377,9 @@ bool ValidateEnumerator(VkImageUsageFlagBits const& enumerator) VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_STORAGE_BIT | VK_IMAGE_USAGE_SAMPLED_BIT | - VK_IMAGE_USAGE_TRANSFER_DESTINATION_BIT | + VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT | - VK_IMAGE_USAGE_TRANSFER_SOURCE_BIT); + VK_IMAGE_USAGE_TRANSFER_SRC_BIT); if(enumerator & (~allFlags)) { return false; @@ -417,17 +417,17 @@ std::string EnumeratorString(VkImageUsageFlagBits const& enumerator) { strings.push_back("VK_IMAGE_USAGE_SAMPLED_BIT"); } - if(enumerator & VK_IMAGE_USAGE_TRANSFER_DESTINATION_BIT) + if(enumerator & VK_IMAGE_USAGE_TRANSFER_DST_BIT) { - strings.push_back("VK_IMAGE_USAGE_TRANSFER_DESTINATION_BIT"); + strings.push_back("VK_IMAGE_USAGE_TRANSFER_DST_BIT"); } if(enumerator & VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT) { strings.push_back("VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT"); } - if(enumerator & VK_IMAGE_USAGE_TRANSFER_SOURCE_BIT) + if(enumerator & VK_IMAGE_USAGE_TRANSFER_SRC_BIT) { - strings.push_back("VK_IMAGE_USAGE_TRANSFER_SOURCE_BIT"); + strings.push_back("VK_IMAGE_USAGE_TRANSFER_SRC_BIT"); } std::string enumeratorString; @@ -888,9 +888,9 @@ bool ValidateEnumerator(VkBufferUsageFlagBits const& enumerator) VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT | VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT | - VK_BUFFER_USAGE_TRANSFER_DESTINATION_BIT | + VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT | - VK_BUFFER_USAGE_TRANSFER_SOURCE_BIT | + VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT); if(enumerator & (~allFlags)) { @@ -929,17 +929,17 @@ std::string EnumeratorString(VkBufferUsageFlagBits const& enumerator) { strings.push_back("VK_BUFFER_USAGE_STORAGE_BUFFER_BIT"); } - if(enumerator & VK_BUFFER_USAGE_TRANSFER_DESTINATION_BIT) + if(enumerator & VK_BUFFER_USAGE_TRANSFER_DST_BIT) { - strings.push_back("VK_BUFFER_USAGE_TRANSFER_DESTINATION_BIT"); + strings.push_back("VK_BUFFER_USAGE_TRANSFER_DST_BIT"); } if(enumerator & VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT) { strings.push_back("VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT"); } - if(enumerator & VK_BUFFER_USAGE_TRANSFER_SOURCE_BIT) + if(enumerator & VK_BUFFER_USAGE_TRANSFER_SRC_BIT) { - strings.push_back("VK_BUFFER_USAGE_TRANSFER_SOURCE_BIT"); + strings.push_back("VK_BUFFER_USAGE_TRANSFER_SRC_BIT"); } if(enumerator & VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT) { @@ -1506,10 +1506,10 @@ std::string EnumeratorString(VkMemoryInputFlagBits const& enumerator) } static -bool ValidateEnumerator(VkCmdPoolCreateFlagBits const& enumerator) +bool ValidateEnumerator(VkCommandPoolCreateFlagBits const& enumerator) { - VkCmdPoolCreateFlagBits allFlags = (VkCmdPoolCreateFlagBits)(VK_CMD_POOL_CREATE_RESET_COMMAND_BUFFER_BIT | - VK_CMD_POOL_CREATE_TRANSIENT_BIT); + VkCommandPoolCreateFlagBits allFlags = (VkCommandPoolCreateFlagBits)(VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT | + VK_COMMAND_POOL_CREATE_TRANSIENT_BIT); if(enumerator & (~allFlags)) { return false; @@ -1519,7 +1519,7 @@ bool ValidateEnumerator(VkCmdPoolCreateFlagBits const& enumerator) } static -std::string EnumeratorString(VkCmdPoolCreateFlagBits const& enumerator) +std::string EnumeratorString(VkCommandPoolCreateFlagBits const& enumerator) { if(!ValidateEnumerator(enumerator)) { @@ -1527,13 +1527,13 @@ std::string EnumeratorString(VkCmdPoolCreateFlagBits const& enumerator) } std::vector<std::string> strings; - if(enumerator & VK_CMD_POOL_CREATE_RESET_COMMAND_BUFFER_BIT) + if(enumerator & VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT) { - strings.push_back("VK_CMD_POOL_CREATE_RESET_COMMAND_BUFFER_BIT"); + strings.push_back("VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT"); } - if(enumerator & VK_CMD_POOL_CREATE_TRANSIENT_BIT) + if(enumerator & VK_COMMAND_POOL_CREATE_TRANSIENT_BIT) { - strings.push_back("VK_CMD_POOL_CREATE_TRANSIENT_BIT"); + strings.push_back("VK_COMMAND_POOL_CREATE_TRANSIENT_BIT"); } std::string enumeratorString; @@ -1551,9 +1551,9 @@ std::string EnumeratorString(VkCmdPoolCreateFlagBits const& enumerator) } static -bool ValidateEnumerator(VkCmdPoolResetFlagBits const& enumerator) +bool ValidateEnumerator(VkCommandPoolResetFlagBits const& enumerator) { - VkCmdPoolResetFlagBits allFlags = (VkCmdPoolResetFlagBits)(VK_CMD_POOL_RESET_RELEASE_RESOURCES_BIT); + VkCommandPoolResetFlagBits allFlags = (VkCommandPoolResetFlagBits)(VK_COMMAND_POOL_RESET_RELEASE_RESOURCES_BIT); if(enumerator & (~allFlags)) { return false; @@ -1563,7 +1563,7 @@ bool ValidateEnumerator(VkCmdPoolResetFlagBits const& enumerator) } static -std::string EnumeratorString(VkCmdPoolResetFlagBits const& enumerator) +std::string EnumeratorString(VkCommandPoolResetFlagBits const& enumerator) { if(!ValidateEnumerator(enumerator)) { @@ -1571,9 +1571,9 @@ std::string EnumeratorString(VkCmdPoolResetFlagBits const& enumerator) } std::vector<std::string> strings; - if(enumerator & VK_CMD_POOL_RESET_RELEASE_RESOURCES_BIT) + if(enumerator & VK_COMMAND_POOL_RESET_RELEASE_RESOURCES_BIT) { - strings.push_back("VK_CMD_POOL_RESET_RELEASE_RESOURCES_BIT"); + strings.push_back("VK_COMMAND_POOL_RESET_RELEASE_RESOURCES_BIT"); } std::string enumeratorString; @@ -1591,11 +1591,11 @@ std::string EnumeratorString(VkCmdPoolResetFlagBits const& enumerator) } static -bool ValidateEnumerator(VkCmdBufferUsageFlags const& enumerator) +bool ValidateEnumerator(VkCommandBufferUsageFlags const& enumerator) { - VkCmdBufferUsageFlags allFlags = (VkCmdBufferUsageFlags)(VK_CMD_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT | - VK_CMD_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT | - VK_CMD_BUFFER_USAGE_SIMULTANEOUS_USE_BIT); + VkCommandBufferUsageFlags allFlags = (VkCommandBufferUsageFlags)(VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT | + VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT | + VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT); if(enumerator & (~allFlags)) { return false; @@ -1605,7 +1605,7 @@ bool ValidateEnumerator(VkCmdBufferUsageFlags const& enumerator) } static -std::string EnumeratorString(VkCmdBufferUsageFlags const& enumerator) +std::string EnumeratorString(VkCommandBufferUsageFlags const& enumerator) { if(!ValidateEnumerator(enumerator)) { @@ -1613,17 +1613,17 @@ std::string EnumeratorString(VkCmdBufferUsageFlags const& enumerator) } std::vector<std::string> strings; - if(enumerator & VK_CMD_BUFFER_USAGE_SIMULTANEOUS_USE_BIT) + if(enumerator & VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT) { - strings.push_back("VK_CMD_BUFFER_USAGE_SIMULTANEOUS_USE_BIT"); + strings.push_back("VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT"); } - if(enumerator & VK_CMD_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT) + if(enumerator & VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT) { - strings.push_back("VK_CMD_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT"); + strings.push_back("VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT"); } - if(enumerator & VK_CMD_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT) + if(enumerator & VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT) { - strings.push_back("VK_CMD_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT"); + strings.push_back("VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT"); } std::string enumeratorString; @@ -1641,9 +1641,9 @@ std::string EnumeratorString(VkCmdBufferUsageFlags const& enumerator) } static -bool ValidateEnumerator(VkCmdBufferResetFlagBits const& enumerator) +bool ValidateEnumerator(VkCommandBufferResetFlagBits const& enumerator) { - VkCmdBufferResetFlagBits allFlags = (VkCmdBufferResetFlagBits)(VK_CMD_BUFFER_RESET_RELEASE_RESOURCES_BIT); + VkCommandBufferResetFlagBits allFlags = (VkCommandBufferResetFlagBits)(VK_COMMAND_BUFFER_RESET_RELEASE_RESOURCES_BIT); if(enumerator & (~allFlags)) { return false; @@ -1653,7 +1653,7 @@ bool ValidateEnumerator(VkCmdBufferResetFlagBits const& enumerator) } static -std::string EnumeratorString(VkCmdBufferResetFlagBits const& enumerator) +std::string EnumeratorString(VkCommandBufferResetFlagBits const& enumerator) { if(!ValidateEnumerator(enumerator)) { @@ -1661,9 +1661,9 @@ std::string EnumeratorString(VkCmdBufferResetFlagBits const& enumerator) } std::vector<std::string> strings; - if(enumerator & VK_CMD_BUFFER_RESET_RELEASE_RESOURCES_BIT) + if(enumerator & VK_COMMAND_BUFFER_RESET_RELEASE_RESOURCES_BIT) { - strings.push_back("VK_CMD_BUFFER_RESET_RELEASE_RESOURCES_BIT"); + strings.push_back("VK_COMMAND_BUFFER_RESET_RELEASE_RESOURCES_BIT"); } std::string enumeratorString; @@ -1777,7 +1777,7 @@ std::string EnumeratorString(VkQueryControlFlagBits const& enumerator) VK_LAYER_EXPORT VkResult VKAPI vkCreateInstance( const VkInstanceCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkInstance* pInstance) { VkLayerInstanceDispatchTable *pTable = get_dispatch_table(pc_instance_table_map, *pInstance); @@ -1796,7 +1796,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateInstance( VK_LAYER_EXPORT void VKAPI vkDestroyInstance( VkInstance instance, - const VkAllocCallbacks* pAllocator) + const VkAllocationCallbacks* pAllocator) { // Grab the key before the instance is destroyed. dispatch_key key = get_dispatch_key(instance); @@ -2042,7 +2042,7 @@ VK_LAYER_EXPORT void VKAPI vkGetPhysicalDeviceMemoryProperties( VK_LAYER_EXPORT VkResult VKAPI vkCreateDevice( VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkDevice* pDevice) { /* @@ -2066,7 +2066,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateDevice( VK_LAYER_EXPORT void VKAPI vkDestroyDevice( VkDevice device, - const VkAllocCallbacks* pAllocator) + const VkAllocationCallbacks* pAllocator) { layer_debug_report_destroy_device(device); @@ -2210,16 +2210,16 @@ VK_LAYER_EXPORT VkResult VKAPI vkDeviceWaitIdle( return result; } -bool PreAllocMemory( +bool PreAllocateMemory( VkDevice device, - const VkMemoryAllocInfo* pAllocInfo) + const VkMemoryAllocateInfo* pAllocateInfo) { - if(pAllocInfo != nullptr) + if(pAllocateInfo != nullptr) { - if(pAllocInfo->sType != VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO) + if(pAllocateInfo->sType != VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO) { log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", - "vkAllocMemory parameter, VkStructureType pAllocInfo->sType, is an invalid enumerator"); + "vkAllocateMemory parameter, VkStructureType pAllocateInfo->sType, is an invalid enumerator"); return false; } } @@ -2227,19 +2227,19 @@ bool PreAllocMemory( return true; } -bool PostAllocMemory( +bool PostAllocateMemory( VkDevice device, - VkDeviceMemory* pMem, + VkDeviceMemory* pMemory, VkResult result) { - if(pMem != nullptr) + if(pMemory != nullptr) { } if(result < VK_SUCCESS) { - std::string reason = "vkAllocMemory parameter, VkResult result, is " + EnumeratorString(result); + std::string reason = "vkAllocateMemory parameter, VkResult result, is " + EnumeratorString(result); log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str()); return false; } @@ -2247,17 +2247,17 @@ bool PostAllocMemory( return true; } -VK_LAYER_EXPORT VkResult VKAPI vkAllocMemory( +VK_LAYER_EXPORT VkResult VKAPI vkAllocateMemory( VkDevice device, - const VkMemoryAllocInfo* pAllocInfo, - const VkAllocCallbacks* pAllocator, - VkDeviceMemory* pMem) + const VkMemoryAllocateInfo* pAllocateInfo, + const VkAllocationCallbacks* pAllocator, + VkDeviceMemory* pMemory) { - PreAllocMemory(device, pAllocInfo); + PreAllocateMemory(device, pAllocateInfo); - VkResult result = get_dispatch_table(pc_device_table_map, device)->AllocMemory(device, pAllocInfo, pAllocator, pMem); + VkResult result = get_dispatch_table(pc_device_table_map, device)->AllocateMemory(device, pAllocateInfo, pAllocator, pMemory); - PostAllocMemory(device, pMem, result); + PostAllocateMemory(device, pMemory, result); return result; } @@ -2307,14 +2307,14 @@ VK_LAYER_EXPORT VkResult VKAPI vkMapMemory( bool PreFlushMappedMemoryRanges( VkDevice device, - const VkMappedMemoryRange* pMemRanges) + const VkMappedMemoryRange* pMemoryRanges) { - if(pMemRanges != nullptr) + if(pMemoryRanges != nullptr) { - if(pMemRanges->sType != VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE) + if(pMemoryRanges->sType != VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE) { log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", - "vkFlushMappedMemoryRanges parameter, VkStructureType pMemRanges->sType, is an invalid enumerator"); + "vkFlushMappedMemoryRanges parameter, VkStructureType pMemoryRanges->sType, is an invalid enumerator"); return false; } } @@ -2324,7 +2324,7 @@ bool PreFlushMappedMemoryRanges( bool PostFlushMappedMemoryRanges( VkDevice device, - uint32_t memRangeCount, + uint32_t memoryRangeCount, VkResult result) { @@ -2341,28 +2341,28 @@ bool PostFlushMappedMemoryRanges( VK_LAYER_EXPORT VkResult VKAPI vkFlushMappedMemoryRanges( VkDevice device, - uint32_t memRangeCount, - const VkMappedMemoryRange* pMemRanges) + uint32_t memoryRangeCount, + const VkMappedMemoryRange* pMemoryRanges) { - PreFlushMappedMemoryRanges(device, pMemRanges); + PreFlushMappedMemoryRanges(device, pMemoryRanges); - VkResult result = get_dispatch_table(pc_device_table_map, device)->FlushMappedMemoryRanges(device, memRangeCount, pMemRanges); + VkResult result = get_dispatch_table(pc_device_table_map, device)->FlushMappedMemoryRanges(device, memoryRangeCount, pMemoryRanges); - PostFlushMappedMemoryRanges(device, memRangeCount, result); + PostFlushMappedMemoryRanges(device, memoryRangeCount, result); return result; } bool PreInvalidateMappedMemoryRanges( VkDevice device, - const VkMappedMemoryRange* pMemRanges) + const VkMappedMemoryRange* pMemoryRanges) { - if(pMemRanges != nullptr) + if(pMemoryRanges != nullptr) { - if(pMemRanges->sType != VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE) + if(pMemoryRanges->sType != VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE) { log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", - "vkInvalidateMappedMemoryRanges parameter, VkStructureType pMemRanges->sType, is an invalid enumerator"); + "vkInvalidateMappedMemoryRanges parameter, VkStructureType pMemoryRanges->sType, is an invalid enumerator"); return false; } } @@ -2372,7 +2372,7 @@ bool PreInvalidateMappedMemoryRanges( bool PostInvalidateMappedMemoryRanges( VkDevice device, - uint32_t memRangeCount, + uint32_t memoryRangeCount, VkResult result) { @@ -2389,14 +2389,14 @@ bool PostInvalidateMappedMemoryRanges( VK_LAYER_EXPORT VkResult VKAPI vkInvalidateMappedMemoryRanges( VkDevice device, - uint32_t memRangeCount, - const VkMappedMemoryRange* pMemRanges) + uint32_t memoryRangeCount, + const VkMappedMemoryRange* pMemoryRanges) { - PreInvalidateMappedMemoryRanges(device, pMemRanges); + PreInvalidateMappedMemoryRanges(device, pMemoryRanges); - VkResult result = get_dispatch_table(pc_device_table_map, device)->InvalidateMappedMemoryRanges(device, memRangeCount, pMemRanges); + VkResult result = get_dispatch_table(pc_device_table_map, device)->InvalidateMappedMemoryRanges(device, memoryRangeCount, pMemoryRanges); - PostInvalidateMappedMemoryRanges(device, memRangeCount, result); + PostInvalidateMappedMemoryRanges(device, memoryRangeCount, result); return result; } @@ -2429,7 +2429,7 @@ bool PostBindBufferMemory( VkDevice device, VkBuffer buffer, VkDeviceMemory mem, - VkDeviceSize memOffset, + VkDeviceSize memoryOffset, VkResult result) { @@ -2450,11 +2450,11 @@ VK_LAYER_EXPORT VkResult VKAPI vkBindBufferMemory( VkDevice device, VkBuffer buffer, VkDeviceMemory mem, - VkDeviceSize memOffset) + VkDeviceSize memoryOffset) { - VkResult result = get_dispatch_table(pc_device_table_map, device)->BindBufferMemory(device, buffer, mem, memOffset); + VkResult result = get_dispatch_table(pc_device_table_map, device)->BindBufferMemory(device, buffer, mem, memoryOffset); - PostBindBufferMemory(device, buffer, mem, memOffset, result); + PostBindBufferMemory(device, buffer, mem, memoryOffset, result); return result; } @@ -2463,7 +2463,7 @@ bool PostBindImageMemory( VkDevice device, VkImage image, VkDeviceMemory mem, - VkDeviceSize memOffset, + VkDeviceSize memoryOffset, VkResult result) { @@ -2484,11 +2484,11 @@ VK_LAYER_EXPORT VkResult VKAPI vkBindImageMemory( VkDevice device, VkImage image, VkDeviceMemory mem, - VkDeviceSize memOffset) + VkDeviceSize memoryOffset) { - VkResult result = get_dispatch_table(pc_device_table_map, device)->BindImageMemory(device, image, mem, memOffset); + VkResult result = get_dispatch_table(pc_device_table_map, device)->BindImageMemory(device, image, mem, memoryOffset); - PostBindImageMemory(device, image, mem, memOffset, result); + PostBindImageMemory(device, image, mem, memoryOffset, result); return result; } @@ -2735,7 +2735,7 @@ bool PostCreateFence( VK_LAYER_EXPORT VkResult VKAPI vkCreateFence( VkDevice device, const VkFenceCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkFence* pFence) { PreCreateFence(device, pCreateInfo); @@ -2905,7 +2905,7 @@ bool PostCreateSemaphore( VK_LAYER_EXPORT VkResult VKAPI vkCreateSemaphore( VkDevice device, const VkSemaphoreCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkSemaphore* pSemaphore) { PreCreateSemaphore(device, pCreateInfo); @@ -2957,7 +2957,7 @@ bool PostCreateEvent( VK_LAYER_EXPORT VkResult VKAPI vkCreateEvent( VkDevice device, const VkEventCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkEvent* pEvent) { PreCreateEvent(device, pCreateInfo); @@ -3100,7 +3100,7 @@ bool PostCreateQueryPool( VK_LAYER_EXPORT VkResult VKAPI vkCreateQueryPool( VkDevice device, const VkQueryPoolCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkQueryPool* pQueryPool) { PreCreateQueryPool(device, pCreateInfo); @@ -3209,7 +3209,7 @@ bool PostCreateBuffer( VK_LAYER_EXPORT VkResult VKAPI vkCreateBuffer( VkDevice device, const VkBufferCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkBuffer* pBuffer) { PreCreateBuffer(device, pCreateInfo); @@ -3268,7 +3268,7 @@ bool PostCreateBufferView( VK_LAYER_EXPORT VkResult VKAPI vkCreateBufferView( VkDevice device, const VkBufferViewCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkBufferView* pView) { PreCreateBufferView(device, pCreateInfo); @@ -3351,7 +3351,7 @@ bool PostCreateImage( VK_LAYER_EXPORT VkResult VKAPI vkCreateImage( VkDevice device, const VkImageCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkImage* pImage) { PreCreateImage(device, pCreateInfo); @@ -3490,7 +3490,7 @@ bool PostCreateImageView( VK_LAYER_EXPORT VkResult VKAPI vkCreateImageView( VkDevice device, const VkImageViewCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkImageView* pView) { PreCreateImageView(device, pCreateInfo); @@ -3543,7 +3543,7 @@ bool PostCreateShaderModule( VK_LAYER_EXPORT VkResult VKAPI vkCreateShaderModule( VkDevice device, const VkShaderModuleCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkShaderModule* pShaderModule) { PreCreateShaderModule(device, pCreateInfo); @@ -3595,7 +3595,7 @@ bool PostCreateShader( VK_LAYER_EXPORT VkResult VKAPI vkCreateShader( VkDevice device, const VkShaderCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkShader* pShader) { PreCreateShader(device, pCreateInfo); @@ -3650,7 +3650,7 @@ bool PostCreatePipelineCache( VK_LAYER_EXPORT VkResult VKAPI vkCreatePipelineCache( VkDevice device, const VkPipelineCacheCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkPipelineCache* pPipelineCache) { PreCreatePipelineCache(device, pCreateInfo); @@ -3715,7 +3715,7 @@ bool PreMergePipelineCaches( bool PostMergePipelineCaches( VkDevice device, - VkPipelineCache destCache, + VkPipelineCache dstCache, uint32_t srcCacheCount, VkResult result) { @@ -3734,15 +3734,15 @@ bool PostMergePipelineCaches( VK_LAYER_EXPORT VkResult VKAPI vkMergePipelineCaches( VkDevice device, - VkPipelineCache destCache, + VkPipelineCache dstCache, uint32_t srcCacheCount, const VkPipelineCache* pSrcCaches) { PreMergePipelineCaches(device, pSrcCaches); - VkResult result = get_dispatch_table(pc_device_table_map, device)->MergePipelineCaches(device, destCache, srcCacheCount, pSrcCaches); + VkResult result = get_dispatch_table(pc_device_table_map, device)->MergePipelineCaches(device, dstCache, srcCacheCount, pSrcCaches); - PostMergePipelineCaches(device, destCache, srcCacheCount, result); + PostMergePipelineCaches(device, dstCache, srcCacheCount, result); return result; } @@ -3840,32 +3840,32 @@ bool PreCreateGraphicsPipelines( return false; } } - if(pCreateInfos->pRasterState != nullptr) + if(pCreateInfos->pRasterizationState != nullptr) { - if(pCreateInfos->pRasterState->sType != VK_STRUCTURE_TYPE_PIPELINE_RASTER_STATE_CREATE_INFO) + if(pCreateInfos->pRasterizationState->sType != VK_STRUCTURE_TYPE_PIPELINE_RASTER_STATE_CREATE_INFO) { log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", - "vkCreateGraphicsPipelines parameter, VkStructureType pCreateInfos->pRasterState->sType, is an invalid enumerator"); + "vkCreateGraphicsPipelines parameter, VkStructureType pCreateInfos->pRasterizationState->sType, is an invalid enumerator"); return false; } - if(pCreateInfos->pRasterState->fillMode < VK_FILL_MODE_BEGIN_RANGE || - pCreateInfos->pRasterState->fillMode > VK_FILL_MODE_END_RANGE) + if(pCreateInfos->pRasterizationState->fillMode < VK_FILL_MODE_BEGIN_RANGE || + pCreateInfos->pRasterizationState->fillMode > VK_FILL_MODE_END_RANGE) { log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", - "vkCreateGraphicsPipelines parameter, VkFillMode pCreateInfos->pRasterState->fillMode, is an unrecognized enumerator"); + "vkCreateGraphicsPipelines parameter, VkFillMode pCreateInfos->pRasterizationState->fillMode, is an unrecognized enumerator"); return false; } - if(pCreateInfos->pRasterState->cullMode & ~VK_CULL_MODE_FRONT_AND_BACK) + if(pCreateInfos->pRasterizationState->cullMode & ~VK_CULL_MODE_FRONT_AND_BACK) { log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", - "vkCreateGraphicsPipelines parameter, VkCullMode pCreateInfos->pRasterState->cullMode, is an unrecognized enumerator"); + "vkCreateGraphicsPipelines parameter, VkCullMode pCreateInfos->pRasterizationState->cullMode, is an unrecognized enumerator"); return false; } - if(pCreateInfos->pRasterState->frontFace < VK_FRONT_FACE_BEGIN_RANGE || - pCreateInfos->pRasterState->frontFace > VK_FRONT_FACE_END_RANGE) + if(pCreateInfos->pRasterizationState->frontFace < VK_FRONT_FACE_BEGIN_RANGE || + pCreateInfos->pRasterizationState->frontFace > VK_FRONT_FACE_END_RANGE) { log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", - "vkCreateGraphicsPipelines parameter, VkFrontFace pCreateInfos->pRasterState->frontFace, is an unrecognized enumerator"); + "vkCreateGraphicsPipelines parameter, VkFrontFace pCreateInfos->pRasterizationState->frontFace, is an unrecognized enumerator"); return false; } } @@ -3975,11 +3975,11 @@ bool PreCreateGraphicsPipelines( "vkCreateGraphicsPipelines parameter, VkBlend pCreateInfos->pColorBlendState->pAttachments->srcBlendColor, is an unrecognized enumerator"); return false; } - if(pCreateInfos->pColorBlendState->pAttachments->destBlendColor < VK_BLEND_BEGIN_RANGE || - pCreateInfos->pColorBlendState->pAttachments->destBlendColor > VK_BLEND_END_RANGE) + if(pCreateInfos->pColorBlendState->pAttachments->dstBlendColor < VK_BLEND_BEGIN_RANGE || + pCreateInfos->pColorBlendState->pAttachments->dstBlendColor > VK_BLEND_END_RANGE) { log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", - "vkCreateGraphicsPipelines parameter, VkBlend pCreateInfos->pColorBlendState->pAttachments->destBlendColor, is an unrecognized enumerator"); + "vkCreateGraphicsPipelines parameter, VkBlend pCreateInfos->pColorBlendState->pAttachments->dstBlendColor, is an unrecognized enumerator"); return false; } if(pCreateInfos->pColorBlendState->pAttachments->blendOpColor < VK_BLEND_OP_BEGIN_RANGE || @@ -3996,11 +3996,11 @@ bool PreCreateGraphicsPipelines( "vkCreateGraphicsPipelines parameter, VkBlend pCreateInfos->pColorBlendState->pAttachments->srcBlendAlpha, is an unrecognized enumerator"); return false; } - if(pCreateInfos->pColorBlendState->pAttachments->destBlendAlpha < VK_BLEND_BEGIN_RANGE || - pCreateInfos->pColorBlendState->pAttachments->destBlendAlpha > VK_BLEND_END_RANGE) + if(pCreateInfos->pColorBlendState->pAttachments->dstBlendAlpha < VK_BLEND_BEGIN_RANGE || + pCreateInfos->pColorBlendState->pAttachments->dstBlendAlpha > VK_BLEND_END_RANGE) { log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", - "vkCreateGraphicsPipelines parameter, VkBlend pCreateInfos->pColorBlendState->pAttachments->destBlendAlpha, is an unrecognized enumerator"); + "vkCreateGraphicsPipelines parameter, VkBlend pCreateInfos->pColorBlendState->pAttachments->dstBlendAlpha, is an unrecognized enumerator"); return false; } if(pCreateInfos->pColorBlendState->pAttachments->blendOpAlpha < VK_BLEND_OP_BEGIN_RANGE || @@ -4051,7 +4051,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateGraphicsPipelines( VkPipelineCache pipelineCache, uint32_t count, const VkGraphicsPipelineCreateInfo* pCreateInfos, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines) { PreCreateGraphicsPipelines(device, pCreateInfos); @@ -4124,7 +4124,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateComputePipelines( VkPipelineCache pipelineCache, uint32_t count, const VkComputePipelineCreateInfo* pCreateInfos, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines) { PreCreateComputePipelines(device, pCreateInfos); @@ -4182,7 +4182,7 @@ bool PostCreatePipelineLayout( VK_LAYER_EXPORT VkResult VKAPI vkCreatePipelineLayout( VkDevice device, const VkPipelineLayoutCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkPipelineLayout* pPipelineLayout) { PreCreatePipelineLayout(device, pCreateInfo); @@ -4290,7 +4290,7 @@ bool PostCreateSampler( VK_LAYER_EXPORT VkResult VKAPI vkCreateSampler( VkDevice device, const VkSamplerCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkSampler* pSampler) { PreCreateSampler(device, pCreateInfo); @@ -4355,7 +4355,7 @@ bool PostCreateDescriptorSetLayout( VK_LAYER_EXPORT VkResult VKAPI vkCreateDescriptorSetLayout( VkDevice device, const VkDescriptorSetLayoutCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkDescriptorSetLayout* pSetLayout) { PreCreateDescriptorSetLayout(device, pCreateInfo); @@ -4420,7 +4420,7 @@ bool PostCreateDescriptorPool( VK_LAYER_EXPORT VkResult VKAPI vkCreateDescriptorPool( VkDevice device, const VkDescriptorPoolCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkDescriptorPool* pDescriptorPool) { PreCreateDescriptorPool(device, pCreateInfo); @@ -4461,7 +4461,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkResetDescriptorPool( return result; } -bool PreAllocDescriptorSets( +bool PreAllocateDescriptorSets( VkDevice device, const VkDescriptorSetLayout* pSetLayouts) { @@ -4472,7 +4472,7 @@ bool PreAllocDescriptorSets( return true; } -bool PostAllocDescriptorSets( +bool PostAllocateDescriptorSets( VkDevice device, VkDescriptorPool descriptorPool, uint32_t count, @@ -4487,7 +4487,7 @@ bool PostAllocDescriptorSets( if(result < VK_SUCCESS) { - std::string reason = "vkAllocDescriptorSets parameter, VkResult result, is " + EnumeratorString(result); + std::string reason = "vkAllocateDescriptorSets parameter, VkResult result, is " + EnumeratorString(result); log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str()); return false; } @@ -4495,16 +4495,16 @@ bool PostAllocDescriptorSets( return true; } -VK_LAYER_EXPORT VkResult VKAPI vkAllocDescriptorSets( +VK_LAYER_EXPORT VkResult VKAPI vkAllocateDescriptorSets( VkDevice device, - const VkDescriptorSetAllocInfo* pAllocInfo, + const VkDescriptorSetAllocateInfo* pAllocateInfo, VkDescriptorSet* pDescriptorSets) { - PreAllocDescriptorSets(device, pAllocInfo->pSetLayouts); + PreAllocateDescriptorSets(device, pAllocateInfo->pSetLayouts); - VkResult result = get_dispatch_table(pc_device_table_map, device)->AllocDescriptorSets(device, pAllocInfo, pDescriptorSets); + VkResult result = get_dispatch_table(pc_device_table_map, device)->AllocateDescriptorSets(device, pAllocateInfo, pDescriptorSets); - PostAllocDescriptorSets(device, pAllocInfo->descriptorPool, pAllocInfo->setLayoutCount, pDescriptorSets, result); + PostAllocateDescriptorSets(device, pAllocateInfo->descriptorPool, pAllocateInfo->setLayoutCount, pDescriptorSets, result); return result; } @@ -4656,7 +4656,7 @@ bool PostCreateFramebuffer( VK_LAYER_EXPORT VkResult VKAPI vkCreateFramebuffer( VkDevice device, const VkFramebufferCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkFramebuffer* pFramebuffer) { PreCreateFramebuffer(device, pCreateInfo); @@ -4821,7 +4821,7 @@ bool PostCreateRenderPass( VK_LAYER_EXPORT VkResult VKAPI vkCreateRenderPass( VkDevice device, const VkRenderPassCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkRenderPass* pRenderPass) { PreCreateRenderPass(device, pCreateInfo); @@ -4859,11 +4859,11 @@ VK_LAYER_EXPORT void VKAPI vkGetRenderAreaGranularity( bool PreCreateCommandPool( VkDevice device, - const VkCmdPoolCreateInfo* pCreateInfo) + const VkCommandPoolCreateInfo* pCreateInfo) { if(pCreateInfo != nullptr) { - if(pCreateInfo->sType != VK_STRUCTURE_TYPE_CMD_POOL_CREATE_INFO) + if(pCreateInfo->sType != VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO) { log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", "vkCreateCommandPool parameter, VkStructureType pCreateInfo->sType, is an invalid enumerator"); @@ -4876,11 +4876,11 @@ bool PreCreateCommandPool( bool PostCreateCommandPool( VkDevice device, - VkCmdPool* pCmdPool, + VkCommandPool* pCommandPool, VkResult result) { - if(pCmdPool != nullptr) + if(pCommandPool != nullptr) { } @@ -4896,23 +4896,23 @@ bool PostCreateCommandPool( VK_LAYER_EXPORT VkResult VKAPI vkCreateCommandPool( VkDevice device, - const VkCmdPoolCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, - VkCmdPool* pCmdPool) + const VkCommandPoolCreateInfo* pCreateInfo, + const VkAllocationCallbacks* pAllocator, + VkCommandPool* pCommandPool) { PreCreateCommandPool(device, pCreateInfo); - VkResult result = get_dispatch_table(pc_device_table_map, device)->CreateCommandPool(device, pCreateInfo, pAllocator, pCmdPool); + VkResult result = get_dispatch_table(pc_device_table_map, device)->CreateCommandPool(device, pCreateInfo, pAllocator, pCommandPool); - PostCreateCommandPool(device, pCmdPool, result); + PostCreateCommandPool(device, pCommandPool, result); return result; } bool PostResetCommandPool( VkDevice device, - VkCmdPool cmdPool, - VkCmdPoolResetFlags flags, + VkCommandPool commandPool, + VkCommandPoolResetFlags flags, VkResult result) { @@ -4930,33 +4930,33 @@ bool PostResetCommandPool( VK_LAYER_EXPORT VkResult VKAPI vkResetCommandPool( VkDevice device, - VkCmdPool cmdPool, - VkCmdPoolResetFlags flags) + VkCommandPool commandPool, + VkCommandPoolResetFlags flags) { - VkResult result = get_dispatch_table(pc_device_table_map, device)->ResetCommandPool(device, cmdPool, flags); + VkResult result = get_dispatch_table(pc_device_table_map, device)->ResetCommandPool(device, commandPool, flags); - PostResetCommandPool(device, cmdPool, flags, result); + PostResetCommandPool(device, commandPool, flags, result); return result; } bool PreCreateCommandBuffer( VkDevice device, - const VkCmdBufferAllocInfo* pCreateInfo) + const VkCommandBufferAllocateInfo* pCreateInfo) { if(pCreateInfo != nullptr) { - if(pCreateInfo->sType != VK_STRUCTURE_TYPE_CMD_BUFFER_ALLOC_INFO) + if(pCreateInfo->sType != VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOC_INFO) { log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", - "vkAllocCommandBuffers parameter, VkStructureType pCreateInfo->sType, is an invalid enumerator"); + "vkAllocateCommandBuffers parameter, VkStructureType pCreateInfo->sType, is an invalid enumerator"); return false; } - if(pCreateInfo->level < VK_CMD_BUFFER_LEVEL_BEGIN_RANGE || - pCreateInfo->level > VK_CMD_BUFFER_LEVEL_END_RANGE) + if(pCreateInfo->level < VK_COMMAND_BUFFER_LEVEL_BEGIN_RANGE || + pCreateInfo->level > VK_COMMAND_BUFFER_LEVEL_END_RANGE) { log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", - "vkAllocCommandBuffers parameter, VkCmdBufferLevel pCreateInfo->level, is an unrecognized enumerator"); + "vkAllocateCommandBuffers parameter, VkCommandBufferLevel pCreateInfo->level, is an unrecognized enumerator"); return false; } } @@ -4966,17 +4966,17 @@ bool PreCreateCommandBuffer( bool PostCreateCommandBuffer( VkDevice device, - VkCmdBuffer* pCmdBuffer, + VkCommandBuffer* pCommandBuffer, VkResult result) { - if(pCmdBuffer != nullptr) + if(pCommandBuffer != nullptr) { } if(result < VK_SUCCESS) { - std::string reason = "vkAllocCommandBuffers parameter, VkResult result, is " + EnumeratorString(result); + std::string reason = "vkAllocateCommandBuffers parameter, VkResult result, is " + EnumeratorString(result); log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str()); return false; } @@ -4984,29 +4984,29 @@ bool PostCreateCommandBuffer( return true; } -VK_LAYER_EXPORT VkResult VKAPI vkAllocCommandBuffers( +VK_LAYER_EXPORT VkResult VKAPI vkAllocateCommandBuffers( VkDevice device, - const VkCmdBufferAllocInfo* pCreateInfo, - VkCmdBuffer* pCmdBuffer) + const VkCommandBufferAllocateInfo* pCreateInfo, + VkCommandBuffer* pCommandBuffer) { PreCreateCommandBuffer(device, pCreateInfo); - VkResult result = get_dispatch_table(pc_device_table_map, device)->AllocCommandBuffers(device, pCreateInfo, pCmdBuffer); + VkResult result = get_dispatch_table(pc_device_table_map, device)->AllocateCommandBuffers(device, pCreateInfo, pCommandBuffer); - PostCreateCommandBuffer(device, pCmdBuffer, result); + PostCreateCommandBuffer(device, pCommandBuffer, result); return result; } bool PreBeginCommandBuffer( - VkCmdBuffer cmdBuffer, - const VkCmdBufferBeginInfo* pBeginInfo) + VkCommandBuffer commandBuffer, + const VkCommandBufferBeginInfo* pBeginInfo) { if(pBeginInfo != nullptr) { - if(pBeginInfo->sType != VK_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO) + if(pBeginInfo->sType != VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO) { - log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", + log_msg(mdd(commandBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", "vkBeginCommandBuffer parameter, VkStructureType pBeginInfo->sType, is an invalid enumerator"); return false; } @@ -5016,14 +5016,14 @@ bool PreBeginCommandBuffer( } bool PostBeginCommandBuffer( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkResult result) { if(result < VK_SUCCESS) { std::string reason = "vkBeginCommandBuffer parameter, VkResult result, is " + EnumeratorString(result); - log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str()); + log_msg(mdd(commandBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str()); return false; } @@ -5031,27 +5031,27 @@ bool PostBeginCommandBuffer( } VK_LAYER_EXPORT VkResult VKAPI vkBeginCommandBuffer( - VkCmdBuffer cmdBuffer, - const VkCmdBufferBeginInfo* pBeginInfo) + VkCommandBuffer commandBuffer, + const VkCommandBufferBeginInfo* pBeginInfo) { - PreBeginCommandBuffer(cmdBuffer, pBeginInfo); + PreBeginCommandBuffer(commandBuffer, pBeginInfo); - VkResult result = get_dispatch_table(pc_device_table_map, cmdBuffer)->BeginCommandBuffer(cmdBuffer, pBeginInfo); + VkResult result = get_dispatch_table(pc_device_table_map, commandBuffer)->BeginCommandBuffer(commandBuffer, pBeginInfo); - PostBeginCommandBuffer(cmdBuffer, result); + PostBeginCommandBuffer(commandBuffer, result); return result; } bool PostEndCommandBuffer( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkResult result) { if(result < VK_SUCCESS) { std::string reason = "vkEndCommandBuffer parameter, VkResult result, is " + EnumeratorString(result); - log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str()); + log_msg(mdd(commandBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str()); return false; } @@ -5059,18 +5059,18 @@ bool PostEndCommandBuffer( } VK_LAYER_EXPORT VkResult VKAPI vkEndCommandBuffer( - VkCmdBuffer cmdBuffer) + VkCommandBuffer commandBuffer) { - VkResult result = get_dispatch_table(pc_device_table_map, cmdBuffer)->EndCommandBuffer(cmdBuffer); + VkResult result = get_dispatch_table(pc_device_table_map, commandBuffer)->EndCommandBuffer(commandBuffer); - PostEndCommandBuffer(cmdBuffer, result); + PostEndCommandBuffer(commandBuffer, result); return result; } bool PostResetCommandBuffer( - VkCmdBuffer cmdBuffer, - VkCmdBufferResetFlags flags, + VkCommandBuffer commandBuffer, + VkCommandBufferResetFlags flags, VkResult result) { @@ -5078,7 +5078,7 @@ bool PostResetCommandBuffer( if(result < VK_SUCCESS) { std::string reason = "vkResetCommandBuffer parameter, VkResult result, is " + EnumeratorString(result); - log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str()); + log_msg(mdd(commandBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str()); return false; } @@ -5086,18 +5086,18 @@ bool PostResetCommandBuffer( } VK_LAYER_EXPORT VkResult VKAPI vkResetCommandBuffer( - VkCmdBuffer cmdBuffer, - VkCmdBufferResetFlags flags) + VkCommandBuffer commandBuffer, + VkCommandBufferResetFlags flags) { - VkResult result = get_dispatch_table(pc_device_table_map, cmdBuffer)->ResetCommandBuffer(cmdBuffer, flags); + VkResult result = get_dispatch_table(pc_device_table_map, commandBuffer)->ResetCommandBuffer(commandBuffer, flags); - PostResetCommandBuffer(cmdBuffer, flags, result); + PostResetCommandBuffer(commandBuffer, flags, result); return result; } bool PostCmdBindPipeline( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline) { @@ -5105,7 +5105,7 @@ bool PostCmdBindPipeline( if(pipelineBindPoint < VK_PIPELINE_BIND_POINT_BEGIN_RANGE || pipelineBindPoint > VK_PIPELINE_BIND_POINT_END_RANGE) { - log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", + log_msg(mdd(commandBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", "vkCmdBindPipeline parameter, VkPipelineBindPoint pipelineBindPoint, is an unrecognized enumerator"); return false; } @@ -5115,62 +5115,62 @@ bool PostCmdBindPipeline( } VK_LAYER_EXPORT void VKAPI vkCmdBindPipeline( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline) { - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdBindPipeline(cmdBuffer, pipelineBindPoint, pipeline); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdBindPipeline(commandBuffer, pipelineBindPoint, pipeline); - PostCmdBindPipeline(cmdBuffer, pipelineBindPoint, pipeline); + PostCmdBindPipeline(commandBuffer, pipelineBindPoint, pipeline); } -VK_LAYER_EXPORT void VKAPI vkCmdSetViewport(VkCmdBuffer cmdBuffer, uint32_t viewportCount, const VkViewport* pViewports) +VK_LAYER_EXPORT void VKAPI vkCmdSetViewport(VkCommandBuffer commandBuffer, uint32_t viewportCount, const VkViewport* pViewports) { - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdSetViewport(cmdBuffer, viewportCount, pViewports); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdSetViewport(commandBuffer, viewportCount, pViewports); } -VK_LAYER_EXPORT void VKAPI vkCmdSetScissor(VkCmdBuffer cmdBuffer, uint32_t scissorCount, const VkRect2D* pScissors) +VK_LAYER_EXPORT void VKAPI vkCmdSetScissor(VkCommandBuffer commandBuffer, uint32_t scissorCount, const VkRect2D* pScissors) { - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdSetScissor(cmdBuffer, scissorCount, pScissors); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdSetScissor(commandBuffer, scissorCount, pScissors); } -VK_LAYER_EXPORT void VKAPI vkCmdSetLineWidth(VkCmdBuffer cmdBuffer, float lineWidth) +VK_LAYER_EXPORT void VKAPI vkCmdSetLineWidth(VkCommandBuffer commandBuffer, float lineWidth) { - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdSetLineWidth(cmdBuffer, lineWidth); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdSetLineWidth(commandBuffer, lineWidth); } -VK_LAYER_EXPORT void VKAPI vkCmdSetDepthBias(VkCmdBuffer cmdBuffer, float depthBiasConstantFactor, float depthBiasClamp, float depthBiasSlopeFactor) +VK_LAYER_EXPORT void VKAPI vkCmdSetDepthBias(VkCommandBuffer commandBuffer, float depthBiasConstantFactor, float depthBiasClamp, float depthBiasSlopeFactor) { - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdSetDepthBias(cmdBuffer, depthBiasConstantFactor, depthBiasClamp, depthBiasSlopeFactor); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdSetDepthBias(commandBuffer, depthBiasConstantFactor, depthBiasClamp, depthBiasSlopeFactor); } -VK_LAYER_EXPORT void VKAPI vkCmdSetBlendConstants(VkCmdBuffer cmdBuffer, const float blendConstants[4]) +VK_LAYER_EXPORT void VKAPI vkCmdSetBlendConstants(VkCommandBuffer commandBuffer, const float blendConstants[4]) { - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdSetBlendConstants(cmdBuffer, blendConstants); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdSetBlendConstants(commandBuffer, blendConstants); } -VK_LAYER_EXPORT void VKAPI vkCmdSetDepthBounds(VkCmdBuffer cmdBuffer, float minDepthBounds, float maxDepthBounds) +VK_LAYER_EXPORT void VKAPI vkCmdSetDepthBounds(VkCommandBuffer commandBuffer, float minDepthBounds, float maxDepthBounds) { - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdSetDepthBounds(cmdBuffer, minDepthBounds, maxDepthBounds); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdSetDepthBounds(commandBuffer, minDepthBounds, maxDepthBounds); } -VK_LAYER_EXPORT void VKAPI vkCmdSetStencilCompareMask(VkCmdBuffer cmdBuffer, VkStencilFaceFlags faceMask, uint32_t stencilCompareMask) +VK_LAYER_EXPORT void VKAPI vkCmdSetStencilCompareMask(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t stencilCompareMask) { - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdSetStencilCompareMask(cmdBuffer, faceMask, stencilCompareMask); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdSetStencilCompareMask(commandBuffer, faceMask, stencilCompareMask); } -VK_LAYER_EXPORT void VKAPI vkCmdSetStencilWriteMask(VkCmdBuffer cmdBuffer, VkStencilFaceFlags faceMask, uint32_t stencilWriteMask) +VK_LAYER_EXPORT void VKAPI vkCmdSetStencilWriteMask(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t stencilWriteMask) { - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdSetStencilWriteMask(cmdBuffer, faceMask, stencilWriteMask); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdSetStencilWriteMask(commandBuffer, faceMask, stencilWriteMask); } -VK_LAYER_EXPORT void VKAPI vkCmdSetStencilReference(VkCmdBuffer cmdBuffer, VkStencilFaceFlags faceMask, uint32_t stencilReference) +VK_LAYER_EXPORT void VKAPI vkCmdSetStencilReference(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t stencilReference) { - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdSetStencilReference(cmdBuffer, faceMask, stencilReference); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdSetStencilReference(commandBuffer, faceMask, stencilReference); } bool PreCmdBindDescriptorSets( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, const VkDescriptorSet* pDescriptorSets, const uint32_t* pDynamicOffsets) { @@ -5186,7 +5186,7 @@ bool PreCmdBindDescriptorSets( } bool PostCmdBindDescriptorSets( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t firstSet, @@ -5197,7 +5197,7 @@ bool PostCmdBindDescriptorSets( if(pipelineBindPoint < VK_PIPELINE_BIND_POINT_BEGIN_RANGE || pipelineBindPoint > VK_PIPELINE_BIND_POINT_END_RANGE) { - log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", + log_msg(mdd(commandBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", "vkCmdBindDescriptorSets parameter, VkPipelineBindPoint pipelineBindPoint, is an unrecognized enumerator"); return false; } @@ -5210,7 +5210,7 @@ bool PostCmdBindDescriptorSets( } VK_LAYER_EXPORT void VKAPI vkCmdBindDescriptorSets( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t firstSet, @@ -5219,15 +5219,15 @@ VK_LAYER_EXPORT void VKAPI vkCmdBindDescriptorSets( uint32_t dynamicOffsetCount, const uint32_t* pDynamicOffsets) { - PreCmdBindDescriptorSets(cmdBuffer, pDescriptorSets, pDynamicOffsets); + PreCmdBindDescriptorSets(commandBuffer, pDescriptorSets, pDynamicOffsets); - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdBindDescriptorSets(cmdBuffer, pipelineBindPoint, layout, firstSet, setCount, pDescriptorSets, dynamicOffsetCount, pDynamicOffsets); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdBindDescriptorSets(commandBuffer, pipelineBindPoint, layout, firstSet, setCount, pDescriptorSets, dynamicOffsetCount, pDynamicOffsets); - PostCmdBindDescriptorSets(cmdBuffer, pipelineBindPoint, layout, firstSet, setCount, dynamicOffsetCount); + PostCmdBindDescriptorSets(commandBuffer, pipelineBindPoint, layout, firstSet, setCount, dynamicOffsetCount); } bool PostCmdBindIndexBuffer( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkIndexType indexType) @@ -5238,7 +5238,7 @@ bool PostCmdBindIndexBuffer( if(indexType < VK_INDEX_TYPE_BEGIN_RANGE || indexType > VK_INDEX_TYPE_END_RANGE) { - log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", + log_msg(mdd(commandBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", "vkCmdBindIndexBuffer parameter, VkIndexType indexType, is an unrecognized enumerator"); return false; } @@ -5247,18 +5247,18 @@ bool PostCmdBindIndexBuffer( } VK_LAYER_EXPORT void VKAPI vkCmdBindIndexBuffer( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkIndexType indexType) { - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdBindIndexBuffer(cmdBuffer, buffer, offset, indexType); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdBindIndexBuffer(commandBuffer, buffer, offset, indexType); - PostCmdBindIndexBuffer(cmdBuffer, buffer, offset, indexType); + PostCmdBindIndexBuffer(commandBuffer, buffer, offset, indexType); } bool PreCmdBindVertexBuffers( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets) { @@ -5274,7 +5274,7 @@ bool PreCmdBindVertexBuffers( } bool PostCmdBindVertexBuffers( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t startBinding, uint32_t bindingCount) { @@ -5285,21 +5285,21 @@ bool PostCmdBindVertexBuffers( } VK_LAYER_EXPORT void VKAPI vkCmdBindVertexBuffers( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t startBinding, uint32_t bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets) { - PreCmdBindVertexBuffers(cmdBuffer, pBuffers, pOffsets); + PreCmdBindVertexBuffers(commandBuffer, pBuffers, pOffsets); - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdBindVertexBuffers(cmdBuffer, startBinding, bindingCount, pBuffers, pOffsets); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdBindVertexBuffers(commandBuffer, startBinding, bindingCount, pBuffers, pOffsets); - PostCmdBindVertexBuffers(cmdBuffer, startBinding, bindingCount); + PostCmdBindVertexBuffers(commandBuffer, startBinding, bindingCount); } bool PostCmdDraw( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t firstVertex, uint32_t vertexCount, uint32_t firstInstance, @@ -5314,19 +5314,19 @@ bool PostCmdDraw( } VK_LAYER_EXPORT void VKAPI vkCmdDraw( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance) { - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdDraw(cmdBuffer, vertexCount, instanceCount, firstVertex, firstInstance); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdDraw(commandBuffer, vertexCount, instanceCount, firstVertex, firstInstance); - PostCmdDraw(cmdBuffer, firstVertex, vertexCount, firstInstance, instanceCount); + PostCmdDraw(commandBuffer, firstVertex, vertexCount, firstInstance, instanceCount); } bool PostCmdDrawIndexed( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t firstIndex, uint32_t indexCount, int32_t vertexOffset, @@ -5343,20 +5343,20 @@ bool PostCmdDrawIndexed( } VK_LAYER_EXPORT void VKAPI vkCmdDrawIndexed( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex, int32_t vertexOffset, uint32_t firstInstance) { - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdDrawIndexed(cmdBuffer, indexCount, instanceCount, firstIndex, vertexOffset, firstInstance); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdDrawIndexed(commandBuffer, indexCount, instanceCount, firstIndex, vertexOffset, firstInstance); - PostCmdDrawIndexed(cmdBuffer, firstIndex, indexCount, vertexOffset, firstInstance, instanceCount); + PostCmdDrawIndexed(commandBuffer, firstIndex, indexCount, vertexOffset, firstInstance, instanceCount); } bool PostCmdDrawIndirect( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t count, @@ -5371,19 +5371,19 @@ bool PostCmdDrawIndirect( } VK_LAYER_EXPORT void VKAPI vkCmdDrawIndirect( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t count, uint32_t stride) { - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdDrawIndirect(cmdBuffer, buffer, offset, count, stride); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdDrawIndirect(commandBuffer, buffer, offset, count, stride); - PostCmdDrawIndirect(cmdBuffer, buffer, offset, count, stride); + PostCmdDrawIndirect(commandBuffer, buffer, offset, count, stride); } bool PostCmdDrawIndexedIndirect( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t count, @@ -5398,19 +5398,19 @@ bool PostCmdDrawIndexedIndirect( } VK_LAYER_EXPORT void VKAPI vkCmdDrawIndexedIndirect( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t count, uint32_t stride) { - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdDrawIndexedIndirect(cmdBuffer, buffer, offset, count, stride); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdDrawIndexedIndirect(commandBuffer, buffer, offset, count, stride); - PostCmdDrawIndexedIndirect(cmdBuffer, buffer, offset, count, stride); + PostCmdDrawIndexedIndirect(commandBuffer, buffer, offset, count, stride); } bool PostCmdDispatch( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t x, uint32_t y, uint32_t z) @@ -5423,18 +5423,18 @@ bool PostCmdDispatch( } VK_LAYER_EXPORT void VKAPI vkCmdDispatch( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t x, uint32_t y, uint32_t z) { - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdDispatch(cmdBuffer, x, y, z); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdDispatch(commandBuffer, x, y, z); - PostCmdDispatch(cmdBuffer, x, y, z); + PostCmdDispatch(commandBuffer, x, y, z); } bool PostCmdDispatchIndirect( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset) { @@ -5445,17 +5445,17 @@ bool PostCmdDispatchIndirect( } VK_LAYER_EXPORT void VKAPI vkCmdDispatchIndirect( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset) { - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdDispatchIndirect(cmdBuffer, buffer, offset); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdDispatchIndirect(commandBuffer, buffer, offset); - PostCmdDispatchIndirect(cmdBuffer, buffer, offset); + PostCmdDispatchIndirect(commandBuffer, buffer, offset); } bool PreCmdCopyBuffer( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, const VkBufferCopy* pRegions) { if(pRegions != nullptr) @@ -5466,9 +5466,9 @@ bool PreCmdCopyBuffer( } bool PostCmdCopyBuffer( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkBuffer srcBuffer, - VkBuffer destBuffer, + VkBuffer dstBuffer, uint32_t regionCount) { @@ -5479,21 +5479,21 @@ bool PostCmdCopyBuffer( } VK_LAYER_EXPORT void VKAPI vkCmdCopyBuffer( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkBuffer srcBuffer, - VkBuffer destBuffer, + VkBuffer dstBuffer, uint32_t regionCount, const VkBufferCopy* pRegions) { - PreCmdCopyBuffer(cmdBuffer, pRegions); + PreCmdCopyBuffer(commandBuffer, pRegions); - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdCopyBuffer(cmdBuffer, srcBuffer, destBuffer, regionCount, pRegions); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdCopyBuffer(commandBuffer, srcBuffer, dstBuffer, regionCount, pRegions); - PostCmdCopyBuffer(cmdBuffer, srcBuffer, destBuffer, regionCount); + PostCmdCopyBuffer(commandBuffer, srcBuffer, dstBuffer, regionCount); } bool PreCmdCopyImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, const VkImageCopy* pRegions) { if(pRegions != nullptr) @@ -5501,15 +5501,15 @@ bool PreCmdCopyImage( if ((pRegions->srcSubresource.aspect & (VK_IMAGE_ASPECT_COLOR_BIT | VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT | VK_IMAGE_ASPECT_METADATA_BIT)) == 0) { - log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", + log_msg(mdd(commandBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", "vkCmdCopyImage parameter, VkImageAspect pRegions->srcSubresource.aspect, is an unrecognized enumerator"); return false; } - if ((pRegions->destSubresource.aspect & + if ((pRegions->dstSubresource.aspect & (VK_IMAGE_ASPECT_COLOR_BIT | VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT | VK_IMAGE_ASPECT_METADATA_BIT)) == 0) { - log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", - "vkCmdCopyImage parameter, VkImageAspect pRegions->destSubresource.aspect, is an unrecognized enumerator"); + log_msg(mdd(commandBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", + "vkCmdCopyImage parameter, VkImageAspect pRegions->dstSubresource.aspect, is an unrecognized enumerator"); return false; } } @@ -5518,11 +5518,11 @@ bool PreCmdCopyImage( } bool PostCmdCopyImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, - VkImage destImage, - VkImageLayout destImageLayout, + VkImage dstImage, + VkImageLayout dstImageLayout, uint32_t regionCount) { @@ -5530,17 +5530,17 @@ bool PostCmdCopyImage( if(srcImageLayout < VK_IMAGE_LAYOUT_BEGIN_RANGE || srcImageLayout > VK_IMAGE_LAYOUT_END_RANGE) { - log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", + log_msg(mdd(commandBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", "vkCmdCopyImage parameter, VkImageLayout srcImageLayout, is an unrecognized enumerator"); return false; } - if(destImageLayout < VK_IMAGE_LAYOUT_BEGIN_RANGE || - destImageLayout > VK_IMAGE_LAYOUT_END_RANGE) + if(dstImageLayout < VK_IMAGE_LAYOUT_BEGIN_RANGE || + dstImageLayout > VK_IMAGE_LAYOUT_END_RANGE) { - log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", - "vkCmdCopyImage parameter, VkImageLayout destImageLayout, is an unrecognized enumerator"); + log_msg(mdd(commandBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", + "vkCmdCopyImage parameter, VkImageLayout dstImageLayout, is an unrecognized enumerator"); return false; } @@ -5549,23 +5549,23 @@ bool PostCmdCopyImage( } VK_LAYER_EXPORT void VKAPI vkCmdCopyImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, - VkImage destImage, - VkImageLayout destImageLayout, + VkImage dstImage, + VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageCopy* pRegions) { - PreCmdCopyImage(cmdBuffer, pRegions); + PreCmdCopyImage(commandBuffer, pRegions); - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdCopyImage(cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout, regionCount, pRegions); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdCopyImage(commandBuffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions); - PostCmdCopyImage(cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout, regionCount); + PostCmdCopyImage(commandBuffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount); } bool PreCmdBlitImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, const VkImageBlit* pRegions) { if(pRegions != nullptr) @@ -5573,15 +5573,15 @@ bool PreCmdBlitImage( if ((pRegions->srcSubresource.aspect & (VK_IMAGE_ASPECT_COLOR_BIT | VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT | VK_IMAGE_ASPECT_METADATA_BIT)) == 0) { - log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", + log_msg(mdd(commandBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", "vkCmdCopyImage parameter, VkImageAspect pRegions->srcSubresource.aspect, is an unrecognized enumerator"); return false; } - if ((pRegions->destSubresource.aspect & + if ((pRegions->dstSubresource.aspect & (VK_IMAGE_ASPECT_COLOR_BIT | VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT | VK_IMAGE_ASPECT_METADATA_BIT)) == 0) { - log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", - "vkCmdCopyImage parameter, VkImageAspect pRegions->destSubresource.aspect, is an unrecognized enumerator"); + log_msg(mdd(commandBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", + "vkCmdCopyImage parameter, VkImageAspect pRegions->dstSubresource.aspect, is an unrecognized enumerator"); return false; } } @@ -5590,11 +5590,11 @@ bool PreCmdBlitImage( } bool PostCmdBlitImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, - VkImage destImage, - VkImageLayout destImageLayout, + VkImage dstImage, + VkImageLayout dstImageLayout, uint32_t regionCount, VkFilter filter) { @@ -5603,17 +5603,17 @@ bool PostCmdBlitImage( if(srcImageLayout < VK_IMAGE_LAYOUT_BEGIN_RANGE || srcImageLayout > VK_IMAGE_LAYOUT_END_RANGE) { - log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", + log_msg(mdd(commandBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", "vkCmdBlitImage parameter, VkImageLayout srcImageLayout, is an unrecognized enumerator"); return false; } - if(destImageLayout < VK_IMAGE_LAYOUT_BEGIN_RANGE || - destImageLayout > VK_IMAGE_LAYOUT_END_RANGE) + if(dstImageLayout < VK_IMAGE_LAYOUT_BEGIN_RANGE || + dstImageLayout > VK_IMAGE_LAYOUT_END_RANGE) { - log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", - "vkCmdBlitImage parameter, VkImageLayout destImageLayout, is an unrecognized enumerator"); + log_msg(mdd(commandBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", + "vkCmdBlitImage parameter, VkImageLayout dstImageLayout, is an unrecognized enumerator"); return false; } @@ -5621,7 +5621,7 @@ bool PostCmdBlitImage( if(filter < VK_FILTER_BEGIN_RANGE || filter > VK_FILTER_END_RANGE) { - log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", + log_msg(mdd(commandBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", "vkCmdBlitImage parameter, VkFilter filter, is an unrecognized enumerator"); return false; } @@ -5630,24 +5630,24 @@ bool PostCmdBlitImage( } VK_LAYER_EXPORT void VKAPI vkCmdBlitImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, - VkImage destImage, - VkImageLayout destImageLayout, + VkImage dstImage, + VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageBlit* pRegions, VkFilter filter) { - PreCmdBlitImage(cmdBuffer, pRegions); + PreCmdBlitImage(commandBuffer, pRegions); - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdBlitImage(cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout, regionCount, pRegions, filter); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdBlitImage(commandBuffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions, filter); - PostCmdBlitImage(cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout, regionCount, filter); + PostCmdBlitImage(commandBuffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, filter); } bool PreCmdCopyBufferToImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, const VkBufferImageCopy* pRegions) { if(pRegions != nullptr) @@ -5655,7 +5655,7 @@ bool PreCmdCopyBufferToImage( if ((pRegions->imageSubresource.aspect & (VK_IMAGE_ASPECT_COLOR_BIT | VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT | VK_IMAGE_ASPECT_METADATA_BIT)) == 0) { - log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", + log_msg(mdd(commandBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", "vkCmdCopyBufferToImage parameter, VkImageAspect pRegions->imageSubresource.aspect, is an unrecognized enumerator"); return false; } @@ -5665,20 +5665,20 @@ bool PreCmdCopyBufferToImage( } bool PostCmdCopyBufferToImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkBuffer srcBuffer, - VkImage destImage, - VkImageLayout destImageLayout, + VkImage dstImage, + VkImageLayout dstImageLayout, uint32_t regionCount) { - if(destImageLayout < VK_IMAGE_LAYOUT_BEGIN_RANGE || - destImageLayout > VK_IMAGE_LAYOUT_END_RANGE) + if(dstImageLayout < VK_IMAGE_LAYOUT_BEGIN_RANGE || + dstImageLayout > VK_IMAGE_LAYOUT_END_RANGE) { - log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", - "vkCmdCopyBufferToImage parameter, VkImageLayout destImageLayout, is an unrecognized enumerator"); + log_msg(mdd(commandBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", + "vkCmdCopyBufferToImage parameter, VkImageLayout dstImageLayout, is an unrecognized enumerator"); return false; } @@ -5687,22 +5687,22 @@ bool PostCmdCopyBufferToImage( } VK_LAYER_EXPORT void VKAPI vkCmdCopyBufferToImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkBuffer srcBuffer, - VkImage destImage, - VkImageLayout destImageLayout, + VkImage dstImage, + VkImageLayout dstImageLayout, uint32_t regionCount, const VkBufferImageCopy* pRegions) { - PreCmdCopyBufferToImage(cmdBuffer, pRegions); + PreCmdCopyBufferToImage(commandBuffer, pRegions); - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdCopyBufferToImage(cmdBuffer, srcBuffer, destImage, destImageLayout, regionCount, pRegions); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdCopyBufferToImage(commandBuffer, srcBuffer, dstImage, dstImageLayout, regionCount, pRegions); - PostCmdCopyBufferToImage(cmdBuffer, srcBuffer, destImage, destImageLayout, regionCount); + PostCmdCopyBufferToImage(commandBuffer, srcBuffer, dstImage, dstImageLayout, regionCount); } bool PreCmdCopyImageToBuffer( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, const VkBufferImageCopy* pRegions) { if(pRegions != nullptr) @@ -5710,7 +5710,7 @@ bool PreCmdCopyImageToBuffer( if ((pRegions->imageSubresource.aspect & (VK_IMAGE_ASPECT_COLOR_BIT | VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT | VK_IMAGE_ASPECT_METADATA_BIT)) == 0) { - log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", + log_msg(mdd(commandBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", "vkCmdCopyImageToBuffer parameter, VkImageAspect pRegions->imageSubresource.aspect, is an unrecognized enumerator"); return false; } @@ -5720,10 +5720,10 @@ bool PreCmdCopyImageToBuffer( } bool PostCmdCopyImageToBuffer( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, - VkBuffer destBuffer, + VkBuffer dstBuffer, uint32_t regionCount) { @@ -5731,7 +5731,7 @@ bool PostCmdCopyImageToBuffer( if(srcImageLayout < VK_IMAGE_LAYOUT_BEGIN_RANGE || srcImageLayout > VK_IMAGE_LAYOUT_END_RANGE) { - log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", + log_msg(mdd(commandBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", "vkCmdCopyImageToBuffer parameter, VkImageLayout srcImageLayout, is an unrecognized enumerator"); return false; } @@ -5742,22 +5742,22 @@ bool PostCmdCopyImageToBuffer( } VK_LAYER_EXPORT void VKAPI vkCmdCopyImageToBuffer( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, - VkBuffer destBuffer, + VkBuffer dstBuffer, uint32_t regionCount, const VkBufferImageCopy* pRegions) { - PreCmdCopyImageToBuffer(cmdBuffer, pRegions); + PreCmdCopyImageToBuffer(commandBuffer, pRegions); - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdCopyImageToBuffer(cmdBuffer, srcImage, srcImageLayout, destBuffer, regionCount, pRegions); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdCopyImageToBuffer(commandBuffer, srcImage, srcImageLayout, dstBuffer, regionCount, pRegions); - PostCmdCopyImageToBuffer(cmdBuffer, srcImage, srcImageLayout, destBuffer, regionCount); + PostCmdCopyImageToBuffer(commandBuffer, srcImage, srcImageLayout, dstBuffer, regionCount); } bool PreCmdUpdateBuffer( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, const uint32_t* pData) { if(pData != nullptr) @@ -5768,9 +5768,9 @@ bool PreCmdUpdateBuffer( } bool PostCmdUpdateBuffer( - VkCmdBuffer cmdBuffer, - VkBuffer destBuffer, - VkDeviceSize destOffset, + VkCommandBuffer commandBuffer, + VkBuffer dstBuffer, + VkDeviceSize dstOffset, VkDeviceSize dataSize) { @@ -5781,23 +5781,23 @@ bool PostCmdUpdateBuffer( } VK_LAYER_EXPORT void VKAPI vkCmdUpdateBuffer( - VkCmdBuffer cmdBuffer, - VkBuffer destBuffer, - VkDeviceSize destOffset, + VkCommandBuffer commandBuffer, + VkBuffer dstBuffer, + VkDeviceSize dstOffset, VkDeviceSize dataSize, const uint32_t* pData) { - PreCmdUpdateBuffer(cmdBuffer, pData); + PreCmdUpdateBuffer(commandBuffer, pData); - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdUpdateBuffer(cmdBuffer, destBuffer, destOffset, dataSize, pData); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdUpdateBuffer(commandBuffer, dstBuffer, dstOffset, dataSize, pData); - PostCmdUpdateBuffer(cmdBuffer, destBuffer, destOffset, dataSize); + PostCmdUpdateBuffer(commandBuffer, dstBuffer, dstOffset, dataSize); } bool PostCmdFillBuffer( - VkCmdBuffer cmdBuffer, - VkBuffer destBuffer, - VkDeviceSize destOffset, + VkCommandBuffer commandBuffer, + VkBuffer dstBuffer, + VkDeviceSize dstOffset, VkDeviceSize size, uint32_t data) { @@ -5810,19 +5810,19 @@ bool PostCmdFillBuffer( } VK_LAYER_EXPORT void VKAPI vkCmdFillBuffer( - VkCmdBuffer cmdBuffer, - VkBuffer destBuffer, - VkDeviceSize destOffset, + VkCommandBuffer commandBuffer, + VkBuffer dstBuffer, + VkDeviceSize dstOffset, VkDeviceSize size, uint32_t data) { - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdFillBuffer(cmdBuffer, destBuffer, destOffset, size, data); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdFillBuffer(commandBuffer, dstBuffer, dstOffset, size, data); - PostCmdFillBuffer(cmdBuffer, destBuffer, destOffset, size, data); + PostCmdFillBuffer(commandBuffer, dstBuffer, dstOffset, size, data); } bool PreCmdClearColorImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, const VkClearColorValue* pColor, const VkImageSubresourceRange* pRanges) { @@ -5839,7 +5839,7 @@ bool PreCmdClearColorImage( } bool PostCmdClearColorImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, uint32_t rangeCount) @@ -5849,7 +5849,7 @@ bool PostCmdClearColorImage( if(imageLayout < VK_IMAGE_LAYOUT_BEGIN_RANGE || imageLayout > VK_IMAGE_LAYOUT_END_RANGE) { - log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", + log_msg(mdd(commandBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", "vkCmdClearColorImage parameter, VkImageLayout imageLayout, is an unrecognized enumerator"); return false; } @@ -5859,22 +5859,22 @@ bool PostCmdClearColorImage( } VK_LAYER_EXPORT void VKAPI vkCmdClearColorImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearColorValue* pColor, uint32_t rangeCount, const VkImageSubresourceRange* pRanges) { - PreCmdClearColorImage(cmdBuffer, pColor, pRanges); + PreCmdClearColorImage(commandBuffer, pColor, pRanges); - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdClearColorImage(cmdBuffer, image, imageLayout, pColor, rangeCount, pRanges); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdClearColorImage(commandBuffer, image, imageLayout, pColor, rangeCount, pRanges); - PostCmdClearColorImage(cmdBuffer, image, imageLayout, rangeCount); + PostCmdClearColorImage(commandBuffer, image, imageLayout, rangeCount); } bool PreCmdClearDepthStencilImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, const VkImageSubresourceRange* pRanges) { if(pRanges != nullptr) @@ -5890,7 +5890,7 @@ bool PreCmdClearDepthStencilImage( } bool PostCmdClearDepthStencilImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearDepthStencilValue* pDepthStencil, @@ -5901,7 +5901,7 @@ bool PostCmdClearDepthStencilImage( if(imageLayout < VK_IMAGE_LAYOUT_BEGIN_RANGE || imageLayout > VK_IMAGE_LAYOUT_END_RANGE) { - log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", + log_msg(mdd(commandBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", "vkCmdClearDepthStencilImage parameter, VkImageLayout imageLayout, is an unrecognized enumerator"); return false; } @@ -5913,22 +5913,22 @@ bool PostCmdClearDepthStencilImage( } VK_LAYER_EXPORT void VKAPI vkCmdClearDepthStencilImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearDepthStencilValue* pDepthStencil, uint32_t rangeCount, const VkImageSubresourceRange* pRanges) { - PreCmdClearDepthStencilImage(cmdBuffer, pRanges); + PreCmdClearDepthStencilImage(commandBuffer, pRanges); - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdClearDepthStencilImage(cmdBuffer, image, imageLayout, pDepthStencil, rangeCount, pRanges); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdClearDepthStencilImage(commandBuffer, image, imageLayout, pDepthStencil, rangeCount, pRanges); - PostCmdClearDepthStencilImage(cmdBuffer, image, imageLayout, pDepthStencil, rangeCount); + PostCmdClearDepthStencilImage(commandBuffer, image, imageLayout, pDepthStencil, rangeCount); } bool PreCmdClearAttachments( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, const VkClearColorValue* pColor, const VkClearRect* pRects) { @@ -5944,21 +5944,21 @@ bool PreCmdClearAttachments( } VK_LAYER_EXPORT void VKAPI vkCmdClearAttachments( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t attachmentCount, const VkClearAttachment* pAttachments, uint32_t rectCount, const VkClearRect* pRects) { for (uint32_t i = 0; i < attachmentCount; i++) { - PreCmdClearAttachments(cmdBuffer, &pAttachments[i].clearValue.color, pRects); + PreCmdClearAttachments(commandBuffer, &pAttachments[i].clearValue.color, pRects); } - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdClearAttachments(cmdBuffer, attachmentCount, pAttachments, rectCount, pRects); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdClearAttachments(commandBuffer, attachmentCount, pAttachments, rectCount, pRects); } bool PreCmdResolveImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, const VkImageResolve* pRegions) { if(pRegions != nullptr) @@ -5966,15 +5966,15 @@ bool PreCmdResolveImage( if ((pRegions->srcSubresource.aspect & (VK_IMAGE_ASPECT_COLOR_BIT | VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT | VK_IMAGE_ASPECT_METADATA_BIT)) == 0) { - log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", + log_msg(mdd(commandBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", "vkCmdResolveImage parameter, VkImageAspect pRegions->srcSubresource.aspect, is an unrecognized enumerator"); return false; } - if ((pRegions->destSubresource.aspect & + if ((pRegions->dstSubresource.aspect & (VK_IMAGE_ASPECT_COLOR_BIT | VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT | VK_IMAGE_ASPECT_METADATA_BIT)) == 0) { - log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", - "vkCmdResolveImage parameter, VkImageAspect pRegions->destSubresource.aspect, is an unrecognized enumerator"); + log_msg(mdd(commandBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", + "vkCmdResolveImage parameter, VkImageAspect pRegions->dstSubresource.aspect, is an unrecognized enumerator"); return false; } } @@ -5983,11 +5983,11 @@ bool PreCmdResolveImage( } bool PostCmdResolveImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, - VkImage destImage, - VkImageLayout destImageLayout, + VkImage dstImage, + VkImageLayout dstImageLayout, uint32_t regionCount) { @@ -5995,17 +5995,17 @@ bool PostCmdResolveImage( if(srcImageLayout < VK_IMAGE_LAYOUT_BEGIN_RANGE || srcImageLayout > VK_IMAGE_LAYOUT_END_RANGE) { - log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", + log_msg(mdd(commandBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", "vkCmdResolveImage parameter, VkImageLayout srcImageLayout, is an unrecognized enumerator"); return false; } - if(destImageLayout < VK_IMAGE_LAYOUT_BEGIN_RANGE || - destImageLayout > VK_IMAGE_LAYOUT_END_RANGE) + if(dstImageLayout < VK_IMAGE_LAYOUT_BEGIN_RANGE || + dstImageLayout > VK_IMAGE_LAYOUT_END_RANGE) { - log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", - "vkCmdResolveImage parameter, VkImageLayout destImageLayout, is an unrecognized enumerator"); + log_msg(mdd(commandBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", + "vkCmdResolveImage parameter, VkImageLayout dstImageLayout, is an unrecognized enumerator"); return false; } @@ -6014,23 +6014,23 @@ bool PostCmdResolveImage( } VK_LAYER_EXPORT void VKAPI vkCmdResolveImage( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, - VkImage destImage, - VkImageLayout destImageLayout, + VkImage dstImage, + VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageResolve* pRegions) { - PreCmdResolveImage(cmdBuffer, pRegions); + PreCmdResolveImage(commandBuffer, pRegions); - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdResolveImage(cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout, regionCount, pRegions); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdResolveImage(commandBuffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions); - PostCmdResolveImage(cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout, regionCount); + PostCmdResolveImage(commandBuffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount); } bool PostCmdSetEvent( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask) { @@ -6041,17 +6041,17 @@ bool PostCmdSetEvent( } VK_LAYER_EXPORT void VKAPI vkCmdSetEvent( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask) { - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdSetEvent(cmdBuffer, event, stageMask); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdSetEvent(commandBuffer, event, stageMask); - PostCmdSetEvent(cmdBuffer, event, stageMask); + PostCmdSetEvent(commandBuffer, event, stageMask); } bool PostCmdResetEvent( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask) { @@ -6062,25 +6062,25 @@ bool PostCmdResetEvent( } VK_LAYER_EXPORT void VKAPI vkCmdResetEvent( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask) { - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdResetEvent(cmdBuffer, event, stageMask); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdResetEvent(commandBuffer, event, stageMask); - PostCmdResetEvent(cmdBuffer, event, stageMask); + PostCmdResetEvent(commandBuffer, event, stageMask); } bool PreCmdWaitEvents( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, const VkEvent* pEvents, - const void* const* ppMemBarriers) + const void* const* ppMemoryBarriers) { if(pEvents != nullptr) { } - if(ppMemBarriers != nullptr) + if(ppMemoryBarriers != nullptr) { } @@ -6088,11 +6088,11 @@ bool PreCmdWaitEvents( } bool PostCmdWaitEvents( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t eventCount, VkPipelineStageFlags srcStageMask, - VkPipelineStageFlags destStageMask, - uint32_t memBarrierCount) + VkPipelineStageFlags dstStageMask, + uint32_t memoryBarrierCount) { @@ -6103,26 +6103,26 @@ bool PostCmdWaitEvents( } VK_LAYER_EXPORT void VKAPI vkCmdWaitEvents( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent* pEvents, VkPipelineStageFlags srcStageMask, - VkPipelineStageFlags destStageMask, - uint32_t memBarrierCount, - const void* const* ppMemBarriers) + VkPipelineStageFlags dstStageMask, + uint32_t memoryBarrierCount, + const void* const* ppMemoryBarriers) { - PreCmdWaitEvents(cmdBuffer, pEvents, ppMemBarriers); + PreCmdWaitEvents(commandBuffer, pEvents, ppMemoryBarriers); - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdWaitEvents(cmdBuffer, eventCount, pEvents, srcStageMask, destStageMask, memBarrierCount, ppMemBarriers); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdWaitEvents(commandBuffer, eventCount, pEvents, srcStageMask, dstStageMask, memoryBarrierCount, ppMemoryBarriers); - PostCmdWaitEvents(cmdBuffer, eventCount, srcStageMask, destStageMask, memBarrierCount); + PostCmdWaitEvents(commandBuffer, eventCount, srcStageMask, dstStageMask, memoryBarrierCount); } bool PreCmdPipelineBarrier( - VkCmdBuffer cmdBuffer, - const void* const* ppMemBarriers) + VkCommandBuffer commandBuffer, + const void* const* ppMemoryBarriers) { - if(ppMemBarriers != nullptr) + if(ppMemoryBarriers != nullptr) { } @@ -6130,11 +6130,11 @@ bool PreCmdPipelineBarrier( } bool PostCmdPipelineBarrier( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkPipelineStageFlags srcStageMask, - VkPipelineStageFlags destStageMask, + VkPipelineStageFlags dstStageMask, VkDependencyFlags dependencyFlags, - uint32_t memBarrierCount) + uint32_t memoryBarrierCount) { @@ -6145,22 +6145,22 @@ bool PostCmdPipelineBarrier( } VK_LAYER_EXPORT void VKAPI vkCmdPipelineBarrier( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkPipelineStageFlags srcStageMask, - VkPipelineStageFlags destStageMask, + VkPipelineStageFlags dstStageMask, VkDependencyFlags dependencyFlags, - uint32_t memBarrierCount, - const void* const* ppMemBarriers) + uint32_t memoryBarrierCount, + const void* const* ppMemoryBarriers) { - PreCmdPipelineBarrier(cmdBuffer, ppMemBarriers); + PreCmdPipelineBarrier(commandBuffer, ppMemoryBarriers); - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdPipelineBarrier(cmdBuffer, srcStageMask, destStageMask, dependencyFlags, memBarrierCount, ppMemBarriers); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdPipelineBarrier(commandBuffer, srcStageMask, dstStageMask, dependencyFlags, memoryBarrierCount, ppMemoryBarriers); - PostCmdPipelineBarrier(cmdBuffer, srcStageMask, destStageMask, dependencyFlags, memBarrierCount); + PostCmdPipelineBarrier(commandBuffer, srcStageMask, dstStageMask, dependencyFlags, memoryBarrierCount); } bool PostCmdBeginQuery( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t slot, VkQueryControlFlags flags) @@ -6173,18 +6173,18 @@ bool PostCmdBeginQuery( } VK_LAYER_EXPORT void VKAPI vkCmdBeginQuery( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t slot, VkQueryControlFlags flags) { - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdBeginQuery(cmdBuffer, queryPool, slot, flags); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdBeginQuery(commandBuffer, queryPool, slot, flags); - PostCmdBeginQuery(cmdBuffer, queryPool, slot, flags); + PostCmdBeginQuery(commandBuffer, queryPool, slot, flags); } bool PostCmdEndQuery( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t slot) { @@ -6195,17 +6195,17 @@ bool PostCmdEndQuery( } VK_LAYER_EXPORT void VKAPI vkCmdEndQuery( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t slot) { - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdEndQuery(cmdBuffer, queryPool, slot); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdEndQuery(commandBuffer, queryPool, slot); - PostCmdEndQuery(cmdBuffer, queryPool, slot); + PostCmdEndQuery(commandBuffer, queryPool, slot); } bool PostCmdResetQueryPool( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount) @@ -6218,18 +6218,18 @@ bool PostCmdResetQueryPool( } VK_LAYER_EXPORT void VKAPI vkCmdResetQueryPool( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount) { - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdResetQueryPool(cmdBuffer, queryPool, startQuery, queryCount); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdResetQueryPool(commandBuffer, queryPool, startQuery, queryCount); - PostCmdResetQueryPool(cmdBuffer, queryPool, startQuery, queryCount); + PostCmdResetQueryPool(commandBuffer, queryPool, startQuery, queryCount); } bool PostCmdWriteTimestamp( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, uint32_t slot) @@ -6241,23 +6241,23 @@ bool PostCmdWriteTimestamp( } VK_LAYER_EXPORT void VKAPI vkCmdWriteTimestamp( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, uint32_t slot) { - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdWriteTimestamp(cmdBuffer, pipelineStage, queryPool, slot); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdWriteTimestamp(commandBuffer, pipelineStage, queryPool, slot); - PostCmdWriteTimestamp(cmdBuffer, pipelineStage, queryPool, slot); + PostCmdWriteTimestamp(commandBuffer, pipelineStage, queryPool, slot); } bool PostCmdCopyQueryPoolResults( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount, - VkBuffer destBuffer, - VkDeviceSize destOffset, + VkBuffer dstBuffer, + VkDeviceSize dstOffset, VkDeviceSize stride, VkQueryResultFlags flags) { @@ -6273,22 +6273,22 @@ bool PostCmdCopyQueryPoolResults( } VK_LAYER_EXPORT void VKAPI vkCmdCopyQueryPoolResults( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount, - VkBuffer destBuffer, - VkDeviceSize destOffset, + VkBuffer dstBuffer, + VkDeviceSize dstOffset, VkDeviceSize stride, VkQueryResultFlags flags) { - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdCopyQueryPoolResults(cmdBuffer, queryPool, startQuery, queryCount, destBuffer, destOffset, stride, flags); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdCopyQueryPoolResults(commandBuffer, queryPool, startQuery, queryCount, dstBuffer, dstOffset, stride, flags); - PostCmdCopyQueryPoolResults(cmdBuffer, queryPool, startQuery, queryCount, destBuffer, destOffset, stride, flags); + PostCmdCopyQueryPoolResults(commandBuffer, queryPool, startQuery, queryCount, dstBuffer, dstOffset, stride, flags); } bool PreCmdPushConstants( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, const void* values) { if(values != nullptr) @@ -6299,7 +6299,7 @@ bool PreCmdPushConstants( } bool PostCmdPushConstants( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, uint32_t offset, @@ -6314,29 +6314,29 @@ bool PostCmdPushConstants( } VK_LAYER_EXPORT void VKAPI vkCmdPushConstants( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, uint32_t offset, uint32_t size, const void* values) { - PreCmdPushConstants(cmdBuffer, values); + PreCmdPushConstants(commandBuffer, values); - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdPushConstants(cmdBuffer, layout, stageFlags, offset, size, values); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdPushConstants(commandBuffer, layout, stageFlags, offset, size, values); - PostCmdPushConstants(cmdBuffer, layout, stageFlags, offset, size); + PostCmdPushConstants(commandBuffer, layout, stageFlags, offset, size); } bool PreCmdBeginRenderPass( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo* pRenderPassBegin) { if(pRenderPassBegin != nullptr) { if(pRenderPassBegin->sType != VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO) { - log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", + log_msg(mdd(commandBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", "vkCmdBeginRenderPass parameter, VkStructureType pRenderPassBegin->sType, is an invalid enumerator"); return false; } @@ -6349,14 +6349,14 @@ bool PreCmdBeginRenderPass( } bool PostCmdBeginRenderPass( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkRenderPassContents contents) { if(contents < VK_RENDER_PASS_CONTENTS_BEGIN_RANGE || contents > VK_RENDER_PASS_CONTENTS_END_RANGE) { - log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", + log_msg(mdd(commandBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", "vkCmdBeginRenderPass parameter, VkRenderPassContents contents, is an unrecognized enumerator"); return false; } @@ -6365,26 +6365,26 @@ bool PostCmdBeginRenderPass( } VK_LAYER_EXPORT void VKAPI vkCmdBeginRenderPass( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo* pRenderPassBegin, VkRenderPassContents contents) { - PreCmdBeginRenderPass(cmdBuffer, pRenderPassBegin); + PreCmdBeginRenderPass(commandBuffer, pRenderPassBegin); - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdBeginRenderPass(cmdBuffer, pRenderPassBegin, contents); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdBeginRenderPass(commandBuffer, pRenderPassBegin, contents); - PostCmdBeginRenderPass(cmdBuffer, contents); + PostCmdBeginRenderPass(commandBuffer, contents); } bool PostCmdNextSubpass( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkRenderPassContents contents) { if(contents < VK_RENDER_PASS_CONTENTS_BEGIN_RANGE || contents > VK_RENDER_PASS_CONTENTS_END_RANGE) { - log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", + log_msg(mdd(commandBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", "vkCmdNextSubpass parameter, VkRenderPassContents contents, is an unrecognized enumerator"); return false; } @@ -6393,34 +6393,34 @@ bool PostCmdNextSubpass( } VK_LAYER_EXPORT void VKAPI vkCmdNextSubpass( - VkCmdBuffer cmdBuffer, + VkCommandBuffer commandBuffer, VkRenderPassContents contents) { - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdNextSubpass(cmdBuffer, contents); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdNextSubpass(commandBuffer, contents); - PostCmdNextSubpass(cmdBuffer, contents); + PostCmdNextSubpass(commandBuffer, contents); } bool PostCmdEndRenderPass( - VkCmdBuffer cmdBuffer) + VkCommandBuffer commandBuffer) { return true; } VK_LAYER_EXPORT void VKAPI vkCmdEndRenderPass( - VkCmdBuffer cmdBuffer) + VkCommandBuffer commandBuffer) { - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdEndRenderPass(cmdBuffer); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdEndRenderPass(commandBuffer); - PostCmdEndRenderPass(cmdBuffer); + PostCmdEndRenderPass(commandBuffer); } bool PreCmdExecuteCommands( - VkCmdBuffer cmdBuffer, - const VkCmdBuffer* pCmdBuffers) + VkCommandBuffer commandBuffer, + const VkCommandBuffer* pCommandBuffers) { - if(pCmdBuffers != nullptr) + if(pCommandBuffers != nullptr) { } @@ -6428,8 +6428,8 @@ bool PreCmdExecuteCommands( } bool PostCmdExecuteCommands( - VkCmdBuffer cmdBuffer, - uint32_t cmdBuffersCount) + VkCommandBuffer commandBuffer, + uint32_t commandBuffersCount) { @@ -6437,15 +6437,15 @@ bool PostCmdExecuteCommands( } VK_LAYER_EXPORT void VKAPI vkCmdExecuteCommands( - VkCmdBuffer cmdBuffer, - uint32_t cmdBuffersCount, - const VkCmdBuffer* pCmdBuffers) + VkCommandBuffer commandBuffer, + uint32_t commandBuffersCount, + const VkCommandBuffer* pCommandBuffers) { - PreCmdExecuteCommands(cmdBuffer, pCmdBuffers); + PreCmdExecuteCommands(commandBuffer, pCommandBuffers); - get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdExecuteCommands(cmdBuffer, cmdBuffersCount, pCmdBuffers); + get_dispatch_table(pc_device_table_map, commandBuffer)->CmdExecuteCommands(commandBuffer, commandBuffersCount, pCommandBuffers); - PostCmdExecuteCommands(cmdBuffer, cmdBuffersCount); + PostCmdExecuteCommands(commandBuffer, commandBuffersCount); } VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI vkGetDeviceProcAddr(VkDevice device, const char* funcName) @@ -6472,8 +6472,8 @@ VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI vkGetDeviceProcAddr(VkDevice device, co return (PFN_vkVoidFunction) vkQueueWaitIdle; if (!strcmp(funcName, "vkDeviceWaitIdle")) return (PFN_vkVoidFunction) vkDeviceWaitIdle; - if (!strcmp(funcName, "vkAllocMemory")) - return (PFN_vkVoidFunction) vkAllocMemory; + if (!strcmp(funcName, "vkAllocateMemory")) + return (PFN_vkVoidFunction) vkAllocateMemory; if (!strcmp(funcName, "vkMapMemory")) return (PFN_vkVoidFunction) vkMapMemory; if (!strcmp(funcName, "vkFlushMappedMemoryRanges")) @@ -6530,8 +6530,8 @@ VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI vkGetDeviceProcAddr(VkDevice device, co return (PFN_vkVoidFunction) vkCreateDescriptorPool; if (!strcmp(funcName, "vkResetDescriptorPool")) return (PFN_vkVoidFunction) vkResetDescriptorPool; - if (!strcmp(funcName, "vkAllocDescriptorSets")) - return (PFN_vkVoidFunction) vkAllocDescriptorSets; + if (!strcmp(funcName, "vkAllocateDescriptorSets")) + return (PFN_vkVoidFunction) vkAllocateDescriptorSets; if (!strcmp(funcName, "vkCmdSetViewport")) return (PFN_vkVoidFunction) vkCmdSetViewport; if (!strcmp(funcName, "vkCmdSetScissor")) @@ -6550,8 +6550,8 @@ VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI vkGetDeviceProcAddr(VkDevice device, co return (PFN_vkVoidFunction) vkCmdSetStencilWriteMask; if (!strcmp(funcName, "vkCmdSetStencilReference")) return (PFN_vkVoidFunction) vkCmdSetStencilReference; - if (!strcmp(funcName, "vkAllocCommandBuffers")) - return (PFN_vkVoidFunction) vkAllocCommandBuffers; + if (!strcmp(funcName, "vkAllocateCommandBuffers")) + return (PFN_vkVoidFunction) vkAllocateCommandBuffers; if (!strcmp(funcName, "vkBeginCommandBuffer")) return (PFN_vkVoidFunction) vkBeginCommandBuffer; if (!strcmp(funcName, "vkEndCommandBuffer")) diff --git a/layers/screenshot.cpp b/layers/screenshot.cpp index 26bd8a39..6a85aeb5 100644 --- a/layers/screenshot.cpp +++ b/layers/screenshot.cpp @@ -74,11 +74,11 @@ typedef struct } ImageMapStruct; static unordered_map<VkImage, ImageMapStruct *> imageMap; -// unordered map: associates a device with a queue, cmdPool, and physical device +// unordered map: associates a device with a queue, commandPool, and physical device typedef struct { VkQueue queue; - VkCmdPool cmdPool; + VkCommandPool commandPool; VkPhysicalDevice physicalDevice; } DeviceMapStruct; static unordered_map<VkDevice, DeviceMapStruct *> deviceMap; @@ -139,7 +139,7 @@ static void writePPM( const char *filename, VkImage image1) int x, y; const char *ptr; VkDeviceMemory mem2; - VkCmdBuffer cmdBuffer; + VkCommandBuffer commandBuffer; VkDevice device = imageMap[image1]->device; VkPhysicalDevice physicalDevice = deviceMap[device]->physicalDevice; VkInstance instance = physDeviceMap[physicalDevice]->instance; @@ -160,25 +160,25 @@ static void writePPM( const char *filename, VkImage image1) 1, 1, VK_IMAGE_TILING_LINEAR, - (VK_IMAGE_USAGE_TRANSFER_DESTINATION_BIT|VK_IMAGE_USAGE_STORAGE_BIT), + (VK_IMAGE_USAGE_TRANSFER_DST_BIT|VK_IMAGE_USAGE_STORAGE_BIT), }; - VkMemoryAllocInfo memAllocInfo = { + VkMemoryAllocateInfo memAllocInfo = { VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO, NULL, 0, // allocationSize, queried later 0 // memoryTypeIndex, queried later }; - const VkCmdBufferAllocInfo allocCommandBufferInfo = { - VK_STRUCTURE_TYPE_CMD_BUFFER_ALLOC_INFO, + const VkCommandBufferAllocateInfo allocCommandBufferInfo = { + VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOC_INFO, NULL, - deviceMap[device]->cmdPool, - VK_CMD_BUFFER_LEVEL_PRIMARY, + deviceMap[device]->commandPool, + VK_COMMAND_BUFFER_LEVEL_PRIMARY, 1 }; - const VkCmdBufferBeginInfo cmdBufferBeginInfo = { - VK_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO, + const VkCommandBufferBeginInfo commandBufferBeginInfo = { + VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, NULL, - VK_CMD_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT, + VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT, }; const VkImageCopy imageCopyRegion = { {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0}, @@ -193,7 +193,7 @@ static void writePPM( const char *filename, VkImage image1) VkLayerDispatchTable* pTableDevice = get_dispatch_table(screenshot_device_table_map, device); VkLayerDispatchTable* pTableQueue = get_dispatch_table(screenshot_device_table_map, queue); VkLayerInstanceDispatchTable* pInstanceTable; - VkLayerDispatchTable* pTableCmdBuffer; + VkLayerDispatchTable* pTableCommandBuffer; VkPhysicalDeviceMemoryProperties memory_properties; if (imageMap.empty() || imageMap.find(image1) == imageMap.end()) @@ -222,26 +222,26 @@ static void writePPM( const char *filename, VkImage image1) &memAllocInfo.memoryTypeIndex); assert(pass); - err = pTableDevice->AllocMemory(device, &memAllocInfo, NULL, &mem2); + err = pTableDevice->AllocateMemory(device, &memAllocInfo, NULL, &mem2); assert(!err); err = pTableQueue->BindImageMemory(device, image2, mem2, 0); assert(!err); - err = pTableDevice->AllocCommandBuffers(device, &allocCommandBufferInfo, &cmdBuffer); + err = pTableDevice->AllocateCommandBuffers(device, &allocCommandBufferInfo, &commandBuffer); assert(!err); - screenshot_device_table_map.emplace(cmdBuffer, pTableDevice); - pTableCmdBuffer = screenshot_device_table_map[cmdBuffer]; + screenshot_device_table_map.emplace(commandBuffer, pTableDevice); + pTableCommandBuffer = screenshot_device_table_map[commandBuffer]; - err = pTableCmdBuffer->BeginCommandBuffer(cmdBuffer, &cmdBufferBeginInfo); + err = pTableCommandBuffer->BeginCommandBuffer(commandBuffer, &commandBufferBeginInfo); assert(!err); // TODO: We need to transition images to match these layouts, then restore the original layouts - pTableCmdBuffer->CmdCopyImage(cmdBuffer, image1, VK_IMAGE_LAYOUT_TRANSFER_SOURCE_OPTIMAL, - image2, VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL, 1, &imageCopyRegion); + pTableCommandBuffer->CmdCopyImage(commandBuffer, image1, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, + image2, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &imageCopyRegion); - err = pTableCmdBuffer->EndCommandBuffer(cmdBuffer); + err = pTableCommandBuffer->EndCommandBuffer(commandBuffer); assert(!err); VkFence nullFence = { VK_NULL_HANDLE }; @@ -251,7 +251,7 @@ static void writePPM( const char *filename, VkImage image1) submit_info.waitSemaphoreCount = 0; submit_info.pWaitSemaphores = NULL; submit_info.commandBufferCount = 1; - submit_info.pCommandBuffers = &cmdBuffer; + submit_info.pCommandBuffers = &commandBuffer; submit_info.signalSemaphoreCount = 0; submit_info.pSignalSemaphores = NULL; @@ -309,7 +309,7 @@ static void writePPM( const char *filename, VkImage image1) // Clean up pTableDevice->UnmapMemory(device, mem2); pTableDevice->FreeMemory(device, mem2, NULL); - pTableDevice->FreeCommandBuffers(device, deviceMap[device]->cmdPool, 1, &cmdBuffer); + pTableDevice->FreeCommandBuffers(device, deviceMap[device]->commandPool, 1, &commandBuffer); } @@ -336,7 +336,7 @@ static void createDeviceRegisterExtensions(const VkDeviceCreateInfo* pCreateInfo VK_LAYER_EXPORT VkResult VKAPI vkCreateDevice( VkPhysicalDevice gpu, const VkDeviceCreateInfo *pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkDevice *pDevice) { VkLayerDispatchTable *pDisp = get_dispatch_table(screenshot_device_table_map, *pDevice); @@ -461,12 +461,12 @@ VK_LAYER_EXPORT void VKAPI vkGetDeviceQueue( VK_LAYER_EXPORT VkResult VKAPI vkCreateCommandPool( VkDevice device, - const VkCmdPoolCreateInfo *pCreateInfo, - const VkAllocCallbacks* pAllocator, - VkCmdPool *pCmdPool) + const VkCommandPoolCreateInfo *pCreateInfo, + const VkAllocationCallbacks* pAllocator, + VkCommandPool *pCommandPool) { VkLayerDispatchTable* pTable = screenshot_device_table_map[device]; - VkResult result = get_dispatch_table(screenshot_device_table_map, device)->CreateCommandPool(device, pCreateInfo, pAllocator, pCmdPool); + VkResult result = get_dispatch_table(screenshot_device_table_map, device)->CreateCommandPool(device, pCreateInfo, pAllocator, pCommandPool); loader_platform_thread_lock_mutex(&globalLock); if (screenshotEnvQueried && screenshotFrames.empty()) { @@ -475,13 +475,13 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateCommandPool( return result; } - // Create a mapping from a device to a cmdPool + // Create a mapping from a device to a commandPool if (deviceMap[device] == NULL) { DeviceMapStruct *deviceMapElem = new DeviceMapStruct; deviceMap[device] = deviceMapElem; } - deviceMap[device]->cmdPool = *pCmdPool; + deviceMap[device]->commandPool = *pCommandPool; loader_platform_thread_unlock_mutex(&globalLock); return result; } diff --git a/layers/shader_checker.cpp b/layers/shader_checker.cpp index 9e417f62..d7a9aa91 100644 --- a/layers/shader_checker.cpp +++ b/layers/shader_checker.cpp @@ -138,7 +138,7 @@ static loader_platform_thread_mutex globalLock; VK_LAYER_EXPORT VkResult VKAPI vkCreateDescriptorSetLayout( VkDevice device, const VkDescriptorSetLayoutCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkDescriptorSetLayout* pSetLayout) { layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); @@ -159,7 +159,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateDescriptorSetLayout( VK_LAYER_EXPORT VkResult VKAPI vkCreatePipelineLayout( VkDevice device, const VkPipelineLayoutCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkPipelineLayout* pPipelineLayout) { layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); @@ -604,7 +604,7 @@ collect_interface_by_descriptor_slot(layer_data *my_data, VkDevice dev, VK_LAYER_EXPORT VkResult VKAPI vkCreateShaderModule( VkDevice device, const VkShaderModuleCreateInfo *pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkShaderModule *pShaderModule) { layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); @@ -629,7 +629,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateShaderModule( VK_LAYER_EXPORT VkResult VKAPI vkCreateShader( VkDevice device, const VkShaderCreateInfo *pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkShader *pShader) { layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); @@ -644,7 +644,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateShader( VK_LAYER_EXPORT VkResult VKAPI vkCreateRenderPass( VkDevice device, const VkRenderPassCreateInfo *pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkRenderPass *pRenderPass) { layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); @@ -1135,7 +1135,7 @@ vkCreateGraphicsPipelines(VkDevice device, VkPipelineCache pipelineCache, uint32_t count, const VkGraphicsPipelineCreateInfo *pCreateInfos, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkPipeline *pPipelines) { layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); @@ -1156,7 +1156,7 @@ vkCreateGraphicsPipelines(VkDevice device, } -VK_LAYER_EXPORT VkResult VKAPI vkCreateDevice(VkPhysicalDevice gpu, const VkDeviceCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkDevice* pDevice) +VK_LAYER_EXPORT VkResult VKAPI vkCreateDevice(VkPhysicalDevice gpu, const VkDeviceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDevice* pDevice) { layer_data *my_device_data = get_my_data_ptr(get_dispatch_key(*pDevice), layer_data_map); VkResult result = my_device_data->device_dispatch_table->CreateDevice(gpu, pCreateInfo, pAllocator, pDevice); @@ -1168,7 +1168,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateDevice(VkPhysicalDevice gpu, const VkDevi } /* hook DextroyDevice to remove tableMap entry */ -VK_LAYER_EXPORT void VKAPI vkDestroyDevice(VkDevice device, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroyDevice(VkDevice device, const VkAllocationCallbacks* pAllocator) { dispatch_key key = get_dispatch_key(device); layer_data *my_device_data = get_my_data_ptr(key, layer_data_map); @@ -1179,7 +1179,7 @@ VK_LAYER_EXPORT void VKAPI vkDestroyDevice(VkDevice device, const VkAllocCallbac VkResult VKAPI vkCreateInstance( const VkInstanceCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkInstance* pInstance) { layer_data *my_data = get_my_data_ptr(get_dispatch_key(*pInstance), layer_data_map); @@ -1200,7 +1200,7 @@ VkResult VKAPI vkCreateInstance( } /* hook DestroyInstance to remove tableInstanceMap entry */ -VK_LAYER_EXPORT void VKAPI vkDestroyInstance(VkInstance instance, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks* pAllocator) { dispatch_key key = get_dispatch_key(instance); layer_data *my_data = get_my_data_ptr(key, layer_data_map); diff --git a/layers/swapchain.cpp b/layers/swapchain.cpp index 0075b6f8..7f428b83 100644 --- a/layers/swapchain.cpp +++ b/layers/swapchain.cpp @@ -197,7 +197,7 @@ static const char *presentModeStr(VkPresentModeKHR value) } -VK_LAYER_EXPORT VkResult VKAPI vkCreateInstance(const VkInstanceCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkInstance* pInstance) +VK_LAYER_EXPORT VkResult VKAPI vkCreateInstance(const VkInstanceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkInstance* pInstance) { layer_data *my_data = get_my_data_ptr(get_dispatch_key(*pInstance), layer_data_map); // Call down the call chain: @@ -218,7 +218,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateInstance(const VkInstanceCreateInfo* pCre return result; } -VK_LAYER_EXPORT void VKAPI vkDestroyInstance(VkInstance instance, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks* pAllocator) { VkBool32 skipCall = VK_FALSE; dispatch_key key = get_dispatch_key(instance); @@ -299,7 +299,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkEnumeratePhysicalDevices(VkInstance instance, u return VK_ERROR_VALIDATION_FAILED; } -VK_LAYER_EXPORT VkResult VKAPI vkCreateDevice(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkDevice* pDevice) +VK_LAYER_EXPORT VkResult VKAPI vkCreateDevice(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDevice* pDevice) { VkResult result = VK_SUCCESS; VkBool32 skipCall = VK_FALSE; @@ -329,7 +329,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateDevice(VkPhysicalDevice physicalDevice, c return result; } -VK_LAYER_EXPORT void VKAPI vkDestroyDevice(VkDevice device, const VkAllocCallbacks* pAllocator) +VK_LAYER_EXPORT void VKAPI vkDestroyDevice(VkDevice device, const VkAllocationCallbacks* pAllocator) { VkBool32 skipCall = VK_FALSE; dispatch_key key = get_dispatch_key(device); diff --git a/layers/swapchain.h b/layers/swapchain.h index cc9e5013..8d104e86 100644 --- a/layers/swapchain.h +++ b/layers/swapchain.h @@ -40,7 +40,7 @@ static const VkLayerProperties globalLayerProps[] = { { "Swapchain", VK_API_VERSION, // specVersion - VK_MAKE_VERSION(0, 1, 0), // implVersion + VK_MAKE_VERSION(0, 1, 0), // implementationVersion "layer: Swapchain", } }; @@ -49,7 +49,7 @@ static const VkLayerProperties deviceLayerProps[] = { { "Swapchain", VK_API_VERSION, // specVersion - VK_MAKE_VERSION(0, 1, 0), // implVersion + VK_MAKE_VERSION(0, 1, 0), // implementationVersion "layer: Swapchain", } }; diff --git a/layers/vk_layer_debug_marker_table.cpp b/layers/vk_layer_debug_marker_table.cpp index b3b54c19..fbfe9a27 100644 --- a/layers/vk_layer_debug_marker_table.cpp +++ b/layers/vk_layer_debug_marker_table.cpp @@ -30,7 +30,7 @@ std::unordered_map<void *, VkLayerDebugMarkerDispatchTable *> tableDebugMarkerMa * are created from that "parent" object. Thus use pointer to dispatch table * as the key to these table maps. * Instance -> PhysicalDevice - * Device -> CmdBuffer or Queue + * Device -> CommandBuffer or Queue * If use the object themselves as key to map then implies Create entrypoints have to be intercepted * and a new key inserted into map */ VkLayerDebugMarkerDispatchTable * initDebugMarkerTable(VkDevice device) diff --git a/layers/vk_layer_table.cpp b/layers/vk_layer_table.cpp index cbe80bed..67217ff6 100644 --- a/layers/vk_layer_table.cpp +++ b/layers/vk_layer_table.cpp @@ -128,7 +128,7 @@ VkLayerInstanceDispatchTable *get_dispatch_table(instance_table_map &map, void* * are created from that "parent" object. Thus use pointer to dispatch table * as the key to these table maps. * Instance -> PhysicalDevice - * Device -> CmdBuffer or Queue + * Device -> CommandBuffer or Queue * If use the object themselves as key to map then implies Create entrypoints have to be intercepted * and a new key inserted into map */ VkLayerInstanceDispatchTable * initInstanceTable(instance_table_map &map, const VkBaseLayerObject *instancew) diff --git a/layers/vk_layer_utils.cpp b/layers/vk_layer_utils.cpp index b0a483ad..3fbf7e18 100644 --- a/layers/vk_layer_utils.cpp +++ b/layers/vk_layer_utils.cpp @@ -35,7 +35,7 @@ typedef struct _VULKAN_FORMAT_INFO { // Set up data structure with number of bytes and number of channels // for each Vulkan format. -static const VULKAN_FORMAT_INFO vk_format_table[VK_FORMAT_NUM] = { +static const VULKAN_FORMAT_INFO vk_format_table[VK_FORMAT_RANGE_SIZE] = { { 0, 0 }, // [VK_FORMAT_UNDEFINED] { 1, 2 }, // [VK_FORMAT_R4G4_UNORM] { 1, 2 }, // [VK_FORMAT_R4G4_USCALED] diff --git a/layers/vk_validation_layer_details.md b/layers/vk_validation_layer_details.md index bbeb0fa4..f13c2b0b 100644 --- a/layers/vk_validation_layer_details.md +++ b/layers/vk_validation_layer_details.md @@ -14,24 +14,24 @@ The DrawState layer tracks state leading into Draw cmds. This includes the Pipel | ----- | -------- | ---------------- | ------------ | -------- | ---------- | | Valid Pipeline Layouts | Validates that pipeline layout from bound descriptor set matches the current pipeline layout | PIPELINE_LAYOUT_MISMATCH | vkCmdDraw vkCmdDrawIndexed vkCmdDrawIndirect vkCmdDrawIndexedIndirect | TBD | None | | Validate DbgMarker exensions | Validates that DbgMarker extensions have been enabled before use | INVALID_EXTENSION | vkCmdDbgMarkerBegin vkCmdDbgMarkerEnd | TBD | None | -| Valid BeginCommandBuffer level-related parameters | Primary command buffers must specify VK_NULL_HANDLE for RenderPass or Framebuffer parameters, while secondary command buffers must provide non-null parameters | BEGIN_CB_INVALID_STATE | vkBeginCommandBuffer | PrimaryCmdBufferFramebufferAndRenderpass SecondaryCmdBufferFramebufferAndRenderpass | None | -| PSO Bound | Verify that a properly created and valid pipeline object is bound to the CmdBuffer specified in these calls | NO_PIPELINE_BOUND | vkCmdBindDescriptorSets vkCmdBindVertexBuffers | PipelineNotBound | This check is currently more related to DrawState data structures and less about verifying that PSO is bound at all appropriate points in API. For API purposes, need to make sure this is checked at Draw time and any other relevant calls. | -| Valid DescriptorPool | Verifies that the descriptor set pool object was properly created and is valid | INVALID_POOL | vkResetDescriptorPool vkAllocDescriptorSets | None | This is just an internal layer data structure check. ParamChecker or ObjectTracker should really catch bad DSPool | +| Valid BeginCommandBuffer level-related parameters | Primary command buffers must specify VK_NULL_HANDLE for RenderPass or Framebuffer parameters, while secondary command buffers must provide non-null parameters | BEGIN_CB_INVALID_STATE | vkBeginCommandBuffer | PrimaryCommandBufferFramebufferAndRenderpass SecondaryCommandBufferFramebufferAndRenderpass | None | +| PSO Bound | Verify that a properly created and valid pipeline object is bound to the CommandBuffer specified in these calls | NO_PIPELINE_BOUND | vkCmdBindDescriptorSets vkCmdBindVertexBuffers | PipelineNotBound | This check is currently more related to DrawState data structures and less about verifying that PSO is bound at all appropriate points in API. For API purposes, need to make sure this is checked at Draw time and any other relevant calls. | +| Valid DescriptorPool | Verifies that the descriptor set pool object was properly created and is valid | INVALID_POOL | vkResetDescriptorPool vkAllocateDescriptorSets | None | This is just an internal layer data structure check. ParamChecker or ObjectTracker should really catch bad DSPool | | Valid DescriptorSet | Validate that descriptor set was properly created and is currently valid | INVALID_SET | vkCmdBindDescriptorSets | None | Is this needed other places (like Update/Clear descriptors) | -| Valid DescriptorSetLayout | Flag DescriptorSetLayout object that was not properly created | INVALID_LAYOUT | vkAllocDescriptorSets | None | Anywhere else to check this? | +| Valid DescriptorSetLayout | Flag DescriptorSetLayout object that was not properly created | INVALID_LAYOUT | vkAllocateDescriptorSets | None | Anywhere else to check this? | | Valid Pipeline | Flag VkPipeline object that was not properly created | INVALID_PIPELINE | vkCmdBindPipeline | InvalidPipeline | NA | | Valid Pipeline Create Info | Tests for the following: That compute shaders are not specified for the graphics pipeline, tess evaluation and tess control shaders are included or excluded as a pair, that VK_PRIMITIVE_TOPOLOGY_PATCH is set as IA topology for tessellation pipelines, that VK_PRIMITIVE_TOPOLOGY_PATCH primitive topology is only set for tessellation pipelines, and that Vtx Shader specified | INVALID_PIPELINE_CREATE_STATE | vkCreateGraphicsPipelines | InvalidPipelineCreateState | NA | -| Valid CmdBuffer | Validates that the command buffer object was properly created and is currently valid | INVALID_CMD_BUFFER | vkQueueSubmit vkBeginCommandBuffer vkEndCommandBuffer vkCmdBindPipeline vkCmdBindDescriptorSets vkCmdBindIndexBuffer vkCmdBindVertexBuffers vkCmdDraw vkCmdDrawIndexed vkCmdDrawIndirect vkCmdDrawIndexedIndirect vkCmdDispatch vkCmdDispatchIndirect vkCmdCopyBuffer vkCmdCopyImage vkCmdBlitImage vkCmdCopyBufferToImage vkCmdCopyImageToBuffer vkCmdUpdateBuffer vkCmdFillBuffer vkCmdClearAttachments vkCmdClearColorImage vkCmdClearDepthStencilImage vkCmdResolveImage vkCmdSetEvent vkCmdResetEvent vkCmdWaitEvents vkCmdPipelineBarrier vkCmdBeginQuery vkCmdEndQuery vkCmdResetQueryPool vkCmdWriteTimestamp vkCmdBeginRenderPass vkCmdNextSubpass vkCmdEndRenderPass vkCmdExecuteCommands vkCmdDbgMarkerBegin vkCmdDbgMarkerEnd vkAllocCommandBuffers | None | NA | +| Valid CommandBuffer | Validates that the command buffer object was properly created and is currently valid | INVALID_COMMAND_BUFFER | vkQueueSubmit vkBeginCommandBuffer vkEndCommandBuffer vkCmdBindPipeline vkCmdBindDescriptorSets vkCmdBindIndexBuffer vkCmdBindVertexBuffers vkCmdDraw vkCmdDrawIndexed vkCmdDrawIndirect vkCmdDrawIndexedIndirect vkCmdDispatch vkCmdDispatchIndirect vkCmdCopyBuffer vkCmdCopyImage vkCmdBlitImage vkCmdCopyBufferToImage vkCmdCopyImageToBuffer vkCmdUpdateBuffer vkCmdFillBuffer vkCmdClearAttachments vkCmdClearColorImage vkCmdClearDepthStencilImage vkCmdResolveImage vkCmdSetEvent vkCmdResetEvent vkCmdWaitEvents vkCmdPipelineBarrier vkCmdBeginQuery vkCmdEndQuery vkCmdResetQueryPool vkCmdWriteTimestamp vkCmdBeginRenderPass vkCmdNextSubpass vkCmdEndRenderPass vkCmdExecuteCommands vkCmdDbgMarkerBegin vkCmdDbgMarkerEnd vkAllocateCommandBuffers | None | NA | | Vtx Buffer Bounds | Check if VBO index too large for PSO Vtx binding count, and that at least one vertex buffer is attached to pipeline object | VTX_INDEX_OUT_OF_BOUNDS | vkCmdBindDescriptorSets vkCmdBindVertexBuffers | VtxBufferBadIndex | NA | | Idx Buffer Alignment | Verify that offset of Index buffer falls on an alignment boundary as defined by IdxBufferAlignmentError param | VTX_INDEX_ALIGNMENT_ERROR | vkCmdBindIndexBuffer | IdxBufferAlignmentError | NA | -| Cmd Buffer End | Verifies that EndCommandBuffer was called for this cmdBuffer at QueueSubmit time | NO_END_CMD_BUFFER | vkQueueSubmit | NoEndCmdBuffer | NA | -| Cmd Buffer Begin | Check that BeginCommandBuffer was called for this command buffer when binding commands or calling end | NO_BEGIN_CMD_BUFFER | vkEndCommandBuffer vkCmdBindPipeline vkCmdSetViewport vkCmdSetLineWidth vkCmdSetDepthBias vkCmdSetBlendConstants vkCmdSetDepthBounds vkCmdSetStencilCompareMask vkCmdSetStencilWriteMask vkCmdSetStencilReference vkCmdBindDescriptorSets vkCmdBindIndexBuffer vkCmdBindVertexBuffers vkCmdDraw vkCmdDrawIndexed vkCmdDrawIndirect vkCmdDrawIndexedIndirect vkCmdDispatch vkCmdDispatchIndirect vkCmdCopyBuffer vkCmdCopyImage vkCmdBlitImage vkCmdCopyBufferToImage vkCmdCopyImageToBuffer vkCmdUpdateBuffer vkCmdFillBuffer vkCmdClearAttachments vkCmdClearColorImage vkCmdClearDepthStencilImage vkCmdResolveImage vkCmdSetEvent vkCmdResetEvent vkCmdWaitEvents vkCmdPipelineBarrier vkCmdBeginQuery vkCmdEndQuery vkCmdResetQueryPool vkCmdWriteTimestamp | NoBeginCmdBuffer | NA | -| Cmd Buffer Submit Count | Verify that ONE_TIME submit cmdbuffer is not submitted multiple times | CMD_BUFFER_SINGLE_SUBMIT_VIOLATION | vkBeginCommandBuffer, vkQueueSubmit | CmdBufferTwoSubmits | NA | -| Valid Secondary CmdBuffer | Validates that no primary command buffers are sent to vkCmdExecuteCommands() are | INVALID_SECONDARY_CMD_BUFFER | vkCmdExecuteCommands | ExecuteCommandsPrimaryCB | NA | +| Cmd Buffer End | Verifies that EndCommandBuffer was called for this commandBuffer at QueueSubmit time | NO_END_COMMAND_BUFFER | vkQueueSubmit | NoEndCommandBuffer | NA | +| Cmd Buffer Begin | Check that BeginCommandBuffer was called for this command buffer when binding commands or calling end | NO_BEGIN_COMMAND_BUFFER | vkEndCommandBuffer vkCmdBindPipeline vkCmdSetViewport vkCmdSetLineWidth vkCmdSetDepthBias vkCmdSetBlendConstants vkCmdSetDepthBounds vkCmdSetStencilCompareMask vkCmdSetStencilWriteMask vkCmdSetStencilReference vkCmdBindDescriptorSets vkCmdBindIndexBuffer vkCmdBindVertexBuffers vkCmdDraw vkCmdDrawIndexed vkCmdDrawIndirect vkCmdDrawIndexedIndirect vkCmdDispatch vkCmdDispatchIndirect vkCmdCopyBuffer vkCmdCopyImage vkCmdBlitImage vkCmdCopyBufferToImage vkCmdCopyImageToBuffer vkCmdUpdateBuffer vkCmdFillBuffer vkCmdClearAttachments vkCmdClearColorImage vkCmdClearDepthStencilImage vkCmdResolveImage vkCmdSetEvent vkCmdResetEvent vkCmdWaitEvents vkCmdPipelineBarrier vkCmdBeginQuery vkCmdEndQuery vkCmdResetQueryPool vkCmdWriteTimestamp | NoBeginCommandBuffer | NA | +| Cmd Buffer Submit Count | Verify that ONE_TIME submit cmdbuffer is not submitted multiple times | COMMAND_BUFFER_SINGLE_SUBMIT_VIOLATION | vkBeginCommandBuffer, vkQueueSubmit | CommandBufferTwoSubmits | NA | +| Valid Secondary CommandBuffer | Validates that no primary command buffers are sent to vkCmdExecuteCommands() are | INVALID_SECONDARY_COMMAND_BUFFER | vkCmdExecuteCommands | ExecuteCommandsPrimaryCB | NA | | Descriptor Type | Verify Descriptor type in bound descriptor set layout matches descriptor type specified in update. This also includes mismatches in the TYPES of copied descriptors. | DESCRIPTOR_TYPE_MISMATCH | vkUpdateDescriptorSets | DSTypeMismatch CopyDescriptorUpdateErrors | NA | | Descriptor StageFlags | Verify all descriptors within a single write update have the same stageFlags | DESCRIPTOR_STAGEFLAGS_MISMATCH | vkUpdateDescriptorSets | NONE | Test this case | | DS Update Size | DS update out of bounds for given layout section. | DESCRIPTOR_UPDATE_OUT_OF_BOUNDS | vkUpdateDescriptorSets | DSUpdateOutOfBounds CopyDescriptorUpdateErrors | NA | -| Descriptor Pool empty | Attempt to allocate descriptor type from descriptor pool when no more of that type are available to be allocated. | DESCRIPTOR_POOL_EMPTY | vkAllocDescriptorSets | AllocDescriptorFromEmptyPool | NA | +| Descriptor Pool empty | Attempt to allocate descriptor type from descriptor pool when no more of that type are available to be allocated. | DESCRIPTOR_POOL_EMPTY | vkAllocateDescriptorSets | AllocDescriptorFromEmptyPool | NA | | Free from NON_FREE Pool | It's invalid to call vkFreeDescriptorSets() on Sets that were allocated from a Pool created with NON_FREE usage. | CANT_FREE_FROM_NON_FREE_POOL | vkFreeDescriptorSets | None | NA | | DS Update Index | DS update binding too large for layout binding count. | INVALID_UPDATE_INDEX | vkUpdateDescriptorSets | InvalidDSUpdateIndex CopyDescriptorUpdateErrors | NA | | DS Update Type | Verifies that structs in DS Update tree are properly created, currenly valid, and of the right type | INVALID_UPDATE_STRUCT | vkUpdateDescriptorSets | InvalidDSUpdateStruct | NA | @@ -84,7 +84,7 @@ Additional checks to be added to DrawState 26. vkFreeDescriptorSets must not be called for sets created on top of one-shot pool 27. If Cmd Buffer one-time submit flag is set, then verify that cmd buffer is only submitted once 28. Verify that all relevent dynamic state objects are bound (See https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14323) - 29. Flag an error if CmdBuffer has Begin called while it's being constructed - this is not a reset, this is a violation + 29. Flag an error if CommandBuffer has Begin called while it's being constructed - this is not a reset, this is a violation 30. At PSO creation time, there is no case when NOT including a FS should flag an error since there exist dynamic state configurations that can be set to cause a FS to not be required. Instead, in the case when no FS is in the PSO, validation should detect at runtime if dynamic state will require a FS, and in those case issue a runtime warning about undefined behavior. (see bug https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14429) 31. Error if a cmdbuffer is submitted on a queue whose family doesn't match the family of the pool from which it was created. 32. Update Gfx Pipe Create Info shadowing to remove new/delete and instead use unique_ptrs for auto clean-up @@ -99,8 +99,8 @@ The ParamChecker layer validates parameter values and flags errors for any value | Check | Overview | ENUM | Relevant API | Testname | Notes/TODO | | ----- | -------- | ---------------- | ------------ | -------- | ---------- | -| Input Parameters | Pointers in structures are recursively validated to be non-null. Enumerated types are validated against min and max enum values. Structure Types are verified to be correct. | NA | vkQueueSubmit vkAllocMemory vkFlushMappedMemoryRanges vkInvalidateMappedMemoryRanges vkQueueBindSparse vkCreateFence vkResetFences vkWaitForFences vkCreateSemaphore vkCreateEvent vkCreateQueryPool vkCreateBuffer vkCreateBufferView vkCreateImage vkGetImageSubresourceLayout vkCreateImageView vkCreateShader vkCreatePipelineCache vkMergePipelineCaches vkCreateGraphicsPipelines vkCreateComputePipelines vkCreatePipelineLayout vkCreateSampler vkCreateDescriptorSetLayout( vkCreateDescriptorPool vkAllocDescriptorSets vkFreeDescriptorSets vkUpdateDescriptorSets vkCreateFramebuffer vkCreateRenderPass vkCreateCommandPool vkAllocCommandBuffers vkBeginCommandBuffer vkCmdBindDescriptorSets vkCmdBindVertexBuffers vkCmdCopyBuffer vkCmdCopyImage vkCmdBlitImage vkCmdCopyBufferToImage vkCmdCopyImageToBuffer vkCmdUpdateBuffer vkCmdClearColorImage vkCmdClearDepthStencilImage vkCmdClearAttachments vkCmdResolveImage vkCmdWaitEvents vkCmdPipelineBarrier vkCmdPushConstants vkCmdBeginRenderPass vkCmdExecuteCommands | TBD | NA | -| Call results, Output Parameters | Return values are checked for VK_SUCCESS, returned pointers are checked to be NON-NULL, enumerated types of return values are checked to be within the defined range. | NA | vkEnumeratePhysicalDevices vkGetPhysicalDeviceFeatures vkGetPhysicalDeviceFormatProperties vkGetPhysicalDeviceImageFormatProperties vkGetPhysicalDeviceLimits vkGetPhysicalDeviceProperties vkGetPhysicalDeviceQueueFamilyProperties vkGetPhysicalDeviceMemoryProperties vkGetDeviceQueue vkQueueSubmit vkQueueWaitIdle vkDeviceWaitIdle vkAllocMemory vkFreeMemory vkMapMemory vkUnmapMemory vkFlushMappedMemoryRanges vkInvalidateMappedMemoryRanges vkGetDeviceMemoryCommitment vkBindBufferMemory vkBindImageMemory vkGetBufferMemoryRequirements vkGetImageMemoryRequirements vkGetImageSparseMemoryRequirements vkGetPhysicalDeviceSparseImageFormatProperties vkQueueBindSparse vkCreateFence vkDestroyFence vkResetFences vkGetFenceStatus vkWaitForFences vkCreateSemaphore vkDestroySemaphore vkCreateEvent vkDestroyEvent vkGetEventStatus vkSetEvent vkResetEvent vkCreateQueryPool vkDestroyQueryPool vkGetQueryPoolResults vkCreateBuffer vkDestroyBuffer vkCreateBufferView vkDestroyBufferView vkCreateImage vkDestroyImage vkGetImageSubresourceLayout vkCreateImageView vkDestroyImageView vkDestroyShaderModule vkCreateShader vkDestroyShader vkCreatePipelineCache vkDestroyPipelineCache vkGetPipelineCacheData vkMergePipelineCaches vkCreateGraphicsPipelines vkCreateComputePipelines vkDestroyPipeline vkCreatePipelineLayout vkDestroyPipelineLayout vkCreateSampler vkDestroySampler vkCreateDescriptorSetLayout vkDestroyDescriptorSetLayout vkCreateDescriptorPool vkDestroyDescriptorPool vkResetDescriptorPool vkAllocDescriptorSets vkFreeDescriptorSets vkUpdateDescriptorSets vkCreateFramebuffer vkDestroyFramebuffer vkCreateRenderPass vkDestroyRenderPass vkGetRenderAreaGranularity vkCreateCommandPool vkDestroyCommandPool vkResetCommandPool vkAllocCommandBuffers vkFreeCommandBuffers vkBeginCommandBuffer vkEndCommandBuffer vkResetCommandBuffer vkCmdBindPipeline vkCmdBindDescriptorSets vkCmdBindIndexBuffer vkCmdBindVertexBuffers vkCmdDraw vkCmdDrawIndexed vkCmdDrawIndirect vkCmdDrawIndexedIndirect vkCmdDispatch vkCmdDispatchIndirect vkCmdCopyBuffer vkCmdCopyImage vkCmdBlitImage vkCmdCopyBufferToImage vkCmdCopyImageToBuffer vkCmdUpdateBuffer vkCmdFillBuffer vkCmdClearColorImage vkCmdClearDepthStencilImage vkCmdClearAttachments vkCmdResolveImage vkCmdSetEvent vkCmdResetEvent vkCmdWaitEvents vkCmdPipelineBarrier vkCmdBeginQuery vkCmdEndQuery vkCmdResetQueryPool vkCmdWriteTimestamp vkCmdCopyQueryPoolResults vkCmdPushConstants vkCmdBeginRenderPass vkCmdNextSubpass vkCmdEndRenderPass vkCmdExecuteCommands | TBD | NA | +| Input Parameters | Pointers in structures are recursively validated to be non-null. Enumerated types are validated against min and max enum values. Structure Types are verified to be correct. | NA | vkQueueSubmit vkAllocateMemory vkFlushMappedMemoryRanges vkInvalidateMappedMemoryRanges vkQueueBindSparse vkCreateFence vkResetFences vkWaitForFences vkCreateSemaphore vkCreateEvent vkCreateQueryPool vkCreateBuffer vkCreateBufferView vkCreateImage vkGetImageSubresourceLayout vkCreateImageView vkCreateShader vkCreatePipelineCache vkMergePipelineCaches vkCreateGraphicsPipelines vkCreateComputePipelines vkCreatePipelineLayout vkCreateSampler vkCreateDescriptorSetLayout( vkCreateDescriptorPool vkAllocateDescriptorSets vkFreeDescriptorSets vkUpdateDescriptorSets vkCreateFramebuffer vkCreateRenderPass vkCreateCommandPool vkAllocateCommandBuffers vkBeginCommandBuffer vkCmdBindDescriptorSets vkCmdBindVertexBuffers vkCmdCopyBuffer vkCmdCopyImage vkCmdBlitImage vkCmdCopyBufferToImage vkCmdCopyImageToBuffer vkCmdUpdateBuffer vkCmdClearColorImage vkCmdClearDepthStencilImage vkCmdClearAttachments vkCmdResolveImage vkCmdWaitEvents vkCmdPipelineBarrier vkCmdPushConstants vkCmdBeginRenderPass vkCmdExecuteCommands | TBD | NA | +| Call results, Output Parameters | Return values are checked for VK_SUCCESS, returned pointers are checked to be NON-NULL, enumerated types of return values are checked to be within the defined range. | NA | vkEnumeratePhysicalDevices vkGetPhysicalDeviceFeatures vkGetPhysicalDeviceFormatProperties vkGetPhysicalDeviceImageFormatProperties vkGetPhysicalDeviceLimits vkGetPhysicalDeviceProperties vkGetPhysicalDeviceQueueFamilyProperties vkGetPhysicalDeviceMemoryProperties vkGetDeviceQueue vkQueueSubmit vkQueueWaitIdle vkDeviceWaitIdle vkAllocateMemory vkFreeMemory vkMapMemory vkUnmapMemory vkFlushMappedMemoryRanges vkInvalidateMappedMemoryRanges vkGetDeviceMemoryCommitment vkBindBufferMemory vkBindImageMemory vkGetBufferMemoryRequirements vkGetImageMemoryRequirements vkGetImageSparseMemoryRequirements vkGetPhysicalDeviceSparseImageFormatProperties vkQueueBindSparse vkCreateFence vkDestroyFence vkResetFences vkGetFenceStatus vkWaitForFences vkCreateSemaphore vkDestroySemaphore vkCreateEvent vkDestroyEvent vkGetEventStatus vkSetEvent vkResetEvent vkCreateQueryPool vkDestroyQueryPool vkGetQueryPoolResults vkCreateBuffer vkDestroyBuffer vkCreateBufferView vkDestroyBufferView vkCreateImage vkDestroyImage vkGetImageSubresourceLayout vkCreateImageView vkDestroyImageView vkDestroyShaderModule vkCreateShader vkDestroyShader vkCreatePipelineCache vkDestroyPipelineCache vkGetPipelineCacheData vkMergePipelineCaches vkCreateGraphicsPipelines vkCreateComputePipelines vkDestroyPipeline vkCreatePipelineLayout vkDestroyPipelineLayout vkCreateSampler vkDestroySampler vkCreateDescriptorSetLayout vkDestroyDescriptorSetLayout vkCreateDescriptorPool vkDestroyDescriptorPool vkResetDescriptorPool vkAllocateDescriptorSets vkFreeDescriptorSets vkUpdateDescriptorSets vkCreateFramebuffer vkDestroyFramebuffer vkCreateRenderPass vkDestroyRenderPass vkGetRenderAreaGranularity vkCreateCommandPool vkDestroyCommandPool vkResetCommandPool vkAllocateCommandBuffers vkFreeCommandBuffers vkBeginCommandBuffer vkEndCommandBuffer vkResetCommandBuffer vkCmdBindPipeline vkCmdBindDescriptorSets vkCmdBindIndexBuffer vkCmdBindVertexBuffers vkCmdDraw vkCmdDrawIndexed vkCmdDrawIndirect vkCmdDrawIndexedIndirect vkCmdDispatch vkCmdDispatchIndirect vkCmdCopyBuffer vkCmdCopyImage vkCmdBlitImage vkCmdCopyBufferToImage vkCmdCopyImageToBuffer vkCmdUpdateBuffer vkCmdFillBuffer vkCmdClearColorImage vkCmdClearDepthStencilImage vkCmdClearAttachments vkCmdResolveImage vkCmdSetEvent vkCmdResetEvent vkCmdWaitEvents vkCmdPipelineBarrier vkCmdBeginQuery vkCmdEndQuery vkCmdResetQueryPool vkCmdWriteTimestamp vkCmdCopyQueryPoolResults vkCmdPushConstants vkCmdBeginRenderPass vkCmdNextSubpass vkCmdEndRenderPass vkCmdExecuteCommands | TBD | NA | | NA | Enum used for informational messages | NONE | | NA | None | ### ParamChecker Pending Work @@ -162,7 +162,7 @@ The MemTracker layer tracks memory objects and references and validates that the | Bind Invalid Memory | Validate that memory object was correctly created, that the command buffer object was correctly created, and that both are currently valid objects. | MEMORY_BINDING_ERROR | vkQueueBindSparse vkCmdDrawIndirect vkCmdDrawIndexedIndirect vkCmdDispatchIndirect vkCmdCopyBuffer vkCmdCopyImage vkCmdBlitImage vkCmdCopyBufferToImage vkCmdCopyImageToBuffer vkCmdUpdateBuffer vkCmdFillBuffer vkCmdClearColorImage vkCmdClearDepthStencilImage vkCmdResolveImage | NA | The valid Object checks are primarily the responsibilty of ObjectTracker layer, so these checks are more of a backup in case ObjectTracker is not enabled | | Objects Not Destroyed | Verify all objects destroyed at DestroyDevice time | MEMORY_LEAK | vkDestroyDevice | NA | NA | | Memory Mapping State | Verifies that mapped memory is CPU-visible | INVALID_STATE | vkMapMemory | MapMemWithoutHostVisibleBit | NA | -| Command Buffer Synchronization | Command Buffer must be complete before BeginCommandBuffer or ResetCommandBuffer can be called | RESET_CB_WHILE_IN_FLIGHT | vkBeginCommandBuffer vkResetCommandBuffer | CallBeginCmdBufferBeforeCompletion CallBeginCmdBufferBeforeCompletion | NA | +| Command Buffer Synchronization | Command Buffer must be complete before BeginCommandBuffer or ResetCommandBuffer can be called | RESET_CB_WHILE_IN_FLIGHT | vkBeginCommandBuffer vkResetCommandBuffer | CallBeginCommandBufferBeforeCompletion CallBeginCommandBufferBeforeCompletion | NA | | Submitted Fence Status | Verifies that: The fence is not submitted in an already signaled state, that ResetFences is not called with a fence in an unsignaled state, and that fences being checked have been submitted | INVALID_FENCE_STATE | vkResetFences vkWaitForFences vkQueueSubmit vkGetFenceStatus | SubmitSignaledFence ResetUnsignaledFence | Create test(s) for case where an unsubmitted fence is having its status checked | | Immutable Memory Binding | Validates that non-sparse memory bindings are immutable, so objects are not re-boundt | REBIND_OBJECT | vkBindBufferMemory, vkBindImageMemory | RebindMemory | NA | | Image/Buffer Usage bits | Verify correct USAGE bits set based on how Images and Buffers are used | INVALID_USAGE_FLAG | vkCreateImage, vkCreateBuffer, vkCreateBufferView, vkCmdCopyBuffer, vkCmdCopyQueryPoolResults, vkCmdCopyImage, vkCmdBlitImage, vkCmdCopyBufferToImage, vkCmdCopyImageToBuffer, vkCmdUpdateBuffer, vkCmdFillBuffer | InvalidUsageBits | NA | @@ -226,7 +226,7 @@ The ObjectTracker layer maintains a record of all Vulkan objects. It flags error | Check | Overview | ENUM OBJTRACK_* | Relevant API | Testname | Notes/TODO | | ----- | -------- | ---------------- | ------------ | -------- | ---------- | -| Valid Object | Validates that referenced object was properly created and is currently valid. | INVALID_OBJECT | vkAcquireNextImageKHR vkAllocDescriptorSets vkAllocMemory vkBeginCommandBuffer vkBindBufferMemory vkBindImageMemory vkCmdBeginQuery vkCmdBeginRenderPass vkCmdBindDescriptorSets vkCmdBindIndexBuffer vkCmdBindPipeline vkCmdBindVertexBuffers vkCmdBlitImage vkCmdClearAttachments vkCmdClearColorImage vkCmdClearDepthStencilImage vkCmdCopyBuffer vkCmdCopyBufferToImage vkCmdCopyImage vkCmdCopyImageToBuffer vkCmdCopyQueryPoolResults vkCmdDispatch vkCmdDispatchIndirect vkCmdDraw vkCmdDrawIndexed vkCmdDrawIndexedIndirect vkCmdDrawIndirect vkCmdEndQuery vkCmdEndRenderPass vkCmdExecuteCommands vkCmdFillBuffer vkCmdNextSubpass vkCmdPipelineBarrier vkCmdPushConstants vkCmdResetEvent vkCmdResetQueryPool vkCmdResolveImage vkCmdSetEvent vkCmdUpdateBuffer vkCmdWaitEvents vkCmdWriteTimestamp vkCreateBuffer vkCreateBufferView vkAllocCommandBuffers vkCreateCommandPool vkCreateComputePipelines vkCreateDescriptorPool vkCreateDescriptorSetLayout vkCreateEvent vkCreateFence vkCreateFramebuffer vkCreateGraphicsPipelines vkCreateImage vkCreateImageView vkCreatePipelineCache vkCreatePipelineLayout vkCreateQueryPool vkCreateRenderPass vkCreateSampler vkCreateSemaphore vkCreateShader vkCreateShaderModule vkCreateSwapchainKHR vkDestroyBuffer vkDestroyBufferView vkFreeCommandBuffers vkDestroyCommandPool vkDestroyDescriptorPool vkDestroyDescriptorSetLayout vkDestroyEvent vkDestroyFence vkDestroyFramebuffer vkDestroyImage vkDestroyImageView vkDestroyPipeline vkDestroyPipelineCache vkDestroyPipelineLayout vkDestroyQueryPool vkDestroyRenderPass vkDestroySampler vkDestroySemaphore vkDestroyShader vkDestroyShaderModule vkDestroySwapchainKHR vkDeviceWaitIdle vkEndCommandBuffer vkEnumeratePhysicalDevices vkFreeDescriptorSets vkFreeMemory vkFreeMemory vkGetBufferMemoryRequirements vkGetDeviceMemoryCommitment vkGetDeviceQueue vkGetEventStatus vkGetFenceStatus vkGetImageMemoryRequirements vkGetImageSparseMemoryRequirements vkGetImageSubresourceLayout vkGetPhysicalDeviceSurfaceSupportKHR vkGetPipelineCacheData vkGetQueryPoolResults vkGetRenderAreaGranularity vkInvalidateMappedMemoryRanges vkMapMemory vkMergePipelineCaches vkQueueBindSparse vkResetCommandBuffer vkResetCommandPool vkResetDescriptorPool vkResetEvent vkResetFences vkSetEvent vkUnmapMemory vkUpdateDescriptorSets vkWaitForFences | BindInvalidMemory BindMemoryToDestroyedObject | Every VkObject class of parameter will be run through this check. This check may ultimately supersede UNKNOWN_OBJECT | +| Valid Object | Validates that referenced object was properly created and is currently valid. | INVALID_OBJECT | vkAcquireNextImageKHR vkAllocateDescriptorSets vkAllocateMemory vkBeginCommandBuffer vkBindBufferMemory vkBindImageMemory vkCmdBeginQuery vkCmdBeginRenderPass vkCmdBindDescriptorSets vkCmdBindIndexBuffer vkCmdBindPipeline vkCmdBindVertexBuffers vkCmdBlitImage vkCmdClearAttachments vkCmdClearColorImage vkCmdClearDepthStencilImage vkCmdCopyBuffer vkCmdCopyBufferToImage vkCmdCopyImage vkCmdCopyImageToBuffer vkCmdCopyQueryPoolResults vkCmdDispatch vkCmdDispatchIndirect vkCmdDraw vkCmdDrawIndexed vkCmdDrawIndexedIndirect vkCmdDrawIndirect vkCmdEndQuery vkCmdEndRenderPass vkCmdExecuteCommands vkCmdFillBuffer vkCmdNextSubpass vkCmdPipelineBarrier vkCmdPushConstants vkCmdResetEvent vkCmdResetQueryPool vkCmdResolveImage vkCmdSetEvent vkCmdUpdateBuffer vkCmdWaitEvents vkCmdWriteTimestamp vkCreateBuffer vkCreateBufferView vkAllocateCommandBuffers vkCreateCommandPool vkCreateComputePipelines vkCreateDescriptorPool vkCreateDescriptorSetLayout vkCreateEvent vkCreateFence vkCreateFramebuffer vkCreateGraphicsPipelines vkCreateImage vkCreateImageView vkCreatePipelineCache vkCreatePipelineLayout vkCreateQueryPool vkCreateRenderPass vkCreateSampler vkCreateSemaphore vkCreateShader vkCreateShaderModule vkCreateSwapchainKHR vkDestroyBuffer vkDestroyBufferView vkFreeCommandBuffers vkDestroyCommandPool vkDestroyDescriptorPool vkDestroyDescriptorSetLayout vkDestroyEvent vkDestroyFence vkDestroyFramebuffer vkDestroyImage vkDestroyImageView vkDestroyPipeline vkDestroyPipelineCache vkDestroyPipelineLayout vkDestroyQueryPool vkDestroyRenderPass vkDestroySampler vkDestroySemaphore vkDestroyShader vkDestroyShaderModule vkDestroySwapchainKHR vkDeviceWaitIdle vkEndCommandBuffer vkEnumeratePhysicalDevices vkFreeDescriptorSets vkFreeMemory vkFreeMemory vkGetBufferMemoryRequirements vkGetDeviceMemoryCommitment vkGetDeviceQueue vkGetEventStatus vkGetFenceStatus vkGetImageMemoryRequirements vkGetImageSparseMemoryRequirements vkGetImageSubresourceLayout vkGetPhysicalDeviceSurfaceSupportKHR vkGetPipelineCacheData vkGetQueryPoolResults vkGetRenderAreaGranularity vkInvalidateMappedMemoryRanges vkMapMemory vkMergePipelineCaches vkQueueBindSparse vkResetCommandBuffer vkResetCommandPool vkResetDescriptorPool vkResetEvent vkResetFences vkSetEvent vkUnmapMemory vkUpdateDescriptorSets vkWaitForFences | BindInvalidMemory BindMemoryToDestroyedObject | Every VkObject class of parameter will be run through this check. This check may ultimately supersede UNKNOWN_OBJECT | | Object Cleanup | Verify that object properly destroyed | DESTROY_OBJECT_FAILED | vkDestroyInstance, vkDestroyDevice, vkFreeMemory | ? | NA | | Objects Leak | When an Instance or Device object is destroyed, validates that all objects belonging to that device/instance have previously been destroyed | OBJECT_LEAK | vkDestroyDevice vkDestroyInstance | ? | NA | | Object Count | Flag error if number of objects requested from extenstion functions exceeds max number of actual objects | OBJCOUNT_MAX_EXCEEDED | objTrackGetObjects objTrackGetObjectsOfType | ? | NA | @@ -253,8 +253,8 @@ Application code is responsible for preventing simultaneous use of the same obje See [bug 13433](https://cvs.khronos.org/bugzilla/show_bug.cgi?id=13433) and <https://cvs.khronos.org/svn/repos/oglc/trunk/nextgen/vulkan/function_properties.csv> for threading rules. -Objects that may need a mutex include VkQueue, VkDeviceMemory, VkObject, VkBuffer, VkImage, VkDescriptorSet, VkDescriptorPool, VkCmdBuffer, and VkSemaphore. -The most common case is that a VkCmdBuffer passed to VkCmd* calls must be used by only one thread at a time. +Objects that may need a mutex include VkQueue, VkDeviceMemory, VkObject, VkBuffer, VkImage, VkDescriptorSet, VkDescriptorPool, VkCommandBuffer, and VkSemaphore. +The most common case is that a VkCommandBuffer passed to VkCmd* calls must be used by only one thread at a time. In addition to reporting threading rule violations, the layer will enforce a mutex for those calls. That can allow an application to continue running without actually crashing due to the reported threading problem. @@ -273,8 +273,8 @@ It cannot insure that there is no latent race condition. | Check | Overview | ENUM THREADING_CHECKER_* | Relevant API | Testname | Notes/TODO | | ----- | -------- | ---------------- | ---------------- | -------- | ---------- | -| Thread Collision | Detects and notifies user if multiple threads are modifying thes same object | MULTIPLE_THREADS | vkQueueSubmit vkFreeMemory vkMapMemory vkUnmapMemory vkFlushMappedMemoryRanges vkInvalidateMappedMemoryRanges vkBindBufferMemory vkBindImageMemory vkQueueBindSparse vkDestroySemaphore vkDestroyBuffer vkDestroyImage vkDestroyDescriptorPool vkResetDescriptorPool vkAllocDescriptorSets vkFreeDescriptorSets vkFreeCommandBuffers vkBeginCommandBuffer vkEndCommandBuffer vkResetCommandBuffer vkCmdBindPipeline vkCmdBindDescriptorSets vkCmdBindIndexBuffer vkCmdBindVertexBuffers vkCmdDraw vkCmdDrawIndexed vkCmdDrawIndirect vkCmdDrawIndexedIndirect vkCmdDispatch vkCmdDispatchIndirect vkCmdCopyBuffer vkCmdCopyImage vkCmdBlitImage vkCmdCopyBufferToImage vkCmdCopyImageToBuffer vkCmdUpdateBuffer vkCmdFillBuffer vkCmdClearColorImage vkCmdClearDepthStencilImage vkCmdClearAttachments vkCmdResolveImage vkCmdSetEvent vkCmdResetEvent vkCmdWaitEvents vkCmdPipelineBarrier vkCmdBeginQuery vkCmdEndQuery vkCmdResetQueryPool vkCmdWriteTimestamp vkCmdCopyQueryPoolResults vkCmdBeginRenderPass vkCmdNextSubpass vkCmdPushConstants vkCmdEndRenderPass vkCmdExecuteCommands | ??? | NA | -| Thread Reentrancy | Detects cases of a single thread calling Vulkan reentrantly | SINGLE_THREAD_REUSE | vkQueueSubmit vkFreeMemory vkMapMemory vkUnmapMemory vkFlushMappedMemoryRanges vkInvalidateMappedMemoryRanges vkBindBufferMemory vkBindImageMemory vkQueueBindSparse vkDestroySemaphore vkDestroyBuffer vkDestroyImage vkDestroyDescriptorPool vkResetDescriptorPool vkAllocDescriptorSets vkFreeDescriptorSets vkFreeCommandBuffers vkBeginCommandBuffer vkEndCommandBuffer vkResetCommandBuffer vkCmdBindPipeline vkCmdSetViewport vkCmdSetBlendConstants vkCmdSetLineWidth vkCmdSetDepthBias vkCmdSetDepthBounds vkCmdSetStencilCompareMask vkCmdSetStencilWriteMask vkCmdSetStencilReference vkCmdBindDescriptorSets vkCmdBindIndexBuffer vkCmdBindVertexBuffers vkCmdDraw vkCmdDrawIndexed vkCmdDrawIndirect vkCmdDrawIndexedIndirect vkCmdDispatch vkCmdDispatchIndirect vkCmdCopyBuffer vkCmdCopyImage vkCmdBlitImage vkCmdCopyBufferToImage vkCmdCopyImageToBuffer vkCmdUpdateBuffer vkCmdFillBuffer vkCmdClearColorImage vkCmdClearDepthStencilImage vkCmdClearAttachments vkCmdResolveImage vkCmdSetEvent vkCmdResetEvent vkCmdWaitEvents vkCmdPipelineBarrier vkCmdBeginQuery vkCmdEndQuery vkCmdResetQueryPool vkCmdWriteTimestamp vkCmdCopyQueryPoolResults vkCmdBeginRenderPass vkCmdNextSubpass vkCmdPushConstants vkCmdEndRenderPass vkCmdExecuteCommands | ??? | NA | +| Thread Collision | Detects and notifies user if multiple threads are modifying thes same object | MULTIPLE_THREADS | vkQueueSubmit vkFreeMemory vkMapMemory vkUnmapMemory vkFlushMappedMemoryRanges vkInvalidateMappedMemoryRanges vkBindBufferMemory vkBindImageMemory vkQueueBindSparse vkDestroySemaphore vkDestroyBuffer vkDestroyImage vkDestroyDescriptorPool vkResetDescriptorPool vkAllocateDescriptorSets vkFreeDescriptorSets vkFreeCommandBuffers vkBeginCommandBuffer vkEndCommandBuffer vkResetCommandBuffer vkCmdBindPipeline vkCmdBindDescriptorSets vkCmdBindIndexBuffer vkCmdBindVertexBuffers vkCmdDraw vkCmdDrawIndexed vkCmdDrawIndirect vkCmdDrawIndexedIndirect vkCmdDispatch vkCmdDispatchIndirect vkCmdCopyBuffer vkCmdCopyImage vkCmdBlitImage vkCmdCopyBufferToImage vkCmdCopyImageToBuffer vkCmdUpdateBuffer vkCmdFillBuffer vkCmdClearColorImage vkCmdClearDepthStencilImage vkCmdClearAttachments vkCmdResolveImage vkCmdSetEvent vkCmdResetEvent vkCmdWaitEvents vkCmdPipelineBarrier vkCmdBeginQuery vkCmdEndQuery vkCmdResetQueryPool vkCmdWriteTimestamp vkCmdCopyQueryPoolResults vkCmdBeginRenderPass vkCmdNextSubpass vkCmdPushConstants vkCmdEndRenderPass vkCmdExecuteCommands | ??? | NA | +| Thread Reentrancy | Detects cases of a single thread calling Vulkan reentrantly | SINGLE_THREAD_REUSE | vkQueueSubmit vkFreeMemory vkMapMemory vkUnmapMemory vkFlushMappedMemoryRanges vkInvalidateMappedMemoryRanges vkBindBufferMemory vkBindImageMemory vkQueueBindSparse vkDestroySemaphore vkDestroyBuffer vkDestroyImage vkDestroyDescriptorPool vkResetDescriptorPool vkAllocateDescriptorSets vkFreeDescriptorSets vkFreeCommandBuffers vkBeginCommandBuffer vkEndCommandBuffer vkResetCommandBuffer vkCmdBindPipeline vkCmdSetViewport vkCmdSetBlendConstants vkCmdSetLineWidth vkCmdSetDepthBias vkCmdSetDepthBounds vkCmdSetStencilCompareMask vkCmdSetStencilWriteMask vkCmdSetStencilReference vkCmdBindDescriptorSets vkCmdBindIndexBuffer vkCmdBindVertexBuffers vkCmdDraw vkCmdDrawIndexed vkCmdDrawIndirect vkCmdDrawIndexedIndirect vkCmdDispatch vkCmdDispatchIndirect vkCmdCopyBuffer vkCmdCopyImage vkCmdBlitImage vkCmdCopyBufferToImage vkCmdCopyImageToBuffer vkCmdUpdateBuffer vkCmdFillBuffer vkCmdClearColorImage vkCmdClearDepthStencilImage vkCmdClearAttachments vkCmdResolveImage vkCmdSetEvent vkCmdResetEvent vkCmdWaitEvents vkCmdPipelineBarrier vkCmdBeginQuery vkCmdEndQuery vkCmdResetQueryPool vkCmdWriteTimestamp vkCmdCopyQueryPoolResults vkCmdBeginRenderPass vkCmdNextSubpass vkCmdPushConstants vkCmdEndRenderPass vkCmdExecuteCommands | ??? | NA | | NA | Enum used for informational messages | NONE | | NA | None | ### Threading Pending Work @@ -362,7 +362,7 @@ APIDump layer is used for dumping a stream of all the Vulkan API calls that are ### APIDump Pending Work - 1. vkAllocDescriptorSets does not correctly print out all of the created DescriptorSets (no array printing following main API txt) + 1. vkAllocateDescriptorSets does not correctly print out all of the created DescriptorSets (no array printing following main API txt) ## General Pending Work diff --git a/loader/debug_report.c b/loader/debug_report.c index c1cca4f1..88c3fb05 100644 --- a/loader/debug_report.c +++ b/loader/debug_report.c @@ -42,7 +42,7 @@ typedef void (VKAPI *PFN_stringCallback)(char *message); static const VkExtensionProperties debug_report_extension_info = { - .extName = VK_DEBUG_REPORT_EXTENSION_NAME, + .extensionName = VK_DEBUG_REPORT_EXTENSION_NAME, .specVersion = VK_DEBUG_REPORT_EXTENSION_REVISION, }; @@ -74,7 +74,7 @@ static VkResult debug_report_DbgCreateMsgCallback( void* pUserData, VkDbgMsgCallback* pMsgCallback) { - VkLayerDbgFunctionNode *pNewDbgFuncNode = (VkLayerDbgFunctionNode *) loader_heap_alloc((struct loader_instance *)instance, sizeof(VkLayerDbgFunctionNode), VK_SYSTEM_ALLOC_SCOPE_OBJECT); + VkLayerDbgFunctionNode *pNewDbgFuncNode = (VkLayerDbgFunctionNode *) loader_heap_alloc((struct loader_instance *)instance, sizeof(VkLayerDbgFunctionNode), VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); if (!pNewDbgFuncNode) return VK_ERROR_OUT_OF_HOST_MEMORY; diff --git a/loader/gpa_helper.h b/loader/gpa_helper.h index f572c364..995d4f5f 100644 --- a/loader/gpa_helper.h +++ b/loader/gpa_helper.h @@ -73,8 +73,8 @@ static inline void* globalGetProcAddr(const char *name) return (void*) vkQueueWaitIdle; if (!strcmp(name, "DeviceWaitIdle")) return (void*) vkDeviceWaitIdle; - if (!strcmp(name, "AllocMemory")) - return (void*) vkAllocMemory; + if (!strcmp(name, "AllocateMemory")) + return (void*) vkAllocateMemory; if (!strcmp(name, "FreeMemory")) return (void*) vkFreeMemory; if (!strcmp(name, "MapMemory")) @@ -189,8 +189,8 @@ static inline void* globalGetProcAddr(const char *name) return (void*) vkDestroyDescriptorPool; if (!strcmp(name, "ResetDescriptorPool")) return (void*) vkResetDescriptorPool; - if (!strcmp(name, "AllocDescriptorSets")) - return (void*) vkAllocDescriptorSets; + if (!strcmp(name, "AllocateDescriptorSets")) + return (void*) vkAllocateDescriptorSets; if (!strcmp(name, "FreeDescriptorSets")) return (void*) vkFreeDescriptorSets; if (!strcmp(name, "UpdateDescriptorSets")) @@ -211,8 +211,8 @@ static inline void* globalGetProcAddr(const char *name) return (void*) vkDestroyCommandPool; if (!strcmp(name, "ResetCommandPool")) return (void*) vkResetCommandPool; - if (!strcmp(name, "AllocCommandBuffers")) - return (void*) vkAllocCommandBuffers; + if (!strcmp(name, "AllocateCommandBuffers")) + return (void*) vkAllocateCommandBuffers; if (!strcmp(name, "FreeCommandBuffers")) return (void*) vkFreeCommandBuffers; if (!strcmp(name, "BeginCommandBuffer")) @@ -356,8 +356,8 @@ static inline void *loader_non_passthrough_gdpa(const char *name) return (void*) vkDestroyDevice; if (!strcmp(name, "GetDeviceQueue")) return (void*) vkGetDeviceQueue; - if (!strcmp(name, "AllocCommandBuffers")) - return (void*) vkAllocCommandBuffers; + if (!strcmp(name, "AllocateCommandBuffers")) + return (void*) vkAllocateCommandBuffers; return NULL; } diff --git a/loader/loader.c b/loader/loader.c index 53fdbf37..c1ae2933 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -111,63 +111,63 @@ LOADER_PLATFORM_THREAD_ONCE_DECLARATION(once_init); void* loader_heap_alloc( const struct loader_instance *instance, size_t size, - VkSystemAllocScope alloc_scope) + VkSystemAllocationScope alloc_scope) { - if (instance && instance->alloc_callbacks.pfnAlloc) { + if (instance && instance->alloc_callbacks.pfnAllocation) { /* TODO: What should default alignment be? 1, 4, 8, other? */ - return instance->alloc_callbacks.pfnAlloc(instance->alloc_callbacks.pUserData, size, 4, alloc_scope); + return instance->alloc_callbacks.pfnAllocation(instance->alloc_callbacks.pUserData, size, 4, alloc_scope); } return malloc(size); } void loader_heap_free( const struct loader_instance *instance, - void *pMem) + void *pMemory) { - if (pMem == NULL) return; + if (pMemory == NULL) return; if (instance && instance->alloc_callbacks.pfnFree) { - instance->alloc_callbacks.pfnFree(instance->alloc_callbacks.pUserData, pMem); + instance->alloc_callbacks.pfnFree(instance->alloc_callbacks.pUserData, pMemory); return; } - free(pMem); + free(pMemory); } void* loader_heap_realloc( const struct loader_instance *instance, - void *pMem, + void *pMemory, size_t orig_size, size_t size, - VkSystemAllocScope alloc_scope) + VkSystemAllocationScope alloc_scope) { - if (pMem == NULL || orig_size == 0) + if (pMemory == NULL || orig_size == 0) return loader_heap_alloc(instance, size, alloc_scope); if (size == 0) { - loader_heap_free(instance, pMem); + loader_heap_free(instance, pMemory); return NULL; } - if (instance && instance->alloc_callbacks.pfnAlloc) { + if (instance && instance->alloc_callbacks.pfnAllocation) { if (size <= orig_size) { - memset(((uint8_t *)pMem) + size, 0, orig_size - size); - return pMem; + memset(((uint8_t *)pMemory) + size, 0, orig_size - size); + return pMemory; } - void *new_ptr = instance->alloc_callbacks.pfnAlloc(instance->alloc_callbacks.pUserData, size, 4, alloc_scope); + void *new_ptr = instance->alloc_callbacks.pfnAllocation(instance->alloc_callbacks.pUserData, size, 4, alloc_scope); if (!new_ptr) return NULL; - memcpy(new_ptr, pMem, orig_size); - instance->alloc_callbacks.pfnFree(instance->alloc_callbacks.pUserData, pMem); + memcpy(new_ptr, pMemory, orig_size); + instance->alloc_callbacks.pfnFree(instance->alloc_callbacks.pUserData, pMemory); return new_ptr; } - return realloc(pMem, size); + return realloc(pMemory, size); } void *loader_tls_heap_alloc(size_t size) { - return loader_heap_alloc(tls_instance, size, VK_SYSTEM_ALLOC_SCOPE_FUNCTION); + return loader_heap_alloc(tls_instance, size, VK_SYSTEM_ALLOCATION_SCOPE_FUNCTION); } -void loader_tls_heap_free(void *pMem) +void loader_tls_heap_free(void *pMemory) { - loader_heap_free(tls_instance, pMem); + loader_heap_free(tls_instance, pMemory); } static void loader_log(VkFlags msg_type, int32_t msg_code, @@ -247,11 +247,11 @@ static char *loader_get_registry_files(const struct loader_instance *inst, char while ((rtn_value = RegEnumValue(key, idx++, name, &name_size, NULL, NULL, (LPBYTE) &value, &value_size)) == ERROR_SUCCESS) { if (value_size == sizeof(value) && value == 0) { if (out == NULL) { - out = loader_heap_alloc(inst, total_size, VK_SYSTEM_ALLOC_TYPE_INTERNAL); + out = loader_heap_alloc(inst, total_size, VK_SYSTEM_ALLOCATION_TYPE_INTERNAL); out[0] = '\0'; } else if (strlen(out) + name_size + 1 > total_size) { - out = loader_heap_realloc(inst, out, total_size, total_size * 2, VK_SYSTEM_ALLOC_TYPE_INTERNAL); + out = loader_heap_realloc(inst, out, total_size, total_size * 2, VK_SYSTEM_ALLOCATION_TYPE_INTERNAL); total_size *= 2; } if (out == NULL) { @@ -363,7 +363,7 @@ static uint32_t loader_make_version(const char *vers_str) bool compare_vk_extension_properties(const VkExtensionProperties *op1, const VkExtensionProperties *op2) { - return strcmp(op1->extName, op2->extName) == 0 ? true : false; + return strcmp(op1->extensionName, op2->extensionName) == 0 ? true : false; } /** @@ -429,7 +429,7 @@ static struct loader_layer_properties *loader_get_next_layer_property( if (layer_list->capacity == 0) { layer_list->list = loader_heap_alloc(inst, sizeof(struct loader_layer_properties) * 64, - VK_SYSTEM_ALLOC_SCOPE_INSTANCE); + VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); if (layer_list->list == NULL) { loader_log(VK_DBG_REPORT_ERROR_BIT, 0, "Out of memory can't add any layer properties to list"); return NULL; @@ -444,7 +444,7 @@ static struct loader_layer_properties *loader_get_next_layer_property( layer_list->list = loader_heap_realloc(inst, layer_list->list, layer_list->capacity, layer_list->capacity * 2, - VK_SYSTEM_ALLOC_SCOPE_INSTANCE); + VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); if (layer_list->list == NULL) { loader_log(VK_DBG_REPORT_ERROR_BIT, 0, "realloc failed for layer list"); @@ -524,7 +524,7 @@ static void loader_add_global_extensions( VK_PATCH(ext_props[i].specVersion)); loader_log(VK_DBG_REPORT_DEBUG_BIT, 0, "Global Extension: %s (%s) version %s", - ext_props[i].extName, lib_name, spec_version); + ext_props[i].extensionName, lib_name, spec_version); loader_add_to_ext_list(inst, ext_list, 1, &ext_props[i]); } @@ -561,7 +561,7 @@ static void loader_add_physical_device_extensions( VK_PATCH(ext_props[i].specVersion)); loader_log(VK_DBG_REPORT_DEBUG_BIT, 0, "PhysicalDevice Extension: %s (%s) version %s", - ext_props[i].extName, lib_name, spec_version); + ext_props[i].extensionName, lib_name, spec_version); loader_add_to_ext_list(inst, ext_list, 1, &ext_props[i]); } } else { @@ -575,7 +575,7 @@ static bool loader_init_ext_list(const struct loader_instance *inst, struct loader_extension_list *ext_info) { ext_info->capacity = 32 * sizeof(VkExtensionProperties); - ext_info->list = loader_heap_alloc(inst, ext_info->capacity, VK_SYSTEM_ALLOC_SCOPE_INSTANCE); + ext_info->list = loader_heap_alloc(inst, ext_info->capacity, VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); if (ext_info->list == NULL) { return false; } @@ -629,7 +629,7 @@ void loader_add_to_ext_list( ext_list->list, ext_list->capacity, ext_list->capacity * 2, - VK_SYSTEM_ALLOC_SCOPE_INSTANCE); + VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); // double capacity ext_list->capacity *= 2; } @@ -676,7 +676,7 @@ static bool loader_init_layer_list(const struct loader_instance *inst, struct loader_layer_list *list) { list->capacity = 32 * sizeof(struct loader_layer_properties); - list->list = loader_heap_alloc(inst, list->capacity, VK_SYSTEM_ALLOC_SCOPE_INSTANCE); + list->list = loader_heap_alloc(inst, list->capacity, VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); if (list->list == NULL) { return false; } @@ -700,7 +700,7 @@ static bool loader_init_layer_library_list(const struct loader_instance *inst, struct loader_layer_library_list *list) { list->capacity = 32 * sizeof(struct loader_lib_info); - list->list = loader_heap_alloc(inst, list->capacity, VK_SYSTEM_ALLOC_SCOPE_INSTANCE); + list->list = loader_heap_alloc(inst, list->capacity, VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); if (list->list == NULL) { return false; } @@ -755,7 +755,7 @@ void loader_add_to_layer_library_list( list->list, list->capacity, list->capacity * 2, - VK_SYSTEM_ALLOC_SCOPE_INSTANCE); + VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); // double capacity list->capacity *= 2; } @@ -833,7 +833,7 @@ void loader_add_to_layer_list( list->list, list->capacity, list->capacity * 2, - VK_SYSTEM_ALLOC_SCOPE_INSTANCE); + VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); // double capacity list->capacity *= 2; } @@ -877,7 +877,7 @@ static VkExtensionProperties *get_extension_property( const struct loader_extension_list *list) { for (uint32_t i = 0; i < list->count; i++) { - if (strcmp(name, list->list[i].extName) == 0) + if (strcmp(name, list->list[i].extensionName) == 0) return &list->list[i]; } return NULL; @@ -958,7 +958,7 @@ static struct loader_device *loader_add_logical_device( { struct loader_device *new_dev; - new_dev = loader_heap_alloc(inst, sizeof(struct loader_device), VK_SYSTEM_ALLOC_SCOPE_DEVICE); + new_dev = loader_heap_alloc(inst, sizeof(struct loader_device), VK_SYSTEM_ALLOCATION_SCOPE_DEVICE); if (!new_dev) { loader_log(VK_DBG_REPORT_ERROR_BIT, 0, "Failed to alloc struct laoder-device"); return NULL; @@ -1017,7 +1017,7 @@ static struct loader_icd * loader_icd_create(const struct loader_instance *inst) { struct loader_icd *icd; - icd = loader_heap_alloc(inst, sizeof(*icd), VK_SYSTEM_ALLOC_SCOPE_INSTANCE); + icd = loader_heap_alloc(inst, sizeof(*icd), VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); if (!icd) return NULL; @@ -1068,7 +1068,7 @@ static void loader_scanned_icd_init(const struct loader_instance *inst, { loader_scanned_icd_clear(inst, icd_libs); icd_libs->capacity = 8 * sizeof(struct loader_scanned_icds); - icd_libs->list = loader_heap_alloc(inst, icd_libs->capacity, VK_SYSTEM_ALLOC_SCOPE_INSTANCE); + icd_libs->list = loader_heap_alloc(inst, icd_libs->capacity, VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); } @@ -1113,7 +1113,7 @@ static void loader_scanned_icd_add( icd_libs->list, icd_libs->capacity, icd_libs->capacity * 2, - VK_SYSTEM_ALLOC_SCOPE_INSTANCE); + VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); // double capacity icd_libs->capacity *= 2; } @@ -1126,7 +1126,7 @@ static void loader_scanned_icd_add( new_node->lib_name = (char *) loader_heap_alloc(inst, strlen(filename) + 1, - VK_SYSTEM_ALLOC_SCOPE_INSTANCE); + VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); if (!new_node->lib_name) { loader_log(VK_DBG_REPORT_WARN_BIT, 0, "Out of memory can't add icd"); return; @@ -1376,7 +1376,7 @@ static void loader_copy_layer_properties( inst, sizeof(VkExtensionProperties) * src->instance_extension_list.count, - VK_SYSTEM_ALLOC_SCOPE_INSTANCE); + VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); dst->instance_extension_list.capacity = sizeof(VkExtensionProperties) * src->instance_extension_list.count; memcpy(dst->instance_extension_list.list, src->instance_extension_list.list, @@ -1385,7 +1385,7 @@ static void loader_copy_layer_properties( inst, sizeof(VkExtensionProperties) * src->device_extension_list.count, - VK_SYSTEM_ALLOC_SCOPE_INSTANCE); + VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); dst->device_extension_list.capacity = sizeof(VkExtensionProperties) * src->device_extension_list.count; memcpy(dst->device_extension_list.list, src->device_extension_list.list, @@ -1532,7 +1532,7 @@ static void loader_add_layer_properties(const struct loader_instance *inst, loader_get_fullpath(library_path, DEFAULT_VK_LAYERS_PATH, MAX_STRING_SIZE, fullpath); } props->info.specVersion = loader_make_version(abi_versions); - props->info.implVersion = loader_make_version(implementation_version); + props->info.implementationVersion = loader_make_version(implementation_version); strncpy((char *) props->info.description, description, sizeof (props->info.description)); props->info.description[sizeof (props->info.description) - 1] = '\0'; if (is_implicit) { @@ -1583,8 +1583,8 @@ static void loader_add_layer_properties(const struct loader_instance *inst, ext_item = cJSON_GetArrayItem(instance_extensions, i); GET_JSON_ITEM(ext_item, name) GET_JSON_ITEM(ext_item, version) - strncpy(ext_prop.extName, name, sizeof (ext_prop.extName)); - ext_prop.extName[sizeof (ext_prop.extName) - 1] = '\0'; + strncpy(ext_prop.extensionName, name, sizeof (ext_prop.extensionName)); + ext_prop.extensionName[sizeof (ext_prop.extensionName) - 1] = '\0'; ext_prop.specVersion = loader_make_version(version); loader_add_to_ext_list(inst, &props->instance_extension_list, 1, &ext_prop); } @@ -1596,8 +1596,8 @@ static void loader_add_layer_properties(const struct loader_instance *inst, ext_item = cJSON_GetArrayItem(device_extensions, i); GET_JSON_ITEM(ext_item, name); GET_JSON_ITEM(ext_item, version); - strncpy(ext_prop.extName, name, sizeof (ext_prop.extName)); - ext_prop.extName[sizeof (ext_prop.extName) - 1] = '\0'; + strncpy(ext_prop.extensionName, name, sizeof (ext_prop.extensionName)); + ext_prop.extensionName[sizeof (ext_prop.extensionName) - 1] = '\0'; ext_prop.specVersion = loader_make_version(version); loader_add_to_ext_list(inst, &props->device_extension_list, 1, &ext_prop); } @@ -1759,14 +1759,14 @@ static void loader_get_manifest_files(const struct loader_instance *inst, if (out_files->count == 0) { out_files->filename_list = loader_heap_alloc(inst, alloced_count * sizeof(char *), - VK_SYSTEM_ALLOC_SCOPE_FUNCTION); + VK_SYSTEM_ALLOCATION_SCOPE_FUNCTION); } else if (out_files->count == alloced_count) { out_files->filename_list = loader_heap_realloc(inst, out_files->filename_list, alloced_count * sizeof(char *), alloced_count * sizeof(char *) * 2, - VK_SYSTEM_ALLOC_SCOPE_FUNCTION); + VK_SYSTEM_ALLOCATION_SCOPE_FUNCTION); alloced_count *= 2; } if (out_files->filename_list == NULL) { @@ -1776,7 +1776,7 @@ static void loader_get_manifest_files(const struct loader_instance *inst, out_files->filename_list[out_files->count] = loader_heap_alloc( inst, strlen(name) + 1, - VK_SYSTEM_ALLOC_SCOPE_FUNCTION); + VK_SYSTEM_ALLOCATION_SCOPE_FUNCTION); if (out_files->filename_list[out_files->count] == NULL) { loader_log(VK_DBG_REPORT_ERROR_BIT, 0, "Out of memory can't get manifest files"); return; @@ -2073,7 +2073,7 @@ static loader_platform_dl_handle loader_add_layer_lib( inst, loader.loaded_layer_lib_list, loader.loaded_layer_lib_capacity, new_alloc_size, - VK_SYSTEM_ALLOC_SCOPE_INSTANCE); + VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); if (!new_layer_lib_list) { loader_log(VK_DBG_REPORT_ERROR_BIT, 0, "loader: realloc failed in loader_add_layer_lib"); return NULL; @@ -2135,7 +2135,7 @@ static void loader_remove_layer_lib( /* Need to remove unused library from list */ new_layer_lib_list = loader_heap_alloc(inst, loader.loaded_layer_lib_capacity, - VK_SYSTEM_ALLOC_SCOPE_INSTANCE); + VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); if (!new_layer_lib_list) { loader_log(VK_DBG_REPORT_ERROR_BIT, 0, "loader: heap alloc failed loader_remove_layer_library"); return; @@ -2415,7 +2415,7 @@ static VkResult loader_enable_device_layers( static VkResult VKAPI scratch_vkCreateDevice( VkPhysicalDevice gpu, const VkDeviceCreateInfo *pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkDevice *pDevice) { return VK_SUCCESS; @@ -2457,7 +2457,7 @@ static uint32_t loader_activate_device_layers( wrappedGpus = loader_heap_alloc(inst, sizeof (VkBaseLayerObject) * dev->activated_layer_list.count, - VK_SYSTEM_ALLOC_SCOPE_INSTANCE); + VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); if (!wrappedGpus) { loader_log(VK_DBG_REPORT_ERROR_BIT, 0, "Failed to alloc Gpu objects for layer"); return 0; @@ -2613,7 +2613,7 @@ VkResult loader_validate_device_extensions( VkResult VKAPI loader_CreateInstance( const VkInstanceCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkInstance* pInstance) { struct loader_instance *ptr_instance = *(struct loader_instance **) pInstance; @@ -2627,7 +2627,7 @@ VkResult VKAPI loader_CreateInstance( icd_create_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; icd_create_info.enabledLayerNameCount = 0; icd_create_info.ppEnabledLayerNames = NULL; - icd_create_info.pAppInfo = pCreateInfo->pAppInfo; + icd_create_info.pApplicationInfo = pCreateInfo->pApplicationInfo; icd_create_info.pNext = pCreateInfo->pNext; /* @@ -2693,7 +2693,7 @@ VkResult VKAPI loader_CreateInstance( void VKAPI loader_DestroyInstance( VkInstance instance, - const VkAllocCallbacks* pAllocator) + const VkAllocationCallbacks* pAllocator) { struct loader_instance *ptr_instance = loader_instance(instance); struct loader_icd *icds = ptr_instance->icds; @@ -2757,7 +2757,7 @@ VkResult loader_init_physical_device_info( icd->gpus = (VkPhysicalDevice *) loader_heap_alloc( ptr_instance, n * sizeof(VkPhysicalDevice), - VK_SYSTEM_ALLOC_SCOPE_INSTANCE); + VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); if (!icd->gpus) { /* TODO: Add cleanup code here */ return VK_ERROR_OUT_OF_HOST_MEMORY; @@ -2930,7 +2930,7 @@ void VKAPI loader_GetPhysicalDeviceSparseImageFormatProperties( VkResult VKAPI loader_CreateDevice( VkPhysicalDevice gpu, const VkDeviceCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkDevice* pDevice) { uint32_t gpu_index; diff --git a/loader/loader.h b/loader/loader.h index 96dd2773..2e64e4b8 100644 --- a/loader/loader.h +++ b/loader/loader.h @@ -181,7 +181,7 @@ struct loader_instance { bool debug_report_enabled; VkLayerDbgFunctionNode *DbgFunctionHead; - VkAllocCallbacks alloc_callbacks; + VkAllocationCallbacks alloc_callbacks; bool wsi_swapchain_enabled; }; @@ -265,12 +265,12 @@ VkResult loader_validate_instance_extensions( /* instance layer chain termination entrypoint definitions */ VkResult VKAPI loader_CreateInstance( const VkInstanceCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkInstance* pInstance); void VKAPI loader_DestroyInstance( VkInstance instance, - const VkAllocCallbacks* pAllocator); + const VkAllocationCallbacks* pAllocator); VkResult VKAPI loader_EnumeratePhysicalDevices( VkInstance instance, @@ -328,7 +328,7 @@ void VKAPI loader_GetPhysicalDeviceMemoryProperties ( VkResult VKAPI loader_CreateDevice( VkPhysicalDevice gpu, const VkDeviceCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkDevice* pDevice); /* helper function definitions */ @@ -393,13 +393,13 @@ void loader_activate_instance_layer_extensions(struct loader_instance *inst); void* loader_heap_alloc( const struct loader_instance *instance, size_t size, - VkSystemAllocScope allocScope); + VkSystemAllocationScope allocationScope); void loader_heap_free( const struct loader_instance *instance, - void *pMem); + void *pMemory); void *loader_tls_heap_alloc(size_t size); -void loader_tls_heap_free(void *pMem); +void loader_tls_heap_free(void *pMemory); #endif /* LOADER_H */ diff --git a/loader/table_ops.h b/loader/table_ops.h index d4a167e7..29bdc389 100644 --- a/loader/table_ops.h +++ b/loader/table_ops.h @@ -43,7 +43,7 @@ static inline void loader_init_device_dispatch_table(VkLayerDispatchTable *table table->QueueSubmit = (PFN_vkQueueSubmit) gpa(dev, "vkQueueSubmit"); table->QueueWaitIdle = (PFN_vkQueueWaitIdle) gpa(dev, "vkQueueWaitIdle"); table->DeviceWaitIdle = (PFN_vkDeviceWaitIdle) gpa(dev, "vkDeviceWaitIdle"); - table->AllocMemory = (PFN_vkAllocMemory) gpa(dev, "vkAllocMemory"); + table->AllocateMemory = (PFN_vkAllocateMemory) gpa(dev, "vkAllocateMemory"); table->FreeMemory = (PFN_vkFreeMemory) gpa(dev, "vkFreeMemory"); table->MapMemory = (PFN_vkMapMemory) gpa(dev, "vkMapMemory"); table->UnmapMemory = (PFN_vkUnmapMemory) gpa(dev, "vkUnmapMemory"); @@ -100,7 +100,7 @@ static inline void loader_init_device_dispatch_table(VkLayerDispatchTable *table table->CreateDescriptorPool = (PFN_vkCreateDescriptorPool) gpa(dev, "vkCreateDescriptorPool"); table->DestroyDescriptorPool = (PFN_vkDestroyDescriptorPool) gpa(dev, "vkDestroyDescriptorPool"); table->ResetDescriptorPool = (PFN_vkResetDescriptorPool) gpa(dev, "vkResetDescriptorPool"); - table->AllocDescriptorSets = (PFN_vkAllocDescriptorSets) gpa(dev, "vkAllocDescriptorSets"); + table->AllocateDescriptorSets = (PFN_vkAllocateDescriptorSets) gpa(dev, "vkAllocateDescriptorSets"); table->FreeDescriptorSets = (PFN_vkFreeDescriptorSets) gpa(dev, "vkFreeDescriptorSets"); table->UpdateDescriptorSets = (PFN_vkUpdateDescriptorSets) gpa(dev, "vkUpdateDescriptorSets"); table->CreateFramebuffer = (PFN_vkCreateFramebuffer) gpa(dev, "vkCreateFramebuffer"); @@ -111,7 +111,7 @@ static inline void loader_init_device_dispatch_table(VkLayerDispatchTable *table table->CreateCommandPool = (PFN_vkCreateCommandPool) gpa(dev, "vkCreateCommandPool"); table->DestroyCommandPool = (PFN_vkDestroyCommandPool) gpa(dev, "vkDestroyCommandPool"); table->ResetCommandPool = (PFN_vkResetCommandPool) gpa(dev, "vkResetCommandPool"); - table->AllocCommandBuffers = (PFN_vkAllocCommandBuffers) gpa(dev, "vkAllocCommandBuffers"); + table->AllocateCommandBuffers = (PFN_vkAllocateCommandBuffers) gpa(dev, "vkAllocateCommandBuffers"); table->FreeCommandBuffers = (PFN_vkFreeCommandBuffers) gpa(dev, "vkFreeCommandBuffers"); table->BeginCommandBuffer = (PFN_vkBeginCommandBuffer) gpa(dev, "vkBeginCommandBuffer"); table->EndCommandBuffer = (PFN_vkEndCommandBuffer) gpa(dev, "vkEndCommandBuffer"); @@ -195,8 +195,8 @@ static inline void *loader_lookup_device_dispatch_table( return (void *) table->QueueWaitIdle; if (!strcmp(name, "DeviceWaitIdle")) return (void *) table->DeviceWaitIdle; - if (!strcmp(name, "AllocMemory")) - return (void *) table->AllocMemory; + if (!strcmp(name, "AllocateMemory")) + return (void *) table->AllocateMemory; if (!strcmp(name, "FreeMemory")) return (void *) table->FreeMemory; if (!strcmp(name, "MapMemory")) @@ -309,8 +309,8 @@ static inline void *loader_lookup_device_dispatch_table( return (void *) table->DestroyDescriptorPool; if (!strcmp(name, "ResetDescriptorPool")) return (void *) table->ResetDescriptorPool; - if (!strcmp(name, "AllocDescriptorSets")) - return (void *) table->AllocDescriptorSets; + if (!strcmp(name, "AllocateDescriptorSets")) + return (void *) table->AllocateDescriptorSets; if (!strcmp(name, "FreeDescriptorSets")) return (void *) table->FreeDescriptorSets; if (!strcmp(name, "UpdateDescriptorSets")) @@ -331,8 +331,8 @@ static inline void *loader_lookup_device_dispatch_table( return (void *) table->DestroyCommandPool; if (!strcmp(name, "ResetCommandPool")) return (void *) table->ResetCommandPool; - if (!strcmp(name, "AllocCommandBuffers")) - return (void *) table->AllocCommandBuffers; + if (!strcmp(name, "AllocateCommandBuffers")) + return (void *) table->AllocateCommandBuffers; if (!strcmp(name, "FreeCommandBuffers")) return (void *) table->FreeCommandBuffers; if (!strcmp(name, "BeginCommandBuffer")) diff --git a/loader/trampoline.c b/loader/trampoline.c index 2a240f15..fb863f67 100644 --- a/loader/trampoline.c +++ b/loader/trampoline.c @@ -34,7 +34,7 @@ /* Trampoline entrypoints */ LOADER_EXPORT VkResult VKAPI vkCreateInstance( const VkInstanceCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkInstance* pInstance) { struct loader_instance *ptr_instance = NULL; @@ -43,11 +43,11 @@ LOADER_EXPORT VkResult VKAPI vkCreateInstance( loader_platform_thread_once(&once_init, loader_initialize); if (pAllocator) { - ptr_instance = (struct loader_instance *) pAllocator->pfnAlloc( + ptr_instance = (struct loader_instance *) pAllocator->pfnAllocation( pAllocator->pUserData, sizeof(struct loader_instance), sizeof(VkInstance), - VK_SYSTEM_ALLOC_SCOPE_INSTANCE); + VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); } else { ptr_instance = (struct loader_instance *) malloc(sizeof(struct loader_instance)); } @@ -111,7 +111,7 @@ LOADER_EXPORT VkResult VKAPI vkCreateInstance( ptr_instance->disp = loader_heap_alloc( ptr_instance, sizeof(VkLayerInstanceDispatchTable), - VK_SYSTEM_ALLOC_SCOPE_INSTANCE); + VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); if (ptr_instance->disp == NULL) { loader_delete_layer_properties(ptr_instance, &ptr_instance->device_layer_list); @@ -172,7 +172,7 @@ LOADER_EXPORT VkResult VKAPI vkCreateInstance( LOADER_EXPORT void VKAPI vkDestroyInstance( VkInstance instance, - const VkAllocCallbacks* pAllocator) + const VkAllocationCallbacks* pAllocator) { const VkLayerInstanceDispatchTable *disp; struct loader_instance *ptr_instance = NULL; @@ -273,7 +273,7 @@ LOADER_EXPORT void VKAPI vkGetPhysicalDeviceMemoryProperties( LOADER_EXPORT VkResult VKAPI vkCreateDevice( VkPhysicalDevice gpu, const VkDeviceCreateInfo* pCreateInfo, - const VkAllocCallbacks* pAllocator, + const VkAllocationCallbacks* pAllocator, VkDevice* pDevice) { VkResult res; @@ -286,7 +286,7 @@ LOADER_EXPORT VkResult VKAPI vkCreateDevice( return res; } -LOADER_EXPORT void VKAPI vkDestroyDevice(VkDevice device, const VkAllocCallbacks* pAllocator) +LOADER_EXPORT void VKAPI vkDestroyDevice(VkDevice device, const VkAllocationCallbacks* pAllocator) { const VkLayerDispatchTable *disp; struct loader_device *dev; @@ -366,16 +366,16 @@ LOADER_EXPORT VkResult VKAPI vkDeviceWaitIdle(VkDevice device) return disp->DeviceWaitIdle(device); } -LOADER_EXPORT VkResult VKAPI vkAllocMemory(VkDevice device, const VkMemoryAllocInfo* pAllocInfo, const VkAllocCallbacks* pAllocator, VkDeviceMemory* pMem) +LOADER_EXPORT VkResult VKAPI vkAllocateMemory(VkDevice device, const VkMemoryAllocateInfo* pAllocateInfo, const VkAllocationCallbacks* pAllocator, VkDeviceMemory* pMemory) { const VkLayerDispatchTable *disp; disp = loader_get_dispatch(device); - return disp->AllocMemory(device, pAllocInfo, pAllocator, pMem); + return disp->AllocateMemory(device, pAllocateInfo, pAllocator, pMemory); } -LOADER_EXPORT void VKAPI vkFreeMemory(VkDevice device, VkDeviceMemory mem, const VkAllocCallbacks* pAllocator) +LOADER_EXPORT void VKAPI vkFreeMemory(VkDevice device, VkDeviceMemory mem, const VkAllocationCallbacks* pAllocator) { const VkLayerDispatchTable *disp; @@ -402,22 +402,22 @@ LOADER_EXPORT void VKAPI vkUnmapMemory(VkDevice device, VkDeviceMemory mem) disp->UnmapMemory(device, mem); } -LOADER_EXPORT VkResult VKAPI vkFlushMappedMemoryRanges(VkDevice device, uint32_t memRangeCount, const VkMappedMemoryRange* pMemRanges) +LOADER_EXPORT VkResult VKAPI vkFlushMappedMemoryRanges(VkDevice device, uint32_t memoryRangeCount, const VkMappedMemoryRange* pMemoryRanges) { const VkLayerDispatchTable *disp; disp = loader_get_dispatch(device); - return disp->FlushMappedMemoryRanges(device, memRangeCount, pMemRanges); + return disp->FlushMappedMemoryRanges(device, memoryRangeCount, pMemoryRanges); } -LOADER_EXPORT VkResult VKAPI vkInvalidateMappedMemoryRanges(VkDevice device, uint32_t memRangeCount, const VkMappedMemoryRange* pMemRanges) +LOADER_EXPORT VkResult VKAPI vkInvalidateMappedMemoryRanges(VkDevice device, uint32_t memoryRangeCount, const VkMappedMemoryRange* pMemoryRanges) { const VkLayerDispatchTable *disp; disp = loader_get_dispatch(device); - return disp->InvalidateMappedMemoryRanges(device, memRangeCount, pMemRanges); + return disp->InvalidateMappedMemoryRanges(device, memoryRangeCount, pMemoryRanges); } LOADER_EXPORT void VKAPI vkGetDeviceMemoryCommitment(VkDevice device, VkDeviceMemory memory, VkDeviceSize* pCommittedMemoryInBytes) @@ -492,7 +492,7 @@ LOADER_EXPORT VkResult VKAPI vkQueueBindSparse(VkQueue queue, uint32_t bindInfoC return disp->QueueBindSparse(queue, bindInfoCount, pBindInfo, fence); } -LOADER_EXPORT VkResult VKAPI vkCreateFence(VkDevice device, const VkFenceCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkFence* pFence) +LOADER_EXPORT VkResult VKAPI vkCreateFence(VkDevice device, const VkFenceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkFence* pFence) { const VkLayerDispatchTable *disp; @@ -501,7 +501,7 @@ LOADER_EXPORT VkResult VKAPI vkCreateFence(VkDevice device, const VkFenceCreateI return disp->CreateFence(device, pCreateInfo, pAllocator, pFence); } -LOADER_EXPORT void VKAPI vkDestroyFence(VkDevice device, VkFence fence, const VkAllocCallbacks* pAllocator) +LOADER_EXPORT void VKAPI vkDestroyFence(VkDevice device, VkFence fence, const VkAllocationCallbacks* pAllocator) { const VkLayerDispatchTable *disp; @@ -537,7 +537,7 @@ LOADER_EXPORT VkResult VKAPI vkWaitForFences(VkDevice device, uint32_t fenceCoun return disp->WaitForFences(device, fenceCount, pFences, waitAll, timeout); } -LOADER_EXPORT VkResult VKAPI vkCreateSemaphore(VkDevice device, const VkSemaphoreCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkSemaphore* pSemaphore) +LOADER_EXPORT VkResult VKAPI vkCreateSemaphore(VkDevice device, const VkSemaphoreCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSemaphore* pSemaphore) { const VkLayerDispatchTable *disp; @@ -546,7 +546,7 @@ LOADER_EXPORT VkResult VKAPI vkCreateSemaphore(VkDevice device, const VkSemaphor return disp->CreateSemaphore(device, pCreateInfo, pAllocator, pSemaphore); } -LOADER_EXPORT void VKAPI vkDestroySemaphore(VkDevice device, VkSemaphore semaphore, const VkAllocCallbacks* pAllocator) +LOADER_EXPORT void VKAPI vkDestroySemaphore(VkDevice device, VkSemaphore semaphore, const VkAllocationCallbacks* pAllocator) { const VkLayerDispatchTable *disp; @@ -555,7 +555,7 @@ LOADER_EXPORT void VKAPI vkDestroySemaphore(VkDevice device, VkSemaphore semapho disp->DestroySemaphore(device, semaphore, pAllocator); } -LOADER_EXPORT VkResult VKAPI vkCreateEvent(VkDevice device, const VkEventCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkEvent* pEvent) +LOADER_EXPORT VkResult VKAPI vkCreateEvent(VkDevice device, const VkEventCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkEvent* pEvent) { const VkLayerDispatchTable *disp; @@ -564,7 +564,7 @@ LOADER_EXPORT VkResult VKAPI vkCreateEvent(VkDevice device, const VkEventCreateI return disp->CreateEvent(device, pCreateInfo, pAllocator, pEvent); } -LOADER_EXPORT void VKAPI vkDestroyEvent(VkDevice device, VkEvent event, const VkAllocCallbacks* pAllocator) +LOADER_EXPORT void VKAPI vkDestroyEvent(VkDevice device, VkEvent event, const VkAllocationCallbacks* pAllocator) { const VkLayerDispatchTable *disp; @@ -600,7 +600,7 @@ LOADER_EXPORT VkResult VKAPI vkResetEvent(VkDevice device, VkEvent event) return disp->ResetEvent(device, event); } -LOADER_EXPORT VkResult VKAPI vkCreateQueryPool(VkDevice device, const VkQueryPoolCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkQueryPool* pQueryPool) +LOADER_EXPORT VkResult VKAPI vkCreateQueryPool(VkDevice device, const VkQueryPoolCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkQueryPool* pQueryPool) { const VkLayerDispatchTable *disp; @@ -609,7 +609,7 @@ LOADER_EXPORT VkResult VKAPI vkCreateQueryPool(VkDevice device, const VkQueryPoo return disp->CreateQueryPool(device, pCreateInfo, pAllocator, pQueryPool); } -LOADER_EXPORT void VKAPI vkDestroyQueryPool(VkDevice device, VkQueryPool queryPool, const VkAllocCallbacks* pAllocator) +LOADER_EXPORT void VKAPI vkDestroyQueryPool(VkDevice device, VkQueryPool queryPool, const VkAllocationCallbacks* pAllocator) { const VkLayerDispatchTable *disp; @@ -627,7 +627,7 @@ LOADER_EXPORT VkResult VKAPI vkGetQueryPoolResults(VkDevice device, VkQueryPool return disp->GetQueryPoolResults(device, queryPool, startQuery, queryCount, dataSize, pData, stride, flags); } -LOADER_EXPORT VkResult VKAPI vkCreateBuffer(VkDevice device, const VkBufferCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkBuffer* pBuffer) +LOADER_EXPORT VkResult VKAPI vkCreateBuffer(VkDevice device, const VkBufferCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkBuffer* pBuffer) { const VkLayerDispatchTable *disp; @@ -636,7 +636,7 @@ LOADER_EXPORT VkResult VKAPI vkCreateBuffer(VkDevice device, const VkBufferCreat return disp->CreateBuffer(device, pCreateInfo, pAllocator, pBuffer); } -LOADER_EXPORT void VKAPI vkDestroyBuffer(VkDevice device, VkBuffer buffer, const VkAllocCallbacks* pAllocator) +LOADER_EXPORT void VKAPI vkDestroyBuffer(VkDevice device, VkBuffer buffer, const VkAllocationCallbacks* pAllocator) { const VkLayerDispatchTable *disp; @@ -645,7 +645,7 @@ LOADER_EXPORT void VKAPI vkDestroyBuffer(VkDevice device, VkBuffer buffer, const disp->DestroyBuffer(device, buffer, pAllocator); } -LOADER_EXPORT VkResult VKAPI vkCreateBufferView(VkDevice device, const VkBufferViewCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkBufferView* pView) +LOADER_EXPORT VkResult VKAPI vkCreateBufferView(VkDevice device, const VkBufferViewCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkBufferView* pView) { const VkLayerDispatchTable *disp; @@ -654,7 +654,7 @@ LOADER_EXPORT VkResult VKAPI vkCreateBufferView(VkDevice device, const VkBufferV return disp->CreateBufferView(device, pCreateInfo, pAllocator, pView); } -LOADER_EXPORT void VKAPI vkDestroyBufferView(VkDevice device, VkBufferView bufferView, const VkAllocCallbacks* pAllocator) +LOADER_EXPORT void VKAPI vkDestroyBufferView(VkDevice device, VkBufferView bufferView, const VkAllocationCallbacks* pAllocator) { const VkLayerDispatchTable *disp; @@ -663,7 +663,7 @@ LOADER_EXPORT void VKAPI vkDestroyBufferView(VkDevice device, VkBufferView buffe disp->DestroyBufferView(device, bufferView, pAllocator); } -LOADER_EXPORT VkResult VKAPI vkCreateImage(VkDevice device, const VkImageCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkImage* pImage) +LOADER_EXPORT VkResult VKAPI vkCreateImage(VkDevice device, const VkImageCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkImage* pImage) { const VkLayerDispatchTable *disp; @@ -672,7 +672,7 @@ LOADER_EXPORT VkResult VKAPI vkCreateImage(VkDevice device, const VkImageCreateI return disp->CreateImage(device, pCreateInfo, pAllocator, pImage); } -LOADER_EXPORT void VKAPI vkDestroyImage(VkDevice device, VkImage image, const VkAllocCallbacks* pAllocator) +LOADER_EXPORT void VKAPI vkDestroyImage(VkDevice device, VkImage image, const VkAllocationCallbacks* pAllocator) { const VkLayerDispatchTable *disp; @@ -690,7 +690,7 @@ LOADER_EXPORT void VKAPI vkGetImageSubresourceLayout(VkDevice device, VkImage im disp->GetImageSubresourceLayout(device, image, pSubresource, pLayout); } -LOADER_EXPORT VkResult VKAPI vkCreateImageView(VkDevice device, const VkImageViewCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkImageView* pView) +LOADER_EXPORT VkResult VKAPI vkCreateImageView(VkDevice device, const VkImageViewCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkImageView* pView) { const VkLayerDispatchTable *disp; @@ -699,7 +699,7 @@ LOADER_EXPORT VkResult VKAPI vkCreateImageView(VkDevice device, const VkImageVie return disp->CreateImageView(device, pCreateInfo, pAllocator, pView); } -LOADER_EXPORT void VKAPI vkDestroyImageView(VkDevice device, VkImageView imageView, const VkAllocCallbacks* pAllocator) +LOADER_EXPORT void VKAPI vkDestroyImageView(VkDevice device, VkImageView imageView, const VkAllocationCallbacks* pAllocator) { const VkLayerDispatchTable *disp; @@ -708,7 +708,7 @@ LOADER_EXPORT void VKAPI vkDestroyImageView(VkDevice device, VkImageView imageVi disp->DestroyImageView(device, imageView, pAllocator); } -LOADER_EXPORT VkResult VKAPI vkCreateShaderModule(VkDevice device, const VkShaderModuleCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkShaderModule* pShader) +LOADER_EXPORT VkResult VKAPI vkCreateShaderModule(VkDevice device, const VkShaderModuleCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkShaderModule* pShader) { const VkLayerDispatchTable *disp; @@ -717,7 +717,7 @@ LOADER_EXPORT VkResult VKAPI vkCreateShaderModule(VkDevice device, const VkShade return disp->CreateShaderModule(device, pCreateInfo, pAllocator, pShader); } -LOADER_EXPORT void VKAPI vkDestroyShaderModule(VkDevice device, VkShaderModule shaderModule, const VkAllocCallbacks* pAllocator) +LOADER_EXPORT void VKAPI vkDestroyShaderModule(VkDevice device, VkShaderModule shaderModule, const VkAllocationCallbacks* pAllocator) { const VkLayerDispatchTable *disp; @@ -726,7 +726,7 @@ LOADER_EXPORT void VKAPI vkDestroyShaderModule(VkDevice device, VkShaderModule s disp->DestroyShaderModule(device, shaderModule, pAllocator); } -LOADER_EXPORT VkResult VKAPI vkCreateShader(VkDevice device, const VkShaderCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkShader* pShader) +LOADER_EXPORT VkResult VKAPI vkCreateShader(VkDevice device, const VkShaderCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkShader* pShader) { const VkLayerDispatchTable *disp; @@ -735,7 +735,7 @@ LOADER_EXPORT VkResult VKAPI vkCreateShader(VkDevice device, const VkShaderCreat return disp->CreateShader(device, pCreateInfo, pAllocator, pShader); } -LOADER_EXPORT void VKAPI vkDestroyShader(VkDevice device, VkShader shader, const VkAllocCallbacks* pAllocator) +LOADER_EXPORT void VKAPI vkDestroyShader(VkDevice device, VkShader shader, const VkAllocationCallbacks* pAllocator) { const VkLayerDispatchTable *disp; @@ -744,7 +744,7 @@ LOADER_EXPORT void VKAPI vkDestroyShader(VkDevice device, VkShader shader, const disp->DestroyShader(device, shader, pAllocator); } -LOADER_EXPORT VkResult VKAPI vkCreatePipelineCache(VkDevice device, const VkPipelineCacheCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkPipelineCache* pPipelineCache) +LOADER_EXPORT VkResult VKAPI vkCreatePipelineCache(VkDevice device, const VkPipelineCacheCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkPipelineCache* pPipelineCache) { const VkLayerDispatchTable *disp; @@ -753,7 +753,7 @@ LOADER_EXPORT VkResult VKAPI vkCreatePipelineCache(VkDevice device, const VkPipe return disp->CreatePipelineCache(device, pCreateInfo, pAllocator, pPipelineCache); } -LOADER_EXPORT void VKAPI vkDestroyPipelineCache(VkDevice device, VkPipelineCache pipelineCache, const VkAllocCallbacks* pAllocator) +LOADER_EXPORT void VKAPI vkDestroyPipelineCache(VkDevice device, VkPipelineCache pipelineCache, const VkAllocationCallbacks* pAllocator) { const VkLayerDispatchTable *disp; @@ -771,16 +771,16 @@ LOADER_EXPORT VkResult VKAPI vkGetPipelineCacheData(VkDevice device, VkPipelineC return disp->GetPipelineCacheData(device, pipelineCache, pDataSize, pData); } -LOADER_EXPORT VkResult VKAPI vkMergePipelineCaches(VkDevice device, VkPipelineCache destCache, uint32_t srcCacheCount, const VkPipelineCache* pSrcCaches) +LOADER_EXPORT VkResult VKAPI vkMergePipelineCaches(VkDevice device, VkPipelineCache dstCache, uint32_t srcCacheCount, const VkPipelineCache* pSrcCaches) { const VkLayerDispatchTable *disp; disp = loader_get_dispatch(device); - return disp->MergePipelineCaches(device, destCache, srcCacheCount, pSrcCaches); + return disp->MergePipelineCaches(device, dstCache, srcCacheCount, pSrcCaches); } -LOADER_EXPORT VkResult VKAPI vkCreateGraphicsPipelines(VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkGraphicsPipelineCreateInfo* pCreateInfos, const VkAllocCallbacks* pAllocator, VkPipeline* pPipelines) +LOADER_EXPORT VkResult VKAPI vkCreateGraphicsPipelines(VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkGraphicsPipelineCreateInfo* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines) { const VkLayerDispatchTable *disp; @@ -789,7 +789,7 @@ LOADER_EXPORT VkResult VKAPI vkCreateGraphicsPipelines(VkDevice device, VkPipeli return disp->CreateGraphicsPipelines(device, pipelineCache, createInfoCount, pCreateInfos, pAllocator, pPipelines); } -LOADER_EXPORT VkResult VKAPI vkCreateComputePipelines(VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkComputePipelineCreateInfo* pCreateInfos, const VkAllocCallbacks* pAllocator, VkPipeline* pPipelines) +LOADER_EXPORT VkResult VKAPI vkCreateComputePipelines(VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkComputePipelineCreateInfo* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines) { const VkLayerDispatchTable *disp; @@ -798,7 +798,7 @@ LOADER_EXPORT VkResult VKAPI vkCreateComputePipelines(VkDevice device, VkPipelin return disp->CreateComputePipelines(device, pipelineCache, createInfoCount, pCreateInfos, pAllocator, pPipelines); } -LOADER_EXPORT void VKAPI vkDestroyPipeline(VkDevice device, VkPipeline pipeline, const VkAllocCallbacks* pAllocator) +LOADER_EXPORT void VKAPI vkDestroyPipeline(VkDevice device, VkPipeline pipeline, const VkAllocationCallbacks* pAllocator) { const VkLayerDispatchTable *disp; @@ -807,7 +807,7 @@ LOADER_EXPORT void VKAPI vkDestroyPipeline(VkDevice device, VkPipeline pipeline, disp->DestroyPipeline(device, pipeline, pAllocator); } -LOADER_EXPORT VkResult VKAPI vkCreatePipelineLayout(VkDevice device, const VkPipelineLayoutCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkPipelineLayout* pPipelineLayout) +LOADER_EXPORT VkResult VKAPI vkCreatePipelineLayout(VkDevice device, const VkPipelineLayoutCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkPipelineLayout* pPipelineLayout) { const VkLayerDispatchTable *disp; @@ -816,7 +816,7 @@ LOADER_EXPORT VkResult VKAPI vkCreatePipelineLayout(VkDevice device, const VkPip return disp->CreatePipelineLayout(device, pCreateInfo, pAllocator, pPipelineLayout); } -LOADER_EXPORT void VKAPI vkDestroyPipelineLayout(VkDevice device, VkPipelineLayout pipelineLayout, const VkAllocCallbacks* pAllocator) +LOADER_EXPORT void VKAPI vkDestroyPipelineLayout(VkDevice device, VkPipelineLayout pipelineLayout, const VkAllocationCallbacks* pAllocator) { const VkLayerDispatchTable *disp; @@ -825,7 +825,7 @@ LOADER_EXPORT void VKAPI vkDestroyPipelineLayout(VkDevice device, VkPipelineLayo disp->DestroyPipelineLayout(device, pipelineLayout, pAllocator); } -LOADER_EXPORT VkResult VKAPI vkCreateSampler(VkDevice device, const VkSamplerCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkSampler* pSampler) +LOADER_EXPORT VkResult VKAPI vkCreateSampler(VkDevice device, const VkSamplerCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSampler* pSampler) { const VkLayerDispatchTable *disp; @@ -834,7 +834,7 @@ LOADER_EXPORT VkResult VKAPI vkCreateSampler(VkDevice device, const VkSamplerCre return disp->CreateSampler(device, pCreateInfo, pAllocator, pSampler); } -LOADER_EXPORT void VKAPI vkDestroySampler(VkDevice device, VkSampler sampler, const VkAllocCallbacks* pAllocator) +LOADER_EXPORT void VKAPI vkDestroySampler(VkDevice device, VkSampler sampler, const VkAllocationCallbacks* pAllocator) { const VkLayerDispatchTable *disp; @@ -844,7 +844,7 @@ LOADER_EXPORT void VKAPI vkDestroySampler(VkDevice device, VkSampler sampler, co } -LOADER_EXPORT VkResult VKAPI vkCreateDescriptorSetLayout(VkDevice device, const VkDescriptorSetLayoutCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkDescriptorSetLayout* pSetLayout) +LOADER_EXPORT VkResult VKAPI vkCreateDescriptorSetLayout(VkDevice device, const VkDescriptorSetLayoutCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDescriptorSetLayout* pSetLayout) { const VkLayerDispatchTable *disp; @@ -853,7 +853,7 @@ LOADER_EXPORT VkResult VKAPI vkCreateDescriptorSetLayout(VkDevice device, const return disp->CreateDescriptorSetLayout(device, pCreateInfo, pAllocator, pSetLayout); } -LOADER_EXPORT void VKAPI vkDestroyDescriptorSetLayout(VkDevice device, VkDescriptorSetLayout descriptorSetLayout, const VkAllocCallbacks* pAllocator) +LOADER_EXPORT void VKAPI vkDestroyDescriptorSetLayout(VkDevice device, VkDescriptorSetLayout descriptorSetLayout, const VkAllocationCallbacks* pAllocator) { const VkLayerDispatchTable *disp; @@ -862,7 +862,7 @@ LOADER_EXPORT void VKAPI vkDestroyDescriptorSetLayout(VkDevice device, VkDescrip disp->DestroyDescriptorSetLayout(device, descriptorSetLayout, pAllocator); } -LOADER_EXPORT VkResult VKAPI vkCreateDescriptorPool(VkDevice device, const VkDescriptorPoolCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkDescriptorPool* pDescriptorPool) +LOADER_EXPORT VkResult VKAPI vkCreateDescriptorPool(VkDevice device, const VkDescriptorPoolCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDescriptorPool* pDescriptorPool) { const VkLayerDispatchTable *disp; @@ -871,7 +871,7 @@ LOADER_EXPORT VkResult VKAPI vkCreateDescriptorPool(VkDevice device, const VkDes return disp->CreateDescriptorPool(device, pCreateInfo, pAllocator, pDescriptorPool); } -LOADER_EXPORT void VKAPI vkDestroyDescriptorPool(VkDevice device, VkDescriptorPool descriptorPool, const VkAllocCallbacks* pAllocator) +LOADER_EXPORT void VKAPI vkDestroyDescriptorPool(VkDevice device, VkDescriptorPool descriptorPool, const VkAllocationCallbacks* pAllocator) { const VkLayerDispatchTable *disp; @@ -890,13 +890,13 @@ LOADER_EXPORT VkResult VKAPI vkResetDescriptorPool(VkDevice device, VkDescriptor return disp->ResetDescriptorPool(device, descriptorPool, flags); } -LOADER_EXPORT VkResult VKAPI vkAllocDescriptorSets(VkDevice device, const VkDescriptorSetAllocInfo* pAllocInfo, VkDescriptorSet* pDescriptorSets) +LOADER_EXPORT VkResult VKAPI vkAllocateDescriptorSets(VkDevice device, const VkDescriptorSetAllocateInfo* pAllocateInfo, VkDescriptorSet* pDescriptorSets) { const VkLayerDispatchTable *disp; disp = loader_get_dispatch(device); - return disp->AllocDescriptorSets(device, pAllocInfo, pDescriptorSets); + return disp->AllocateDescriptorSets(device, pAllocateInfo, pDescriptorSets); } LOADER_EXPORT VkResult VKAPI vkFreeDescriptorSets(VkDevice device, VkDescriptorPool descriptorPool, uint32_t descriptorSetCount, const VkDescriptorSet* pDescriptorSets) @@ -917,7 +917,7 @@ LOADER_EXPORT void VKAPI vkUpdateDescriptorSets(VkDevice device, uint32_t descri disp->UpdateDescriptorSets(device, descriptorWriteCount, pDescriptorWrites, descriptorCopyCount, pDescriptorCopies); } -LOADER_EXPORT VkResult VKAPI vkCreateFramebuffer(VkDevice device, const VkFramebufferCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkFramebuffer* pFramebuffer) +LOADER_EXPORT VkResult VKAPI vkCreateFramebuffer(VkDevice device, const VkFramebufferCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkFramebuffer* pFramebuffer) { const VkLayerDispatchTable *disp; @@ -926,7 +926,7 @@ LOADER_EXPORT VkResult VKAPI vkCreateFramebuffer(VkDevice device, const VkFrameb return disp->CreateFramebuffer(device, pCreateInfo, pAllocator, pFramebuffer); } -LOADER_EXPORT void VKAPI vkDestroyFramebuffer(VkDevice device, VkFramebuffer framebuffer, const VkAllocCallbacks* pAllocator) +LOADER_EXPORT void VKAPI vkDestroyFramebuffer(VkDevice device, VkFramebuffer framebuffer, const VkAllocationCallbacks* pAllocator) { const VkLayerDispatchTable *disp; @@ -935,7 +935,7 @@ LOADER_EXPORT void VKAPI vkDestroyFramebuffer(VkDevice device, VkFramebuffer fra disp->DestroyFramebuffer(device, framebuffer, pAllocator); } -LOADER_EXPORT VkResult VKAPI vkCreateRenderPass(VkDevice device, const VkRenderPassCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkRenderPass* pRenderPass) +LOADER_EXPORT VkResult VKAPI vkCreateRenderPass(VkDevice device, const VkRenderPassCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkRenderPass* pRenderPass) { const VkLayerDispatchTable *disp; @@ -944,7 +944,7 @@ LOADER_EXPORT VkResult VKAPI vkCreateRenderPass(VkDevice device, const VkRenderP return disp->CreateRenderPass(device, pCreateInfo, pAllocator, pRenderPass); } -LOADER_EXPORT void VKAPI vkDestroyRenderPass(VkDevice device, VkRenderPass renderPass, const VkAllocCallbacks* pAllocator) +LOADER_EXPORT void VKAPI vkDestroyRenderPass(VkDevice device, VkRenderPass renderPass, const VkAllocationCallbacks* pAllocator) { const VkLayerDispatchTable *disp; @@ -962,48 +962,48 @@ LOADER_EXPORT void VKAPI vkGetRenderAreaGranularity(VkDevice device, VkRenderPas disp->GetRenderAreaGranularity(device, renderPass, pGranularity); } -LOADER_EXPORT VkResult VKAPI vkCreateCommandPool(VkDevice device, const VkCmdPoolCreateInfo* pCreateInfo, const VkAllocCallbacks* pAllocator, VkCmdPool* pCmdPool) +LOADER_EXPORT VkResult VKAPI vkCreateCommandPool(VkDevice device, const VkCommandPoolCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkCommandPool* pCommandPool) { const VkLayerDispatchTable *disp; disp = loader_get_dispatch(device); - return disp->CreateCommandPool(device, pCreateInfo, pAllocator, pCmdPool); + return disp->CreateCommandPool(device, pCreateInfo, pAllocator, pCommandPool); } -LOADER_EXPORT void VKAPI vkDestroyCommandPool(VkDevice device, VkCmdPool cmdPool, const VkAllocCallbacks* pAllocator) +LOADER_EXPORT void VKAPI vkDestroyCommandPool(VkDevice device, VkCommandPool commandPool, const VkAllocationCallbacks* pAllocator) { const VkLayerDispatchTable *disp; disp = loader_get_dispatch(device); - disp->DestroyCommandPool(device, cmdPool, pAllocator); + disp->DestroyCommandPool(device, commandPool, pAllocator); } -LOADER_EXPORT VkResult VKAPI vkResetCommandPool(VkDevice device, VkCmdPool cmdPool, VkCmdPoolResetFlags flags) +LOADER_EXPORT VkResult VKAPI vkResetCommandPool(VkDevice device, VkCommandPool commandPool, VkCommandPoolResetFlags flags) { const VkLayerDispatchTable *disp; disp = loader_get_dispatch(device); - return disp->ResetCommandPool(device, cmdPool, flags); + return disp->ResetCommandPool(device, commandPool, flags); } -LOADER_EXPORT VkResult VKAPI vkAllocCommandBuffers( +LOADER_EXPORT VkResult VKAPI vkAllocateCommandBuffers( VkDevice device, - const VkCmdBufferAllocInfo* pAllocInfo, - VkCmdBuffer* pCmdBuffers) + const VkCommandBufferAllocateInfo* pAllocateInfo, + VkCommandBuffer* pCommandBuffers) { const VkLayerDispatchTable *disp; VkResult res; disp = loader_get_dispatch(device); - res = disp->AllocCommandBuffers(device, pAllocInfo, pCmdBuffers); + res = disp->AllocateCommandBuffers(device, pAllocateInfo, pCommandBuffers); if (res == VK_SUCCESS) { - for (uint32_t i =0; i < pAllocInfo->bufferCount; i++) { - if (pCmdBuffers[i]) { - loader_init_dispatch(pCmdBuffers[i], disp); + for (uint32_t i =0; i < pAllocateInfo->bufferCount; i++) { + if (pCommandBuffers[i]) { + loader_init_dispatch(pCommandBuffers[i], disp); } } } @@ -1013,436 +1013,436 @@ LOADER_EXPORT VkResult VKAPI vkAllocCommandBuffers( LOADER_EXPORT void VKAPI vkFreeCommandBuffers( VkDevice device, - VkCmdPool cmdPool, + VkCommandPool commandPool, uint32_t commandBufferCount, - const VkCmdBuffer* pCommandBuffers) + const VkCommandBuffer* pCommandBuffers) { const VkLayerDispatchTable *disp; disp = loader_get_dispatch(device); - disp->FreeCommandBuffers(device, cmdPool, commandBufferCount, pCommandBuffers); + disp->FreeCommandBuffers(device, commandPool, commandBufferCount, pCommandBuffers); } -LOADER_EXPORT VkResult VKAPI vkBeginCommandBuffer(VkCmdBuffer cmdBuffer, const VkCmdBufferBeginInfo* pBeginInfo) +LOADER_EXPORT VkResult VKAPI vkBeginCommandBuffer(VkCommandBuffer commandBuffer, const VkCommandBufferBeginInfo* pBeginInfo) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - return disp->BeginCommandBuffer(cmdBuffer, pBeginInfo); + return disp->BeginCommandBuffer(commandBuffer, pBeginInfo); } -LOADER_EXPORT VkResult VKAPI vkEndCommandBuffer(VkCmdBuffer cmdBuffer) +LOADER_EXPORT VkResult VKAPI vkEndCommandBuffer(VkCommandBuffer commandBuffer) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - return disp->EndCommandBuffer(cmdBuffer); + return disp->EndCommandBuffer(commandBuffer); } -LOADER_EXPORT VkResult VKAPI vkResetCommandBuffer(VkCmdBuffer cmdBuffer, VkCmdBufferResetFlags flags) +LOADER_EXPORT VkResult VKAPI vkResetCommandBuffer(VkCommandBuffer commandBuffer, VkCommandBufferResetFlags flags) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - return disp->ResetCommandBuffer(cmdBuffer, flags); + return disp->ResetCommandBuffer(commandBuffer, flags); } -LOADER_EXPORT void VKAPI vkCmdBindPipeline(VkCmdBuffer cmdBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline) +LOADER_EXPORT void VKAPI vkCmdBindPipeline(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdBindPipeline(cmdBuffer, pipelineBindPoint, pipeline); + disp->CmdBindPipeline(commandBuffer, pipelineBindPoint, pipeline); } -LOADER_EXPORT void VKAPI vkCmdSetViewport(VkCmdBuffer cmdBuffer, uint32_t viewportCount, const VkViewport* pViewports) +LOADER_EXPORT void VKAPI vkCmdSetViewport(VkCommandBuffer commandBuffer, uint32_t viewportCount, const VkViewport* pViewports) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdSetViewport(cmdBuffer, viewportCount, pViewports); + disp->CmdSetViewport(commandBuffer, viewportCount, pViewports); } -LOADER_EXPORT void VKAPI vkCmdSetScissor(VkCmdBuffer cmdBuffer, uint32_t scissorCount, const VkRect2D* pScissors) +LOADER_EXPORT void VKAPI vkCmdSetScissor(VkCommandBuffer commandBuffer, uint32_t scissorCount, const VkRect2D* pScissors) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdSetScissor(cmdBuffer, scissorCount, pScissors); + disp->CmdSetScissor(commandBuffer, scissorCount, pScissors); } -LOADER_EXPORT void VKAPI vkCmdSetLineWidth(VkCmdBuffer cmdBuffer, float lineWidth) +LOADER_EXPORT void VKAPI vkCmdSetLineWidth(VkCommandBuffer commandBuffer, float lineWidth) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdSetLineWidth(cmdBuffer, lineWidth); + disp->CmdSetLineWidth(commandBuffer, lineWidth); } -LOADER_EXPORT void VKAPI vkCmdSetDepthBias(VkCmdBuffer cmdBuffer, float depthBiasConstantFactor, float depthBiasClamp, float depthBiasSlopeFactor) +LOADER_EXPORT void VKAPI vkCmdSetDepthBias(VkCommandBuffer commandBuffer, float depthBiasConstantFactor, float depthBiasClamp, float depthBiasSlopeFactor) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdSetDepthBias(cmdBuffer, depthBiasConstantFactor, depthBiasClamp, depthBiasSlopeFactor); + disp->CmdSetDepthBias(commandBuffer, depthBiasConstantFactor, depthBiasClamp, depthBiasSlopeFactor); } -LOADER_EXPORT void VKAPI vkCmdSetBlendConstants(VkCmdBuffer cmdBuffer, const float blendConstants[4]) +LOADER_EXPORT void VKAPI vkCmdSetBlendConstants(VkCommandBuffer commandBuffer, const float blendConstants[4]) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdSetBlendConstants(cmdBuffer, blendConstants); + disp->CmdSetBlendConstants(commandBuffer, blendConstants); } -LOADER_EXPORT void VKAPI vkCmdSetDepthBounds(VkCmdBuffer cmdBuffer, float minDepthBounds, float maxDepthBounds) +LOADER_EXPORT void VKAPI vkCmdSetDepthBounds(VkCommandBuffer commandBuffer, float minDepthBounds, float maxDepthBounds) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdSetDepthBounds(cmdBuffer, minDepthBounds, maxDepthBounds); + disp->CmdSetDepthBounds(commandBuffer, minDepthBounds, maxDepthBounds); } -LOADER_EXPORT void VKAPI vkCmdSetStencilCompareMask(VkCmdBuffer cmdBuffer, VkStencilFaceFlags faceMask, uint32_t stencilCompareMask) +LOADER_EXPORT void VKAPI vkCmdSetStencilCompareMask(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t stencilCompareMask) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdSetStencilCompareMask(cmdBuffer, faceMask, stencilCompareMask); + disp->CmdSetStencilCompareMask(commandBuffer, faceMask, stencilCompareMask); } -LOADER_EXPORT void VKAPI vkCmdSetStencilWriteMask(VkCmdBuffer cmdBuffer, VkStencilFaceFlags faceMask, uint32_t stencilWriteMask) +LOADER_EXPORT void VKAPI vkCmdSetStencilWriteMask(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t stencilWriteMask) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdSetStencilWriteMask(cmdBuffer, faceMask, stencilWriteMask); + disp->CmdSetStencilWriteMask(commandBuffer, faceMask, stencilWriteMask); } -LOADER_EXPORT void VKAPI vkCmdSetStencilReference(VkCmdBuffer cmdBuffer, VkStencilFaceFlags faceMask, uint32_t stencilReference) +LOADER_EXPORT void VKAPI vkCmdSetStencilReference(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t stencilReference) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdSetStencilReference(cmdBuffer, faceMask, stencilReference); + disp->CmdSetStencilReference(commandBuffer, faceMask, stencilReference); } -LOADER_EXPORT void VKAPI vkCmdBindDescriptorSets(VkCmdBuffer cmdBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t firstSet, uint32_t descriptorSetCount, const VkDescriptorSet* pDescriptorSets, uint32_t dynamicOffsetCount, const uint32_t* pDynamicOffsets) +LOADER_EXPORT void VKAPI vkCmdBindDescriptorSets(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t firstSet, uint32_t descriptorSetCount, const VkDescriptorSet* pDescriptorSets, uint32_t dynamicOffsetCount, const uint32_t* pDynamicOffsets) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdBindDescriptorSets(cmdBuffer, pipelineBindPoint, layout, firstSet, descriptorSetCount, pDescriptorSets, dynamicOffsetCount, pDynamicOffsets); + disp->CmdBindDescriptorSets(commandBuffer, pipelineBindPoint, layout, firstSet, descriptorSetCount, pDescriptorSets, dynamicOffsetCount, pDynamicOffsets); } -LOADER_EXPORT void VKAPI vkCmdBindIndexBuffer(VkCmdBuffer cmdBuffer, VkBuffer buffer, VkDeviceSize offset, VkIndexType indexType) +LOADER_EXPORT void VKAPI vkCmdBindIndexBuffer(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkIndexType indexType) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdBindIndexBuffer(cmdBuffer, buffer, offset, indexType); + disp->CmdBindIndexBuffer(commandBuffer, buffer, offset, indexType); } -LOADER_EXPORT void VKAPI vkCmdBindVertexBuffers(VkCmdBuffer cmdBuffer, uint32_t startBinding, uint32_t bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets) +LOADER_EXPORT void VKAPI vkCmdBindVertexBuffers(VkCommandBuffer commandBuffer, uint32_t startBinding, uint32_t bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdBindVertexBuffers(cmdBuffer, startBinding, bindingCount, pBuffers, pOffsets); + disp->CmdBindVertexBuffers(commandBuffer, startBinding, bindingCount, pBuffers, pOffsets); } -LOADER_EXPORT void VKAPI vkCmdDraw(VkCmdBuffer cmdBuffer, uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance) +LOADER_EXPORT void VKAPI vkCmdDraw(VkCommandBuffer commandBuffer, uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdDraw(cmdBuffer, vertexCount, instanceCount, firstVertex, firstInstance); + disp->CmdDraw(commandBuffer, vertexCount, instanceCount, firstVertex, firstInstance); } -LOADER_EXPORT void VKAPI vkCmdDrawIndexed(VkCmdBuffer cmdBuffer, uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex, int32_t vertexOffset, uint32_t firstInstance) +LOADER_EXPORT void VKAPI vkCmdDrawIndexed(VkCommandBuffer commandBuffer, uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex, int32_t vertexOffset, uint32_t firstInstance) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdDrawIndexed(cmdBuffer, indexCount, instanceCount, firstIndex, vertexOffset, firstInstance); + disp->CmdDrawIndexed(commandBuffer, indexCount, instanceCount, firstIndex, vertexOffset, firstInstance); } -LOADER_EXPORT void VKAPI vkCmdDrawIndirect(VkCmdBuffer cmdBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride) +LOADER_EXPORT void VKAPI vkCmdDrawIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdDrawIndirect(cmdBuffer, buffer, offset, drawCount, stride); + disp->CmdDrawIndirect(commandBuffer, buffer, offset, drawCount, stride); } -LOADER_EXPORT void VKAPI vkCmdDrawIndexedIndirect(VkCmdBuffer cmdBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride) +LOADER_EXPORT void VKAPI vkCmdDrawIndexedIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdDrawIndexedIndirect(cmdBuffer, buffer, offset, drawCount, stride); + disp->CmdDrawIndexedIndirect(commandBuffer, buffer, offset, drawCount, stride); } -LOADER_EXPORT void VKAPI vkCmdDispatch(VkCmdBuffer cmdBuffer, uint32_t x, uint32_t y, uint32_t z) +LOADER_EXPORT void VKAPI vkCmdDispatch(VkCommandBuffer commandBuffer, uint32_t x, uint32_t y, uint32_t z) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdDispatch(cmdBuffer, x, y, z); + disp->CmdDispatch(commandBuffer, x, y, z); } -LOADER_EXPORT void VKAPI vkCmdDispatchIndirect(VkCmdBuffer cmdBuffer, VkBuffer buffer, VkDeviceSize offset) +LOADER_EXPORT void VKAPI vkCmdDispatchIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdDispatchIndirect(cmdBuffer, buffer, offset); + disp->CmdDispatchIndirect(commandBuffer, buffer, offset); } -LOADER_EXPORT void VKAPI vkCmdCopyBuffer(VkCmdBuffer cmdBuffer, VkBuffer srcBuffer, VkBuffer destBuffer, uint32_t regionCount, const VkBufferCopy* pRegions) +LOADER_EXPORT void VKAPI vkCmdCopyBuffer(VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferCopy* pRegions) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdCopyBuffer(cmdBuffer, srcBuffer, destBuffer, regionCount, pRegions); + disp->CmdCopyBuffer(commandBuffer, srcBuffer, dstBuffer, regionCount, pRegions); } -LOADER_EXPORT void VKAPI vkCmdCopyImage(VkCmdBuffer cmdBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage destImage, VkImageLayout destImageLayout, uint32_t regionCount, const VkImageCopy* pRegions) +LOADER_EXPORT void VKAPI vkCmdCopyImage(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageCopy* pRegions) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdCopyImage(cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout, regionCount, pRegions); + disp->CmdCopyImage(commandBuffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions); } -LOADER_EXPORT void VKAPI vkCmdBlitImage(VkCmdBuffer cmdBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage destImage, VkImageLayout destImageLayout, uint32_t regionCount, const VkImageBlit* pRegions, VkFilter filter) +LOADER_EXPORT void VKAPI vkCmdBlitImage(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageBlit* pRegions, VkFilter filter) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdBlitImage(cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout, regionCount, pRegions, filter); + disp->CmdBlitImage(commandBuffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions, filter); } -LOADER_EXPORT void VKAPI vkCmdCopyBufferToImage(VkCmdBuffer cmdBuffer, VkBuffer srcBuffer, VkImage destImage, VkImageLayout destImageLayout, uint32_t regionCount, const VkBufferImageCopy* pRegions) +LOADER_EXPORT void VKAPI vkCmdCopyBufferToImage(VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkBufferImageCopy* pRegions) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdCopyBufferToImage(cmdBuffer, srcBuffer, destImage, destImageLayout, regionCount, pRegions); + disp->CmdCopyBufferToImage(commandBuffer, srcBuffer, dstImage, dstImageLayout, regionCount, pRegions); } -LOADER_EXPORT void VKAPI vkCmdCopyImageToBuffer(VkCmdBuffer cmdBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkBuffer destBuffer, uint32_t regionCount, const VkBufferImageCopy* pRegions) +LOADER_EXPORT void VKAPI vkCmdCopyImageToBuffer(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferImageCopy* pRegions) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdCopyImageToBuffer(cmdBuffer, srcImage, srcImageLayout, destBuffer, regionCount, pRegions); + disp->CmdCopyImageToBuffer(commandBuffer, srcImage, srcImageLayout, dstBuffer, regionCount, pRegions); } -LOADER_EXPORT void VKAPI vkCmdUpdateBuffer(VkCmdBuffer cmdBuffer, VkBuffer destBuffer, VkDeviceSize destOffset, VkDeviceSize dataSize, const uint32_t* pData) +LOADER_EXPORT void VKAPI vkCmdUpdateBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const uint32_t* pData) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdUpdateBuffer(cmdBuffer, destBuffer, destOffset, dataSize, pData); + disp->CmdUpdateBuffer(commandBuffer, dstBuffer, dstOffset, dataSize, pData); } -LOADER_EXPORT void VKAPI vkCmdFillBuffer(VkCmdBuffer cmdBuffer, VkBuffer destBuffer, VkDeviceSize destOffset, VkDeviceSize size, uint32_t data) +LOADER_EXPORT void VKAPI vkCmdFillBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize size, uint32_t data) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdFillBuffer(cmdBuffer, destBuffer, destOffset, size, data); + disp->CmdFillBuffer(commandBuffer, dstBuffer, dstOffset, size, data); } -LOADER_EXPORT void VKAPI vkCmdClearColorImage(VkCmdBuffer cmdBuffer, VkImage image, VkImageLayout imageLayout, const VkClearColorValue* pColor, uint32_t rangeCount, const VkImageSubresourceRange* pRanges) +LOADER_EXPORT void VKAPI vkCmdClearColorImage(VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearColorValue* pColor, uint32_t rangeCount, const VkImageSubresourceRange* pRanges) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdClearColorImage(cmdBuffer, image, imageLayout, pColor, rangeCount, pRanges); + disp->CmdClearColorImage(commandBuffer, image, imageLayout, pColor, rangeCount, pRanges); } -LOADER_EXPORT void VKAPI vkCmdClearDepthStencilImage(VkCmdBuffer cmdBuffer, VkImage image, VkImageLayout imageLayout, const VkClearDepthStencilValue* pDepthStencil, uint32_t rangeCount, const VkImageSubresourceRange* pRanges) +LOADER_EXPORT void VKAPI vkCmdClearDepthStencilImage(VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearDepthStencilValue* pDepthStencil, uint32_t rangeCount, const VkImageSubresourceRange* pRanges) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdClearDepthStencilImage(cmdBuffer, image, imageLayout, pDepthStencil, rangeCount, pRanges); + disp->CmdClearDepthStencilImage(commandBuffer, image, imageLayout, pDepthStencil, rangeCount, pRanges); } -LOADER_EXPORT void VKAPI vkCmdClearAttachments(VkCmdBuffer cmdBuffer, uint32_t attachmentCount, const VkClearAttachment* pAttachments, uint32_t rectCount, const VkClearRect* pRects) +LOADER_EXPORT void VKAPI vkCmdClearAttachments(VkCommandBuffer commandBuffer, uint32_t attachmentCount, const VkClearAttachment* pAttachments, uint32_t rectCount, const VkClearRect* pRects) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdClearAttachments(cmdBuffer, attachmentCount, pAttachments, rectCount, pRects); + disp->CmdClearAttachments(commandBuffer, attachmentCount, pAttachments, rectCount, pRects); } -LOADER_EXPORT void VKAPI vkCmdResolveImage(VkCmdBuffer cmdBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage destImage, VkImageLayout destImageLayout, uint32_t regionCount, const VkImageResolve* pRegions) +LOADER_EXPORT void VKAPI vkCmdResolveImage(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageResolve* pRegions) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdResolveImage(cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout, regionCount, pRegions); + disp->CmdResolveImage(commandBuffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions); } -LOADER_EXPORT void VKAPI vkCmdSetEvent(VkCmdBuffer cmdBuffer, VkEvent event, VkPipelineStageFlags stageMask) +LOADER_EXPORT void VKAPI vkCmdSetEvent(VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdSetEvent(cmdBuffer, event, stageMask); + disp->CmdSetEvent(commandBuffer, event, stageMask); } -LOADER_EXPORT void VKAPI vkCmdResetEvent(VkCmdBuffer cmdBuffer, VkEvent event, VkPipelineStageFlags stageMask) +LOADER_EXPORT void VKAPI vkCmdResetEvent(VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdResetEvent(cmdBuffer, event, stageMask); + disp->CmdResetEvent(commandBuffer, event, stageMask); } -LOADER_EXPORT void VKAPI vkCmdWaitEvents(VkCmdBuffer cmdBuffer, uint32_t eventCount, const VkEvent* pEvents, VkPipelineStageFlags sourceStageMask, VkPipelineStageFlags destStageMask, uint32_t memBarrierCount, const void* const* ppMemBarriers) +LOADER_EXPORT void VKAPI vkCmdWaitEvents(VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent* pEvents, VkPipelineStageFlags sourceStageMask, VkPipelineStageFlags dstStageMask, uint32_t memoryBarrierCount, const void* const* ppMemoryBarriers) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdWaitEvents(cmdBuffer, eventCount, pEvents, sourceStageMask, destStageMask, memBarrierCount, ppMemBarriers); + disp->CmdWaitEvents(commandBuffer, eventCount, pEvents, sourceStageMask, dstStageMask, memoryBarrierCount, ppMemoryBarriers); } -LOADER_EXPORT void VKAPI vkCmdPipelineBarrier(VkCmdBuffer cmdBuffer, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags destStageMask, VkDependencyFlags dependencyFlags, uint32_t memBarrierCount, const void* const* ppMemBarriers) +LOADER_EXPORT void VKAPI vkCmdPipelineBarrier(VkCommandBuffer commandBuffer, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, VkDependencyFlags dependencyFlags, uint32_t memoryBarrierCount, const void* const* ppMemoryBarriers) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdPipelineBarrier(cmdBuffer, srcStageMask, destStageMask, dependencyFlags, memBarrierCount, ppMemBarriers); + disp->CmdPipelineBarrier(commandBuffer, srcStageMask, dstStageMask, dependencyFlags, memoryBarrierCount, ppMemoryBarriers); } -LOADER_EXPORT void VKAPI vkCmdBeginQuery(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t slot, VkFlags flags) +LOADER_EXPORT void VKAPI vkCmdBeginQuery(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t slot, VkFlags flags) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdBeginQuery(cmdBuffer, queryPool, slot, flags); + disp->CmdBeginQuery(commandBuffer, queryPool, slot, flags); } -LOADER_EXPORT void VKAPI vkCmdEndQuery(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t slot) +LOADER_EXPORT void VKAPI vkCmdEndQuery(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t slot) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdEndQuery(cmdBuffer, queryPool, slot); + disp->CmdEndQuery(commandBuffer, queryPool, slot); } -LOADER_EXPORT void VKAPI vkCmdResetQueryPool(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount) +LOADER_EXPORT void VKAPI vkCmdResetQueryPool(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdResetQueryPool(cmdBuffer, queryPool, startQuery, queryCount); + disp->CmdResetQueryPool(commandBuffer, queryPool, startQuery, queryCount); } -LOADER_EXPORT void VKAPI vkCmdWriteTimestamp(VkCmdBuffer cmdBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, uint32_t slot) +LOADER_EXPORT void VKAPI vkCmdWriteTimestamp(VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, uint32_t slot) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdWriteTimestamp(cmdBuffer, pipelineStage, queryPool, slot); + disp->CmdWriteTimestamp(commandBuffer, pipelineStage, queryPool, slot); } -LOADER_EXPORT void VKAPI vkCmdCopyQueryPoolResults(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount, VkBuffer destBuffer, VkDeviceSize destOffset, VkDeviceSize stride, VkFlags flags) +LOADER_EXPORT void VKAPI vkCmdCopyQueryPoolResults(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize stride, VkFlags flags) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdCopyQueryPoolResults(cmdBuffer, queryPool, startQuery, queryCount, destBuffer, destOffset, stride, flags); + disp->CmdCopyQueryPoolResults(commandBuffer, queryPool, startQuery, queryCount, dstBuffer, dstOffset, stride, flags); } -LOADER_EXPORT void VKAPI vkCmdPushConstants(VkCmdBuffer cmdBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, uint32_t offset, uint32_t size, const void* values) +LOADER_EXPORT void VKAPI vkCmdPushConstants(VkCommandBuffer commandBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, uint32_t offset, uint32_t size, const void* values) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdPushConstants(cmdBuffer, layout, stageFlags, offset, size, values); + disp->CmdPushConstants(commandBuffer, layout, stageFlags, offset, size, values); } -LOADER_EXPORT void VKAPI vkCmdBeginRenderPass(VkCmdBuffer cmdBuffer, const VkRenderPassBeginInfo* pRenderPassBegin, VkRenderPassContents contents) +LOADER_EXPORT void VKAPI vkCmdBeginRenderPass(VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo* pRenderPassBegin, VkRenderPassContents contents) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdBeginRenderPass(cmdBuffer, pRenderPassBegin, contents); + disp->CmdBeginRenderPass(commandBuffer, pRenderPassBegin, contents); } -LOADER_EXPORT void VKAPI vkCmdNextSubpass(VkCmdBuffer cmdBuffer, VkRenderPassContents contents) +LOADER_EXPORT void VKAPI vkCmdNextSubpass(VkCommandBuffer commandBuffer, VkRenderPassContents contents) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdNextSubpass(cmdBuffer, contents); + disp->CmdNextSubpass(commandBuffer, contents); } -LOADER_EXPORT void VKAPI vkCmdEndRenderPass(VkCmdBuffer cmdBuffer) +LOADER_EXPORT void VKAPI vkCmdEndRenderPass(VkCommandBuffer commandBuffer) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdEndRenderPass(cmdBuffer); + disp->CmdEndRenderPass(commandBuffer); } -LOADER_EXPORT void VKAPI vkCmdExecuteCommands(VkCmdBuffer cmdBuffer, uint32_t cmdBuffersCount, const VkCmdBuffer* pCmdBuffers) +LOADER_EXPORT void VKAPI vkCmdExecuteCommands(VkCommandBuffer commandBuffer, uint32_t commandBuffersCount, const VkCommandBuffer* pCommandBuffers) { const VkLayerDispatchTable *disp; - disp = loader_get_dispatch(cmdBuffer); + disp = loader_get_dispatch(commandBuffer); - disp->CmdExecuteCommands(cmdBuffer, cmdBuffersCount, pCmdBuffers); + disp->CmdExecuteCommands(commandBuffer, commandBuffersCount, pCommandBuffers); } diff --git a/loader/vk-loader-generate.py b/loader/vk-loader-generate.py index 6439703e..d8d06b44 100755 --- a/loader/vk-loader-generate.py +++ b/loader/vk-loader-generate.py @@ -49,7 +49,7 @@ class Subcommand(object): # Dont be cute trying to use a general rule to programmatically populate this list # it just obsfucates what is going on! wsi_creates_dispatchable_object = ["CreateSwapchainKHR"] - creates_dispatchable_object = ["CreateDevice", "GetDeviceQueue", "AllocCommandBuffers"] + wsi_creates_dispatchable_object + creates_dispatchable_object = ["CreateDevice", "GetDeviceQueue", "AllocateCommandBuffers"] + wsi_creates_dispatchable_object if name in creates_dispatchable_object: return True else: diff --git a/loader/wsi_swapchain.c b/loader/wsi_swapchain.c index a20549a8..e362139a 100644 --- a/loader/wsi_swapchain.c +++ b/loader/wsi_swapchain.c @@ -36,7 +36,7 @@ #include "wsi_swapchain.h" static const VkExtensionProperties wsi_swapchain_extension_info = { - .extName = VK_EXT_KHR_SWAPCHAIN_EXTENSION_NAME, + .extensionName = VK_EXT_KHR_SWAPCHAIN_EXTENSION_NAME, .specVersion = VK_EXT_KHR_SWAPCHAIN_REVISION, }; diff --git a/vk-layer-generate.py b/vk-layer-generate.py index 13a15100..dbce97b9 100755 --- a/vk-layer-generate.py +++ b/vk-layer-generate.py @@ -157,7 +157,7 @@ class Subcommand(object): if "VkFormat" == vk_type: if cpp: return ("%p", "&%s" % name) - return ("{%s.channelFormat = %%s, %s.numericFormat = %%s}" % (name, name), "string_VK_CHANNEL_FORMAT(%s.channelFormat), string_VK_FORMAT_NUM(%s.numericFormat)" % (name, name)) + return ("{%s.channelFormat = %%s, %s.numericFormat = %%s}" % (name, name), "string_VK_CHANNEL_FORMAT(%s.channelFormat), string_VK_FORMAT_RANGE_SIZE(%s.numericFormat)" % (name, name)) if output_param: return ("%p", "(void*)*%s" % name) if vk_helper.is_type(vk_type, 'struct') and '*' not in vk_type: @@ -231,7 +231,7 @@ class Subcommand(object): ggep_body.append(' {') ggep_body.append(' "%s",' % layer) ggep_body.append(' VK_API_VERSION, // specVersion') - ggep_body.append(' VK_MAKE_VERSION(0, 1, 0), // implVersion') + ggep_body.append(' VK_MAKE_VERSION(0, 1, 0), // implementationVersion') ggep_body.append(' "layer: %s",' % layer) ggep_body.append(' }') ggep_body.append('};') @@ -846,30 +846,30 @@ class APIDumpSubcommand(Subcommand): header_txt.append(' return retVal;') header_txt.append('}') header_txt.append('') - header_txt.append('void interpret_memBarriers(const void* const* ppMemBarriers, uint32_t memBarrierCount)') + header_txt.append('void interpret_memBarriers(const void* const* ppMemoryBarriers, uint32_t memoryBarrierCount)') header_txt.append('{') - header_txt.append(' if (ppMemBarriers) {') + header_txt.append(' if (ppMemoryBarriers) {') header_txt.append(' string tmp_str;') - header_txt.append(' for (uint32_t i = 0; i < memBarrierCount; i++) {') - header_txt.append(' switch(*(VkStructureType*)ppMemBarriers[i])') + header_txt.append(' for (uint32_t i = 0; i < memoryBarrierCount; i++) {') + header_txt.append(' switch(*(VkStructureType*)ppMemoryBarriers[i])') header_txt.append(' {') header_txt.append(' case VK_STRUCTURE_TYPE_MEMORY_BARRIER:') - header_txt.append(' tmp_str = vk_print_vkmemorybarrier((VkMemoryBarrier*)ppMemBarriers[i], " ");') + header_txt.append(' tmp_str = vk_print_vkmemorybarrier((VkMemoryBarrier*)ppMemoryBarriers[i], " ");') header_txt.append(' break;') header_txt.append(' case VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER:') - header_txt.append(' tmp_str = vk_print_vkbuffermemorybarrier((VkBufferMemoryBarrier*)ppMemBarriers[i], " ");') + header_txt.append(' tmp_str = vk_print_vkbuffermemorybarrier((VkBufferMemoryBarrier*)ppMemoryBarriers[i], " ");') header_txt.append(' break;') header_txt.append(' case VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER:') - header_txt.append(' tmp_str = vk_print_vkimagememorybarrier((VkImageMemoryBarrier*)ppMemBarriers[i], " ");') + header_txt.append(' tmp_str = vk_print_vkimagememorybarrier((VkImageMemoryBarrier*)ppMemoryBarriers[i], " ");') header_txt.append(' break;') header_txt.append(' default:') header_txt.append(' break;') header_txt.append(' }') header_txt.append('') header_txt.append(' if (StreamControl::writeAddress == true) {') - header_txt.append(' (*outputStream) << " ppMemBarriers[" << i << "] (" << &ppMemBarriers[i] << ")" << endl << tmp_str << endl;') + header_txt.append(' (*outputStream) << " ppMemoryBarriers[" << i << "] (" << &ppMemoryBarriers[i] << ")" << endl << tmp_str << endl;') header_txt.append(' } else {') - header_txt.append(' (*outputStream) << " ppMemBarriers[" << i << "] (address)" << endl << " address" << endl;') + header_txt.append(' (*outputStream) << " ppMemoryBarriers[" << i << "] (address)" << endl << " address" << endl;') header_txt.append(' }') header_txt.append(' }') header_txt.append(' }') @@ -970,7 +970,7 @@ class APIDumpSubcommand(Subcommand): funcs = [] sp_param_dict = {} # Store 'index' for struct param to print, or an name of binding "Count" param for array to print create_params = 0 # Num of params at end of function that are created and returned as output values - if 'AllocDescriptorSets' in proto.name: + if 'AllocateDescriptorSets' in proto.name: create_params = -1 elif 'Create' in proto.name or 'Alloc' in proto.name or 'MapMemory' in proto.name: create_params = -1 @@ -1053,9 +1053,9 @@ class APIDumpSubcommand(Subcommand): log_func += '\n%s(*outputStream) << " %s (" << %s << ")" << endl << tmp_str << endl;' % (indent, local_name, local_name) indent = indent[4:] log_func += '\n%s}' % (indent) - elif 'memBarrierCount' == sp_param_dict[sp_index]: # call helper function - log_func += '\n%sif (ppMemBarriers) {' % (indent) - log_func += '\n%s interpret_memBarriers(ppMemBarriers, memBarrierCount);' % (indent) + elif 'memoryBarrierCount' == sp_param_dict[sp_index]: # call helper function + log_func += '\n%sif (ppMemoryBarriers) {' % (indent) + log_func += '\n%s interpret_memBarriers(ppMemoryBarriers, memoryBarrierCount);' % (indent) log_func += '\n%s}' % (indent) else: # We have a count value stored to iterate over an array print_cast = '' @@ -1368,7 +1368,7 @@ class ObjectTrackerSubcommand(Subcommand): gedi_txt.append('%s' % self.lineinfo.get()) gedi_txt.append('void vkDestroyInstance(') gedi_txt.append('VkInstance instance,') - gedi_txt.append('const VkAllocCallbacks* pAllocator)') + gedi_txt.append('const VkAllocationCallbacks* pAllocator)') gedi_txt.append('{') gedi_txt.append(' loader_platform_thread_lock_mutex(&objLock);') gedi_txt.append(' validate_object(instance, instance);') @@ -1417,7 +1417,7 @@ class ObjectTrackerSubcommand(Subcommand): gedd_txt.append('%s' % self.lineinfo.get()) gedd_txt.append('void vkDestroyDevice(') gedd_txt.append('VkDevice device,') - gedd_txt.append('const VkAllocCallbacks* pAllocator)') + gedd_txt.append('const VkAllocationCallbacks* pAllocator)') gedd_txt.append('{') gedd_txt.append(' loader_platform_thread_lock_mutex(&objLock);') gedd_txt.append(' validate_object(device, device);') @@ -1458,7 +1458,7 @@ class ObjectTrackerSubcommand(Subcommand): cbv_txt.append('%s' % self.lineinfo.get()) for o in ['VkPipeline', 'VkPipelineLayout', 'VkBuffer', 'VkEvent', 'VkQueryPool', 'VkRenderPass', 'VkFramebuffer']: - cbv_txt.append('static VkBool32 validate_object(VkCmdBuffer dispatchable_object, %s object)' % (o)) + cbv_txt.append('static VkBool32 validate_object(VkCommandBuffer dispatchable_object, %s object)' % (o)) cbv_txt.append('{') cbv_txt.append(' if (%sMap.find((void*)object) == %sMap.end()) {' % (o, o)) cbv_txt.append(' return log_msg(mdd(dispatchable_object), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, (uint64_t) object, 0, OBJTRACK_INVALID_OBJECT, "OBJTRACK",') @@ -1480,7 +1480,7 @@ class ObjectTrackerSubcommand(Subcommand): for objectName, objectTypeEnum in obj_type_mapping.items(): obj_type_mapping[objectName] = ucc_to_U_C_C(objectTypeEnum); # Command Buffer Object doesn't follow the rule. - obj_type_mapping['VkCmdBuffer'] = "VK_OBJECT_TYPE_COMMAND_BUFFER" + obj_type_mapping['VkCommandBuffer'] = "VK_OBJECT_TYPE_COMMAND_BUFFER" obj_type_mapping['VkShaderModule'] = "VK_OBJECT_TYPE_SHADER_MODULE" explicit_object_tracker_functions = [ @@ -1490,7 +1490,7 @@ class ObjectTrackerSubcommand(Subcommand): "CreateDevice", "GetDeviceQueue", "QueueBindSparse", - "AllocDescriptorSets", + "AllocateDescriptorSets", "FreeDescriptorSets", "MapMemory", "UnmapMemory", @@ -1678,7 +1678,7 @@ class ObjectTrackerSubcommand(Subcommand): class ThreadingSubcommand(Subcommand): thread_check_dispatchable_objects = [ "VkQueue", - "VkCmdBuffer", + "VkCommandBuffer", ] thread_check_nondispatchable_objects = [ "VkDeviceMemory", @@ -1693,7 +1693,7 @@ class ThreadingSubcommand(Subcommand): 'VkPhysicalDevice' : 'VK_OBJECT_TYPE_PHYSICAL_DEVICE', 'VkDevice' : 'VK_OBJECT_TYPE_DEVICE', 'VkQueue' : 'VK_OBJECT_TYPE_QUEUE', - 'VkCmdBuffer' : 'VK_OBJECT_TYPE_COMMAND_BUFFER', + 'VkCommandBuffer' : 'VK_OBJECT_TYPE_COMMAND_BUFFER', 'VkFence' : 'VK_OBJECT_TYPE_FENCE', 'VkDeviceMemory' : 'VK_OBJECT_TYPE_DEVICE_MEMORY', 'VkBuffer' : 'VK_OBJECT_TYPE_BUFFER', @@ -1714,7 +1714,7 @@ class ThreadingSubcommand(Subcommand): 'VkDescriptorPool' : 'VK_OBJECT_TYPE_DESCRIPTOR_POOL', 'VkDescriptorSet' : 'VK_OBJECT_TYPE_DESCRIPTOR_SET', 'VkFramebuffer' : 'VK_OBJECT_TYPE_FRAMEBUFFER', - 'VkCmdPool' : 'VK_OBJECT_TYPE_CMD_POOL', + 'VkCommandPool' : 'VK_OBJECT_TYPE_COMMAND_POOL', } def generate_useObject(self, ty): obj_type = self.thread_check_object_types[ty] @@ -1817,13 +1817,13 @@ class ThreadingSubcommand(Subcommand): funcs.append('%s' % self.lineinfo.get()) funcs.append('%s%s\n' % (qual, decl) + '{\n' - ' for (uint32_t i=0; i<memRangeCount; i++) {\n' - ' useObject((const void *) %s, pMemRanges[i].mem);\n' % proto.params[0].name + + ' for (uint32_t i=0; i<memoryRangeCount; i++) {\n' + ' useObject((const void *) %s, pMemoryRanges[i].mem);\n' % proto.params[0].name + ' }\n' ' VkLayerDispatchTable *pDeviceTable = get_dispatch_table(Threading_%s_table_map, %s);\n' % (table, proto.params[0].name) + ' %s pDeviceTable->%s;\n' % (ret_val, proto.c_call()) + - ' for (uint32_t i=0; i<memRangeCount; i++) {\n' - ' finishUsingObject(pMemRanges[i].mem);\n' + ' for (uint32_t i=0; i<memoryRangeCount; i++) {\n' + ' finishUsingObject(pMemoryRanges[i].mem);\n' ' }\n' '%s' % (stmt) + '}') @@ -1853,7 +1853,7 @@ class ThreadingSubcommand(Subcommand): elif proto.params[0].ty == "VkPhysicalDevice": return None # Functions changing command buffers need thread safe use of first parameter - if proto.params[0].ty == "VkCmdBuffer": + if proto.params[0].ty == "VkCommandBuffer": funcs.append('%s' % self.lineinfo.get()) funcs.append('%s%s\n' % (qual, decl) + '{\n' diff --git a/vk_helper.py b/vk_helper.py index 2e3a9949..069dbdcf 100755 --- a/vk_helper.py +++ b/vk_helper.py @@ -364,6 +364,12 @@ def get_struct_name_from_struct_type(struct_type): else: 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 @@ -1248,7 +1254,7 @@ class StructWrapperGen: if self.struct_dict[s][m]['dyn_array']: if self.struct_dict[s][m]['full_type'].count('*') > 1: if not is_type(self.struct_dict[s][m]['type'], 'struct') and not 'char' in self.struct_dict[s][m]['type'].lower(): - if 'ppMemBarriers' == self.struct_dict[s][m]['name']: + if 'ppMemoryBarriers' == self.struct_dict[s][m]['name']: # TODO : For now be conservative and consider all memBarrier ptrs as largest possible struct sh_funcs.append('%sstructSize += pStruct->%s*(sizeof(%s*) + sizeof(VkImageMemoryBarrier));' % (indent, self.struct_dict[s][m]['array_size'], self.struct_dict[s][m]['type'])) else: @@ -188,7 +188,7 @@ core = Extension( "VkDevice", "VkQueue", "VkSemaphore", - "VkCmdBuffer", + "VkCommandBuffer", "VkFence", "VkDeviceMemory", "VkBuffer", @@ -208,17 +208,17 @@ core = Extension( "VkDescriptorPool", "VkDescriptorSet", "VkFramebuffer", - "VkCmdPool", + "VkCommandPool", ], protos=[ Proto("VkResult", "CreateInstance", [Param("const VkInstanceCreateInfo*", "pCreateInfo"), - Param("const VkAllocCallbacks*", "pAllocator"), + Param("const VkAllocationCallbacks*", "pAllocator"), Param("VkInstance*", "pInstance")]), Proto("void", "DestroyInstance", [Param("VkInstance", "instance"), - Param("const VkAllocCallbacks*", "pAllocator")]), + Param("const VkAllocationCallbacks*", "pAllocator")]), Proto("VkResult", "EnumeratePhysicalDevices", [Param("VkInstance", "instance"), @@ -267,12 +267,12 @@ core = Extension( Proto("VkResult", "CreateDevice", [Param("VkPhysicalDevice", "physicalDevice"), Param("const VkDeviceCreateInfo*", "pCreateInfo"), - Param("const VkAllocCallbacks*", "pAllocator"), + Param("const VkAllocationCallbacks*", "pAllocator"), Param("VkDevice*", "pDevice")]), Proto("void", "DestroyDevice", [Param("VkDevice", "device"), - Param("const VkAllocCallbacks*", "pAllocator")]), + Param("const VkAllocationCallbacks*", "pAllocator")]), Proto("VkResult", "EnumerateInstanceExtensionProperties", [Param("const char*", "pLayerName"), @@ -312,16 +312,16 @@ core = Extension( Proto("VkResult", "DeviceWaitIdle", [Param("VkDevice", "device")]), - Proto("VkResult", "AllocMemory", + Proto("VkResult", "AllocateMemory", [Param("VkDevice", "device"), - Param("const VkMemoryAllocInfo*", "pAllocInfo"), - Param("const VkAllocCallbacks*", "pAllocator"), - Param("VkDeviceMemory*", "pMem")]), + Param("const VkMemoryAllocateInfo*", "pAllocateInfo"), + Param("const VkAllocationCallbacks*", "pAllocator"), + Param("VkDeviceMemory*", "pMemory")]), Proto("void", "FreeMemory", [Param("VkDevice", "device"), Param("VkDeviceMemory", "mem"), - Param("const VkAllocCallbacks*", "pAllocator")]), + Param("const VkAllocationCallbacks*", "pAllocator")]), Proto("VkResult", "MapMemory", [Param("VkDevice", "device"), @@ -337,13 +337,13 @@ core = Extension( Proto("VkResult", "FlushMappedMemoryRanges", [Param("VkDevice", "device"), - Param("uint32_t", "memRangeCount"), - Param("const VkMappedMemoryRange*", "pMemRanges")]), + Param("uint32_t", "memoryRangeCount"), + Param("const VkMappedMemoryRange*", "pMemoryRanges")]), Proto("VkResult", "InvalidateMappedMemoryRanges", [Param("VkDevice", "device"), - Param("uint32_t", "memRangeCount"), - Param("const VkMappedMemoryRange*", "pMemRanges")]), + Param("uint32_t", "memoryRangeCount"), + Param("const VkMappedMemoryRange*", "pMemoryRanges")]), Proto("void", "GetDeviceMemoryCommitment", [Param("VkDevice", "device"), @@ -354,13 +354,13 @@ core = Extension( [Param("VkDevice", "device"), Param("VkBuffer", "buffer"), Param("VkDeviceMemory", "mem"), - Param("VkDeviceSize", "memOffset")]), + Param("VkDeviceSize", "memoryOffset")]), Proto("VkResult", "BindImageMemory", [Param("VkDevice", "device"), Param("VkImage", "image"), Param("VkDeviceMemory", "mem"), - Param("VkDeviceSize", "memOffset")]), + Param("VkDeviceSize", "memoryOffset")]), Proto("void", "GetBufferMemoryRequirements", [Param("VkDevice", "device"), @@ -397,13 +397,13 @@ core = Extension( Proto("VkResult", "CreateFence", [Param("VkDevice", "device"), Param("const VkFenceCreateInfo*", "pCreateInfo"), - Param("const VkAllocCallbacks*", "pAllocator"), + Param("const VkAllocationCallbacks*", "pAllocator"), Param("VkFence*", "pFence")]), Proto("void", "DestroyFence", [Param("VkDevice", "device"), Param("VkFence", "fence"), - Param("const VkAllocCallbacks*", "pAllocator")]), + Param("const VkAllocationCallbacks*", "pAllocator")]), Proto("VkResult", "ResetFences", [Param("VkDevice", "device"), @@ -424,24 +424,24 @@ core = Extension( Proto("VkResult", "CreateSemaphore", [Param("VkDevice", "device"), Param("const VkSemaphoreCreateInfo*", "pCreateInfo"), - Param("const VkAllocCallbacks*", "pAllocator"), + Param("const VkAllocationCallbacks*", "pAllocator"), Param("VkSemaphore*", "pSemaphore")]), Proto("void", "DestroySemaphore", [Param("VkDevice", "device"), Param("VkSemaphore", "semaphore"), - Param("const VkAllocCallbacks*", "pAllocator")]), + Param("const VkAllocationCallbacks*", "pAllocator")]), Proto("VkResult", "CreateEvent", [Param("VkDevice", "device"), Param("const VkEventCreateInfo*", "pCreateInfo"), - Param("const VkAllocCallbacks*", "pAllocator"), + Param("const VkAllocationCallbacks*", "pAllocator"), Param("VkEvent*", "pEvent")]), Proto("void", "DestroyEvent", [Param("VkDevice", "device"), Param("VkEvent", "event"), - Param("const VkAllocCallbacks*", "pAllocator")]), + Param("const VkAllocationCallbacks*", "pAllocator")]), Proto("VkResult", "GetEventStatus", [Param("VkDevice", "device"), @@ -458,13 +458,13 @@ core = Extension( Proto("VkResult", "CreateQueryPool", [Param("VkDevice", "device"), Param("const VkQueryPoolCreateInfo*", "pCreateInfo"), - Param("const VkAllocCallbacks*", "pAllocator"), + Param("const VkAllocationCallbacks*", "pAllocator"), Param("VkQueryPool*", "pQueryPool")]), Proto("void", "DestroyQueryPool", [Param("VkDevice", "device"), Param("VkQueryPool", "queryPool"), - Param("const VkAllocCallbacks*", "pAllocator")]), + Param("const VkAllocationCallbacks*", "pAllocator")]), Proto("VkResult", "GetQueryPoolResults", [Param("VkDevice", "device"), @@ -479,35 +479,35 @@ core = Extension( Proto("VkResult", "CreateBuffer", [Param("VkDevice", "device"), Param("const VkBufferCreateInfo*", "pCreateInfo"), - Param("const VkAllocCallbacks*", "pAllocator"), + Param("const VkAllocationCallbacks*", "pAllocator"), Param("VkBuffer*", "pBuffer")]), Proto("void", "DestroyBuffer", [Param("VkDevice", "device"), Param("VkBuffer", "buffer"), - Param("const VkAllocCallbacks*", "pAllocator")]), + Param("const VkAllocationCallbacks*", "pAllocator")]), Proto("VkResult", "CreateBufferView", [Param("VkDevice", "device"), Param("const VkBufferViewCreateInfo*", "pCreateInfo"), - Param("const VkAllocCallbacks*", "pAllocator"), + Param("const VkAllocationCallbacks*", "pAllocator"), Param("VkBufferView*", "pView")]), Proto("void", "DestroyBufferView", [Param("VkDevice", "device"), Param("VkBufferView", "bufferView"), - Param("const VkAllocCallbacks*", "pAllocator")]), + Param("const VkAllocationCallbacks*", "pAllocator")]), Proto("VkResult", "CreateImage", [Param("VkDevice", "device"), Param("const VkImageCreateInfo*", "pCreateInfo"), - Param("const VkAllocCallbacks*", "pAllocator"), + Param("const VkAllocationCallbacks*", "pAllocator"), Param("VkImage*", "pImage")]), Proto("void", "DestroyImage", [Param("VkDevice", "device"), Param("VkImage", "image"), - Param("const VkAllocCallbacks*", "pAllocator")]), + Param("const VkAllocationCallbacks*", "pAllocator")]), Proto("void", "GetImageSubresourceLayout", [Param("VkDevice", "device"), @@ -518,46 +518,46 @@ core = Extension( Proto("VkResult", "CreateImageView", [Param("VkDevice", "device"), Param("const VkImageViewCreateInfo*", "pCreateInfo"), - Param("const VkAllocCallbacks*", "pAllocator"), + Param("const VkAllocationCallbacks*", "pAllocator"), Param("VkImageView*", "pView")]), Proto("void", "DestroyImageView", [Param("VkDevice", "device"), Param("VkImageView", "imageView"), - Param("const VkAllocCallbacks*", "pAllocator")]), + Param("const VkAllocationCallbacks*", "pAllocator")]), Proto("VkResult", "CreateShaderModule", [Param("VkDevice", "device"), Param("const VkShaderModuleCreateInfo*", "pCreateInfo"), - Param("const VkAllocCallbacks*", "pAllocator"), + Param("const VkAllocationCallbacks*", "pAllocator"), Param("VkShaderModule*", "pShaderModule")]), Proto("void", "DestroyShaderModule", [Param("VkDevice", "device"), Param("VkShaderModule", "shaderModule"), - Param("const VkAllocCallbacks*", "pAllocator")]), + Param("const VkAllocationCallbacks*", "pAllocator")]), Proto("VkResult", "CreateShader", [Param("VkDevice", "device"), Param("const VkShaderCreateInfo*", "pCreateInfo"), - Param("const VkAllocCallbacks*", "pAllocator"), + Param("const VkAllocationCallbacks*", "pAllocator"), Param("VkShader*", "pShader")]), Proto("void", "DestroyShader", [Param("VkDevice", "device"), Param("VkShader", "shader"), - Param("const VkAllocCallbacks*", "pAllocator")]), + Param("const VkAllocationCallbacks*", "pAllocator")]), Proto("VkResult", "CreatePipelineCache", [Param("VkDevice", "device"), Param("const VkPipelineCacheCreateInfo*", "pCreateInfo"), - Param("const VkAllocCallbacks*", "pAllocator"), + Param("const VkAllocationCallbacks*", "pAllocator"), Param("VkPipelineCache*", "pPipelineCache")]), Proto("void", "DestroyPipelineCache", [Param("VkDevice", "device"), Param("VkPipelineCache", "pipelineCache"), - Param("const VkAllocCallbacks*", "pAllocator")]), + Param("const VkAllocationCallbacks*", "pAllocator")]), Proto("VkResult", "GetPipelineCacheData", [Param("VkDevice", "device"), @@ -567,7 +567,7 @@ core = Extension( Proto("VkResult", "MergePipelineCaches", [Param("VkDevice", "device"), - Param("VkPipelineCache", "destCache"), + Param("VkPipelineCache", "dstCache"), Param("uint32_t", "srcCacheCount"), Param("const VkPipelineCache*", "pSrcCaches")]), @@ -576,7 +576,7 @@ core = Extension( Param("VkPipelineCache", "pipelineCache"), Param("uint32_t", "createInfoCount"), Param("const VkGraphicsPipelineCreateInfo*", "pCreateInfos"), - Param("const VkAllocCallbacks*", "pAllocator"), + Param("const VkAllocationCallbacks*", "pAllocator"), Param("VkPipeline*", "pPipelines")]), Proto("VkResult", "CreateComputePipelines", @@ -584,66 +584,66 @@ core = Extension( Param("VkPipelineCache", "pipelineCache"), Param("uint32_t", "createInfoCount"), Param("const VkComputePipelineCreateInfo*", "pCreateInfos"), - Param("const VkAllocCallbacks*", "pAllocator"), + Param("const VkAllocationCallbacks*", "pAllocator"), Param("VkPipeline*", "pPipelines")]), Proto("void", "DestroyPipeline", [Param("VkDevice", "device"), Param("VkPipeline", "pipeline"), - Param("const VkAllocCallbacks*", "pAllocator")]), + Param("const VkAllocationCallbacks*", "pAllocator")]), Proto("VkResult", "CreatePipelineLayout", [Param("VkDevice", "device"), Param("const VkPipelineLayoutCreateInfo*", "pCreateInfo"), - Param("const VkAllocCallbacks*", "pAllocator"), + Param("const VkAllocationCallbacks*", "pAllocator"), Param("VkPipelineLayout*", "pPipelineLayout")]), Proto("void", "DestroyPipelineLayout", [Param("VkDevice", "device"), Param("VkPipelineLayout", "pipelineLayout"), - Param("const VkAllocCallbacks*", "pAllocator")]), + Param("const VkAllocationCallbacks*", "pAllocator")]), Proto("VkResult", "CreateSampler", [Param("VkDevice", "device"), Param("const VkSamplerCreateInfo*", "pCreateInfo"), - Param("const VkAllocCallbacks*", "pAllocator"), + Param("const VkAllocationCallbacks*", "pAllocator"), Param("VkSampler*", "pSampler")]), Proto("void", "DestroySampler", [Param("VkDevice", "device"), Param("VkSampler", "sampler"), - Param("const VkAllocCallbacks*", "pAllocator")]), + Param("const VkAllocationCallbacks*", "pAllocator")]), Proto("VkResult", "CreateDescriptorSetLayout", [Param("VkDevice", "device"), Param("const VkDescriptorSetLayoutCreateInfo*", "pCreateInfo"), - Param("const VkAllocCallbacks*", "pAllocator"), + Param("const VkAllocationCallbacks*", "pAllocator"), Param("VkDescriptorSetLayout*", "pSetLayout")]), Proto("void", "DestroyDescriptorSetLayout", [Param("VkDevice", "device"), Param("VkDescriptorSetLayout", "descriptorSetLayout"), - Param("const VkAllocCallbacks*", "pAllocator")]), + Param("const VkAllocationCallbacks*", "pAllocator")]), Proto("VkResult", "CreateDescriptorPool", [Param("VkDevice", "device"), Param("const VkDescriptorPoolCreateInfo*", "pCreateInfo"), - Param("const VkAllocCallbacks*", "pAllocator"), + Param("const VkAllocationCallbacks*", "pAllocator"), Param("VkDescriptorPool*", "pDescriptorPool")]), Proto("void", "DestroyDescriptorPool", [Param("VkDevice", "device"), Param("VkDescriptorPool", "descriptorPool"), - Param("const VkAllocCallbacks*", "pAllocator")]), + Param("const VkAllocationCallbacks*", "pAllocator")]), Proto("VkResult", "ResetDescriptorPool", [Param("VkDevice", "device"), Param("VkDescriptorPool", "descriptorPool"), Param("VkDescriptorPoolResetFlags", "flags")]), - Proto("VkResult", "AllocDescriptorSets", + Proto("VkResult", "AllocateDescriptorSets", [Param("VkDevice", "device"), - Param("const VkDescriptorSetAllocInfo*", "pAllocInfo"), + Param("const VkDescriptorSetAllocateInfo*", "pAllocateInfo"), Param("VkDescriptorSet*", "pDescriptorSets")]), Proto("VkResult", "FreeDescriptorSets", @@ -662,24 +662,24 @@ core = Extension( Proto("VkResult", "CreateFramebuffer", [Param("VkDevice", "device"), Param("const VkFramebufferCreateInfo*", "pCreateInfo"), - Param("const VkAllocCallbacks*", "pAllocator"), + Param("const VkAllocationCallbacks*", "pAllocator"), Param("VkFramebuffer*", "pFramebuffer")]), Proto("void", "DestroyFramebuffer", [Param("VkDevice", "device"), Param("VkFramebuffer", "framebuffer"), - Param("const VkAllocCallbacks*", "pAllocator")]), + Param("const VkAllocationCallbacks*", "pAllocator")]), Proto("VkResult", "CreateRenderPass", [Param("VkDevice", "device"), Param("const VkRenderPassCreateInfo*", "pCreateInfo"), - Param("const VkAllocCallbacks*", "pAllocator"), + Param("const VkAllocationCallbacks*", "pAllocator"), Param("VkRenderPass*", "pRenderPass")]), Proto("void", "DestroyRenderPass", [Param("VkDevice", "device"), Param("VkRenderPass", "renderPass"), - Param("const VkAllocCallbacks*", "pAllocator")]), + Param("const VkAllocationCallbacks*", "pAllocator")]), Proto("void", "GetRenderAreaGranularity", [Param("VkDevice", "device"), @@ -688,93 +688,93 @@ core = Extension( Proto("VkResult", "CreateCommandPool", [Param("VkDevice", "device"), - Param("const VkCmdPoolCreateInfo*", "pCreateInfo"), - Param("const VkAllocCallbacks*", "pAllocator"), - Param("VkCmdPool*", "pCmdPool")]), + Param("const VkCommandPoolCreateInfo*", "pCreateInfo"), + Param("const VkAllocationCallbacks*", "pAllocator"), + Param("VkCommandPool*", "pCommandPool")]), Proto("void", "DestroyCommandPool", [Param("VkDevice", "device"), - Param("VkCmdPool", "cmdPool"), - Param("const VkAllocCallbacks*", "pAllocator")]), + Param("VkCommandPool", "commandPool"), + Param("const VkAllocationCallbacks*", "pAllocator")]), Proto("VkResult", "ResetCommandPool", [Param("VkDevice", "device"), - Param("VkCmdPool", "cmdPool"), - Param("VkCmdPoolResetFlags", "flags")]), + Param("VkCommandPool", "commandPool"), + Param("VkCommandPoolResetFlags", "flags")]), - Proto("VkResult", "AllocCommandBuffers", + Proto("VkResult", "AllocateCommandBuffers", [Param("VkDevice", "device"), - Param("const VkCmdBufferAllocInfo*", "pAllocInfo"), - Param("VkCmdBuffer*", "pCmdBuffers")]), + Param("const VkCommandBufferAllocateInfo*", "pAllocateInfo"), + Param("VkCommandBuffer*", "pCommandBuffers")]), Proto("void", "FreeCommandBuffers", [Param("VkDevice", "device"), - Param("VkCmdPool", "cmdPool"), + Param("VkCommandPool", "commandPool"), Param("uint32_t", "commandBufferCount"), - Param("const VkCmdBuffer*", "pCommandBuffers")]), + Param("const VkCommandBuffer*", "pCommandBuffers")]), Proto("VkResult", "BeginCommandBuffer", - [Param("VkCmdBuffer", "cmdBuffer"), - Param("const VkCmdBufferBeginInfo*", "pBeginInfo")]), + [Param("VkCommandBuffer", "commandBuffer"), + Param("const VkCommandBufferBeginInfo*", "pBeginInfo")]), Proto("VkResult", "EndCommandBuffer", - [Param("VkCmdBuffer", "cmdBuffer")]), + [Param("VkCommandBuffer", "commandBuffer")]), Proto("VkResult", "ResetCommandBuffer", - [Param("VkCmdBuffer", "cmdBuffer"), - Param("VkCmdBufferResetFlags", "flags")]), + [Param("VkCommandBuffer", "commandBuffer"), + Param("VkCommandBufferResetFlags", "flags")]), Proto("void", "CmdBindPipeline", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("VkPipelineBindPoint", "pipelineBindPoint"), Param("VkPipeline", "pipeline")]), Proto("void", "CmdSetViewport", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("uint32_t", "viewportCount"), Param("const VkViewport*", "pViewports")]), Proto("void", "CmdSetScissor", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("uint32_t", "scissorCount"), Param("const VkRect2D*", "pScissors")]), Proto("void", "CmdSetLineWidth", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("float", "lineWidth")]), Proto("void", "CmdSetDepthBias", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("float", "depthBiasConstantFactor"), Param("float", "depthBiasClamp"), Param("float", "depthBiasSlopeFactor")]), Proto("void", "CmdSetBlendConstants", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("const float[4]", "blendConstants")]), Proto("void", "CmdSetDepthBounds", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("float", "minDepthBounds"), Param("float", "maxDepthBounds")]), Proto("void", "CmdSetStencilCompareMask", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("VkStencilFaceFlags", "faceMask"), Param("uint32_t", "stencilCompareMask")]), Proto("void", "CmdSetStencilWriteMask", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("VkStencilFaceFlags", "faceMask"), Param("uint32_t", "stencilWriteMask")]), Proto("void", "CmdSetStencilReference", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("VkStencilFaceFlags", "faceMask"), Param("uint32_t", "stencilReference")]), Proto("void", "CmdBindDescriptorSets", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("VkPipelineBindPoint", "pipelineBindPoint"), Param("VkPipelineLayout", "layout"), Param("uint32_t", "firstSet"), @@ -784,27 +784,27 @@ core = Extension( Param("const uint32_t*", "pDynamicOffsets")]), Proto("void", "CmdBindIndexBuffer", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("VkBuffer", "buffer"), Param("VkDeviceSize", "offset"), Param("VkIndexType", "indexType")]), Proto("void", "CmdBindVertexBuffers", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("uint32_t", "startBinding"), Param("uint32_t", "bindingCount"), Param("const VkBuffer*", "pBuffers"), Param("const VkDeviceSize*", "pOffsets")]), Proto("void", "CmdDraw", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("uint32_t", "vertexCount"), Param("uint32_t", "instanceCount"), Param("uint32_t", "firstVertex"), Param("uint32_t", "firstInstance")]), Proto("void", "CmdDrawIndexed", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("uint32_t", "indexCount"), Param("uint32_t", "instanceCount"), Param("uint32_t", "firstIndex"), @@ -812,88 +812,88 @@ core = Extension( Param("uint32_t", "firstInstance")]), Proto("void", "CmdDrawIndirect", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("VkBuffer", "buffer"), Param("VkDeviceSize", "offset"), Param("uint32_t", "drawCount"), Param("uint32_t", "stride")]), Proto("void", "CmdDrawIndexedIndirect", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("VkBuffer", "buffer"), Param("VkDeviceSize", "offset"), Param("uint32_t", "drawCount"), Param("uint32_t", "stride")]), Proto("void", "CmdDispatch", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("uint32_t", "x"), Param("uint32_t", "y"), Param("uint32_t", "z")]), Proto("void", "CmdDispatchIndirect", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("VkBuffer", "buffer"), Param("VkDeviceSize", "offset")]), Proto("void", "CmdCopyBuffer", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("VkBuffer", "srcBuffer"), - Param("VkBuffer", "destBuffer"), + Param("VkBuffer", "dstBuffer"), Param("uint32_t", "regionCount"), Param("const VkBufferCopy*", "pRegions")]), Proto("void", "CmdCopyImage", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("VkImage", "srcImage"), Param("VkImageLayout", "srcImageLayout"), - Param("VkImage", "destImage"), - Param("VkImageLayout", "destImageLayout"), + Param("VkImage", "dstImage"), + Param("VkImageLayout", "dstImageLayout"), Param("uint32_t", "regionCount"), Param("const VkImageCopy*", "pRegions")]), Proto("void", "CmdBlitImage", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("VkImage", "srcImage"), Param("VkImageLayout", "srcImageLayout"), - Param("VkImage", "destImage"), - Param("VkImageLayout", "destImageLayout"), + Param("VkImage", "dstImage"), + Param("VkImageLayout", "dstImageLayout"), Param("uint32_t", "regionCount"), Param("const VkImageBlit*", "pRegions"), Param("VkFilter", "filter")]), Proto("void", "CmdCopyBufferToImage", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("VkBuffer", "srcBuffer"), - Param("VkImage", "destImage"), - Param("VkImageLayout", "destImageLayout"), + Param("VkImage", "dstImage"), + Param("VkImageLayout", "dstImageLayout"), Param("uint32_t", "regionCount"), Param("const VkBufferImageCopy*", "pRegions")]), Proto("void", "CmdCopyImageToBuffer", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("VkImage", "srcImage"), Param("VkImageLayout", "srcImageLayout"), - Param("VkBuffer", "destBuffer"), + Param("VkBuffer", "dstBuffer"), Param("uint32_t", "regionCount"), Param("const VkBufferImageCopy*", "pRegions")]), Proto("void", "CmdUpdateBuffer", - [Param("VkCmdBuffer", "cmdBuffer"), - Param("VkBuffer", "destBuffer"), - Param("VkDeviceSize", "destOffset"), + [Param("VkCommandBuffer", "commandBuffer"), + Param("VkBuffer", "dstBuffer"), + Param("VkDeviceSize", "dstOffset"), Param("VkDeviceSize", "dataSize"), Param("const uint32_t*", "pData")]), Proto("void", "CmdFillBuffer", - [Param("VkCmdBuffer", "cmdBuffer"), - Param("VkBuffer", "destBuffer"), - Param("VkDeviceSize", "destOffset"), + [Param("VkCommandBuffer", "commandBuffer"), + Param("VkBuffer", "dstBuffer"), + Param("VkDeviceSize", "dstOffset"), Param("VkDeviceSize", "size"), Param("uint32_t", "data")]), Proto("void", "CmdClearColorImage", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("VkImage", "image"), Param("VkImageLayout", "imageLayout"), Param("const VkClearColorValue*", "pColor"), @@ -901,7 +901,7 @@ core = Extension( Param("const VkImageSubresourceRange*", "pRanges")]), Proto("void", "CmdClearDepthStencilImage", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("VkImage", "image"), Param("VkImageLayout", "imageLayout"), Param("const VkClearDepthStencilValue*", "pDepthStencil"), @@ -909,83 +909,83 @@ core = Extension( Param("const VkImageSubresourceRange*", "pRanges")]), Proto("void", "CmdClearAttachments", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("uint32_t", "attachmentCount"), Param("const VkClearAttachment*", "pAttachments"), Param("uint32_t", "rectCount"), Param("const VkClearRect*", "pRects")]), Proto("void", "CmdResolveImage", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("VkImage", "srcImage"), Param("VkImageLayout", "srcImageLayout"), - Param("VkImage", "destImage"), - Param("VkImageLayout", "destImageLayout"), + Param("VkImage", "dstImage"), + Param("VkImageLayout", "dstImageLayout"), Param("uint32_t", "regionCount"), Param("const VkImageResolve*", "pRegions")]), Proto("void", "CmdSetEvent", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("VkEvent", "event"), Param("VkPipelineStageFlags", "stageMask")]), Proto("void", "CmdResetEvent", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("VkEvent", "event"), Param("VkPipelineStageFlags", "stageMask")]), Proto("void", "CmdWaitEvents", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("uint32_t", "eventCount"), Param("const VkEvent*", "pEvents"), Param("VkPipelineStageFlags", "srcStageMask"), - Param("VkPipelineStageFlags", "destStageMask"), - Param("uint32_t", "memBarrierCount"), - Param("const void* const*", "ppMemBarriers")]), + Param("VkPipelineStageFlags", "dstStageMask"), + Param("uint32_t", "memoryBarrierCount"), + Param("const void* const*", "ppMemoryBarriers")]), Proto("void", "CmdPipelineBarrier", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("VkPipelineStageFlags", "srcStageMask"), - Param("VkPipelineStageFlags", "destStageMask"), + Param("VkPipelineStageFlags", "dstStageMask"), Param("VkDependencyFlags", "dependencyFlags"), - Param("uint32_t", "memBarrierCount"), - Param("const void* const*", "ppMemBarriers")]), + Param("uint32_t", "memoryBarrierCount"), + Param("const void* const*", "ppMemoryBarriers")]), Proto("void", "CmdBeginQuery", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("VkQueryPool", "queryPool"), Param("uint32_t", "slot"), Param("VkQueryControlFlags", "flags")]), Proto("void", "CmdEndQuery", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("VkQueryPool", "queryPool"), Param("uint32_t", "slot")]), Proto("void", "CmdResetQueryPool", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("VkQueryPool", "queryPool"), Param("uint32_t", "startQuery"), Param("uint32_t", "queryCount")]), Proto("void", "CmdWriteTimestamp", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("VkPipelineStageFlagBits", "pipelineStage"), Param("VkQueryPool", "queryPool"), Param("uint32_t", "slot")]), Proto("void", "CmdCopyQueryPoolResults", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("VkQueryPool", "queryPool"), Param("uint32_t", "startQuery"), Param("uint32_t", "queryCount"), - Param("VkBuffer", "destBuffer"), - Param("VkDeviceSize", "destOffset"), + Param("VkBuffer", "dstBuffer"), + Param("VkDeviceSize", "dstOffset"), Param("VkDeviceSize", "stride"), Param("VkQueryResultFlags", "flags")]), Proto("void", "CmdPushConstants", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("VkPipelineLayout", "layout"), Param("VkShaderStageFlags", "stageFlags"), Param("uint32_t", "offset"), @@ -993,21 +993,21 @@ core = Extension( Param("const void*", "values")]), Proto("void", "CmdBeginRenderPass", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("const VkRenderPassBeginInfo*", "pRenderPassBegin"), Param("VkRenderPassContents", "contents")]), Proto("void", "CmdNextSubpass", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("VkRenderPassContents", "contents")]), Proto("void", "CmdEndRenderPass", - [Param("VkCmdBuffer", "cmdBuffer")]), + [Param("VkCommandBuffer", "commandBuffer")]), Proto("void", "CmdExecuteCommands", - [Param("VkCmdBuffer", "cmdBuffer"), - Param("uint32_t", "cmdBuffersCount"), - Param("const VkCmdBuffer*", "pCmdBuffers")]), + [Param("VkCommandBuffer", "commandBuffer"), + Param("uint32_t", "commandBuffersCount"), + Param("const VkCommandBuffer*", "pCommandBuffers")]), ], ) @@ -1098,11 +1098,11 @@ debug_marker_lunarg = Extension( objects=[], protos=[ Proto("void", "CmdDbgMarkerBegin", - [Param("VkCmdBuffer", "cmdBuffer"), + [Param("VkCommandBuffer", "commandBuffer"), Param("const char*", "pMarker")]), Proto("void", "CmdDbgMarkerEnd", - [Param("VkCmdBuffer", "cmdBuffer")]), + [Param("VkCommandBuffer", "commandBuffer")]), Proto("VkResult", "DbgSetObjectTag", [Param("VkDevice", "device"), @@ -1126,11 +1126,11 @@ object_dispatch_list = [ "VkPhysicalDevice", "VkDevice", "VkQueue", - "VkCmdBuffer", + "VkCommandBuffer", ] object_non_dispatch_list = [ - "VkCmdPool", + "VkCommandPool", "VkFence", "VkDeviceMemory", "VkBuffer", |