From a8fe78a9564106610d2de75d8a5a523caa296281 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Tue, 27 Oct 2015 18:04:07 +0800 Subject: 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 --- layers/screenshot.cpp | 60 +++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'layers/screenshot.cpp') 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 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 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; } -- cgit v1.2.3