From aab9517f3dc5a2f28eaae4a2fa64cb0ad82bb4f7 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Thu, 14 Jan 2016 07:41:45 -0800 Subject: [PATCH] vulkan-1.0.0: Misc. field and argument renames --- include/vulkan/vulkan.h | 30 +++++++++++++++--------------- src/vulkan/anv_cmd_buffer.c | 6 +++--- src/vulkan/anv_descriptor_set.c | 2 +- src/vulkan/anv_device.c | 4 ++-- src/vulkan/anv_dump.c | 2 +- src/vulkan/anv_meta.c | 2 +- src/vulkan/anv_query.c | 4 ++-- src/vulkan/gen8_cmd_buffer.c | 16 ++++++++-------- 8 files changed, 33 insertions(+), 33 deletions(-) diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h index 1d3ef3faafe..a1f460189ce 100644 --- a/include/vulkan/vulkan.h +++ b/include/vulkan/vulkan.h @@ -1128,9 +1128,9 @@ typedef struct VkInstanceCreateInfo { const void* pNext; VkInstanceCreateFlags flags; const VkApplicationInfo* pApplicationInfo; - uint32_t enabledLayerNameCount; + uint32_t enabledLayerCount; const char* const* ppEnabledLayerNames; - uint32_t enabledExtensionNameCount; + uint32_t enabledExtensionCount; const char* const* ppEnabledExtensionNames; } VkInstanceCreateInfo; @@ -1389,9 +1389,9 @@ typedef struct VkDeviceCreateInfo { VkDeviceCreateFlags flags; uint32_t queueCreateInfoCount; const VkDeviceQueueCreateInfo* pQueueCreateInfos; - uint32_t enabledLayerNameCount; + uint32_t enabledLayerCount; const char* const* ppEnabledLayerNames; - uint32_t enabledExtensionNameCount; + uint32_t enabledExtensionCount; const char* const* ppEnabledExtensionNames; const VkPhysicalDeviceFeatures* pEnabledFeatures; } VkDeviceCreateInfo; @@ -1540,7 +1540,7 @@ typedef struct VkQueryPoolCreateInfo { const void* pNext; VkQueryPoolCreateFlags flags; VkQueryType queryType; - uint32_t entryCount; + uint32_t queryCount; VkQueryPipelineStatisticFlags pipelineStatistics; } VkQueryPoolCreateInfo; @@ -1914,7 +1914,7 @@ typedef struct VkDescriptorSetAllocateInfo { VkStructureType sType; const void* pNext; VkDescriptorPool descriptorPool; - uint32_t setLayoutCount; + uint32_t descriptorSetCount; const VkDescriptorSetLayout* pSetLayouts; } VkDescriptorSetAllocateInfo; @@ -2031,7 +2031,7 @@ typedef struct VkCommandBufferAllocateInfo { const void* pNext; VkCommandPool commandPool; VkCommandBufferLevel level; - uint32_t bufferCount; + uint32_t commandBufferCount; } VkCommandBufferAllocateInfo; typedef struct VkCommandBufferBeginInfo { @@ -2312,16 +2312,16 @@ typedef void (VKAPI_PTR *PFN_vkCmdSetEvent)(VkCommandBuffer commandBuffer, VkEve typedef void (VKAPI_PTR *PFN_vkCmdResetEvent)(VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask); typedef void (VKAPI_PTR *PFN_vkCmdWaitEvents)(VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent* pEvents, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, uint32_t memoryBarrierCount, const void* const* ppMemoryBarriers); typedef void (VKAPI_PTR *PFN_vkCmdPipelineBarrier)(VkCommandBuffer commandBuffer, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, VkDependencyFlags dependencyFlags, uint32_t memoryBarrierCount, const void* const* ppMemoryBarriers); -typedef void (VKAPI_PTR *PFN_vkCmdBeginQuery)(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t entry, VkQueryControlFlags flags); -typedef void (VKAPI_PTR *PFN_vkCmdEndQuery)(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t entry); +typedef void (VKAPI_PTR *PFN_vkCmdBeginQuery)(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags); +typedef void (VKAPI_PTR *PFN_vkCmdEndQuery)(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query); typedef void (VKAPI_PTR *PFN_vkCmdResetQueryPool)(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount); -typedef void (VKAPI_PTR *PFN_vkCmdWriteTimestamp)(VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, uint32_t entry); +typedef void (VKAPI_PTR *PFN_vkCmdWriteTimestamp)(VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, uint32_t query); typedef void (VKAPI_PTR *PFN_vkCmdCopyQueryPoolResults)(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize stride, VkQueryResultFlags flags); typedef void (VKAPI_PTR *PFN_vkCmdPushConstants)(VkCommandBuffer commandBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, uint32_t offset, uint32_t size, const void* pValues); typedef void (VKAPI_PTR *PFN_vkCmdBeginRenderPass)(VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo* pRenderPassBegin, VkSubpassContents contents); typedef void (VKAPI_PTR *PFN_vkCmdNextSubpass)(VkCommandBuffer commandBuffer, VkSubpassContents contents); typedef void (VKAPI_PTR *PFN_vkCmdEndRenderPass)(VkCommandBuffer commandBuffer); -typedef void (VKAPI_PTR *PFN_vkCmdExecuteCommands)(VkCommandBuffer commandBuffer, uint32_t commandBuffersCount, const VkCommandBuffer* pCommandBuffers); +typedef void (VKAPI_PTR *PFN_vkCmdExecuteCommands)(VkCommandBuffer commandBuffer, uint32_t commandBufferCount, const VkCommandBuffer* pCommandBuffers); #ifdef VK_PROTOTYPES VKAPI_ATTR VkResult VKAPI_CALL vkCreateInstance( @@ -3058,13 +3058,13 @@ VKAPI_ATTR void VKAPI_CALL vkCmdPipelineBarrier( VKAPI_ATTR void VKAPI_CALL vkCmdBeginQuery( VkCommandBuffer commandBuffer, VkQueryPool queryPool, - uint32_t entry, + uint32_t query, VkQueryControlFlags flags); VKAPI_ATTR void VKAPI_CALL vkCmdEndQuery( VkCommandBuffer commandBuffer, VkQueryPool queryPool, - uint32_t entry); + uint32_t query); VKAPI_ATTR void VKAPI_CALL vkCmdResetQueryPool( VkCommandBuffer commandBuffer, @@ -3076,7 +3076,7 @@ VKAPI_ATTR void VKAPI_CALL vkCmdWriteTimestamp( VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, - uint32_t entry); + uint32_t query); VKAPI_ATTR void VKAPI_CALL vkCmdCopyQueryPoolResults( VkCommandBuffer commandBuffer, @@ -3110,7 +3110,7 @@ VKAPI_ATTR void VKAPI_CALL vkCmdEndRenderPass( VKAPI_ATTR void VKAPI_CALL vkCmdExecuteCommands( VkCommandBuffer commandBuffer, - uint32_t commandBuffersCount, + uint32_t commandBufferCount, const VkCommandBuffer* pCommandBuffers); #endif diff --git a/src/vulkan/anv_cmd_buffer.c b/src/vulkan/anv_cmd_buffer.c index 3df34a511eb..91e97372b2e 100644 --- a/src/vulkan/anv_cmd_buffer.c +++ b/src/vulkan/anv_cmd_buffer.c @@ -217,7 +217,7 @@ VkResult anv_AllocateCommandBuffers( VkResult result = VK_SUCCESS; uint32_t i; - for (i = 0; i < pAllocateInfo->bufferCount; i++) { + for (i = 0; i < pAllocateInfo->commandBufferCount; i++) { result = anv_create_cmd_buffer(device, pool, pAllocateInfo->level, &pCommandBuffers[i]); if (result != VK_SUCCESS) @@ -1010,7 +1010,7 @@ void anv_CmdPushConstants( void anv_CmdExecuteCommands( VkCommandBuffer commandBuffer, - uint32_t commandBuffersCount, + uint32_t commandBufferCount, const VkCommandBuffer* pCmdBuffers) { ANV_FROM_HANDLE(anv_cmd_buffer, primary, commandBuffer); @@ -1019,7 +1019,7 @@ void anv_CmdExecuteCommands( anv_assert(primary->state.subpass == &primary->state.pass->subpasses[0]); - for (uint32_t i = 0; i < commandBuffersCount; i++) { + for (uint32_t i = 0; i < commandBufferCount; i++) { ANV_FROM_HANDLE(anv_cmd_buffer, secondary, pCmdBuffers[i]); assert(secondary->level == VK_COMMAND_BUFFER_LEVEL_SECONDARY); diff --git a/src/vulkan/anv_descriptor_set.c b/src/vulkan/anv_descriptor_set.c index 828e20ae9c9..c414c7c276d 100644 --- a/src/vulkan/anv_descriptor_set.c +++ b/src/vulkan/anv_descriptor_set.c @@ -421,7 +421,7 @@ VkResult anv_AllocateDescriptorSets( struct anv_descriptor_set *set; uint32_t i; - for (i = 0; i < pAllocateInfo->setLayoutCount; i++) { + for (i = 0; i < pAllocateInfo->descriptorSetCount; i++) { ANV_FROM_HANDLE(anv_descriptor_set_layout, layout, pAllocateInfo->pSetLayouts[i]); diff --git a/src/vulkan/anv_device.c b/src/vulkan/anv_device.c index 204f457e41f..265ac5ff7e3 100644 --- a/src/vulkan/anv_device.c +++ b/src/vulkan/anv_device.c @@ -213,7 +213,7 @@ VkResult anv_CreateInstance( if (pCreateInfo->pApplicationInfo->apiVersion != VK_MAKE_VERSION(0, 210, 1)) return vk_error(VK_ERROR_INCOMPATIBLE_DRIVER); - for (uint32_t i = 0; i < pCreateInfo->enabledExtensionNameCount; i++) { + for (uint32_t i = 0; i < pCreateInfo->enabledExtensionCount; i++) { bool found = false; for (uint32_t j = 0; j < ARRAY_SIZE(global_extensions); j++) { if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], @@ -671,7 +671,7 @@ VkResult anv_CreateDevice( assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO); - for (uint32_t i = 0; i < pCreateInfo->enabledExtensionNameCount; i++) { + for (uint32_t i = 0; i < pCreateInfo->enabledExtensionCount; i++) { bool found = false; for (uint32_t j = 0; j < ARRAY_SIZE(device_extensions); j++) { if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], diff --git a/src/vulkan/anv_dump.c b/src/vulkan/anv_dump.c index 3a1430d49a0..7aef32b8648 100644 --- a/src/vulkan/anv_dump.c +++ b/src/vulkan/anv_dump.c @@ -87,7 +87,7 @@ anv_dump_image_to_ppm(struct anv_device *device, .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, .commandPool = commandPool, .level = VK_COMMAND_BUFFER_LEVEL_PRIMARY, - .bufferCount = 1, + .commandBufferCount = 1, }, &cmd); assert(result == VK_SUCCESS); diff --git a/src/vulkan/anv_meta.c b/src/vulkan/anv_meta.c index 18978afd219..aa5fd0488c0 100644 --- a/src/vulkan/anv_meta.c +++ b/src/vulkan/anv_meta.c @@ -564,7 +564,7 @@ meta_emit_blit(struct anv_cmd_buffer *cmd_buffer, &(VkDescriptorSetAllocateInfo) { .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO, .descriptorPool = dummy_desc_pool, - .setLayoutCount = 1, + .descriptorSetCount = 1, .pSetLayouts = &device->meta_state.blit.ds_layout }, &set); anv_UpdateDescriptorSets(anv_device_to_handle(device), diff --git a/src/vulkan/anv_query.c b/src/vulkan/anv_query.c index d4c34c7f021..5b052341e0c 100644 --- a/src/vulkan/anv_query.c +++ b/src/vulkan/anv_query.c @@ -60,9 +60,9 @@ VkResult anv_CreateQueryPool( return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY); pool->type = pCreateInfo->queryType; - pool->slots = pCreateInfo->entryCount; + pool->slots = pCreateInfo->queryCount; - size = pCreateInfo->entryCount * slot_size; + size = pCreateInfo->queryCount * slot_size; result = anv_bo_init_new(&pool->bo, device, size); if (result != VK_SUCCESS) goto fail; diff --git a/src/vulkan/gen8_cmd_buffer.c b/src/vulkan/gen8_cmd_buffer.c index 20a9ec75bca..4066c39aac8 100644 --- a/src/vulkan/gen8_cmd_buffer.c +++ b/src/vulkan/gen8_cmd_buffer.c @@ -890,7 +890,7 @@ emit_query_availability(struct anv_batch *batch, void genX(CmdBeginQuery)( VkCommandBuffer commandBuffer, VkQueryPool queryPool, - uint32_t entry, + uint32_t query, VkQueryControlFlags flags) { ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer); @@ -912,7 +912,7 @@ void genX(CmdBeginQuery)( switch (pool->type) { case VK_QUERY_TYPE_OCCLUSION: emit_ps_depth_count(&cmd_buffer->batch, &pool->bo, - entry * sizeof(struct anv_query_pool_slot)); + query * sizeof(struct anv_query_pool_slot)); break; case VK_QUERY_TYPE_PIPELINE_STATISTICS: @@ -924,7 +924,7 @@ void genX(CmdBeginQuery)( void genX(CmdEndQuery)( VkCommandBuffer commandBuffer, VkQueryPool queryPool, - uint32_t entry) + uint32_t query) { ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer); ANV_FROM_HANDLE(anv_query_pool, pool, queryPool); @@ -932,10 +932,10 @@ void genX(CmdEndQuery)( switch (pool->type) { case VK_QUERY_TYPE_OCCLUSION: emit_ps_depth_count(&cmd_buffer->batch, &pool->bo, - entry * sizeof(struct anv_query_pool_slot) + 8); + query * sizeof(struct anv_query_pool_slot) + 8); emit_query_availability(&cmd_buffer->batch, &pool->bo, - entry * sizeof(struct anv_query_pool_slot) + 16); + query * sizeof(struct anv_query_pool_slot) + 16); break; case VK_QUERY_TYPE_PIPELINE_STATISTICS: @@ -950,11 +950,11 @@ void genX(CmdWriteTimestamp)( VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, - uint32_t entry) + uint32_t query) { ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer); ANV_FROM_HANDLE(anv_query_pool, pool, queryPool); - uint32_t offset = entry * sizeof(struct anv_query_pool_slot); + uint32_t offset = query * sizeof(struct anv_query_pool_slot); assert(pool->type == VK_QUERY_TYPE_TIMESTAMP); @@ -977,7 +977,7 @@ void genX(CmdWriteTimestamp)( break; } - emit_query_availability(&cmd_buffer->batch, &pool->bo, entry + 16); + emit_query_availability(&cmd_buffer->batch, &pool->bo, query + 16); } #define alu_opcode(v) __gen_field((v), 20, 31) -- 2.30.2