OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vulkan-1.0.0: Misc. field and argument renames

Browse Source
This commit is contained in:
Jason Ekstrand
2016-01-14 07:41:45 -08:00
parent d877095e66
commit aab9517f3d
8 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
include/vulkan/vulkan.h
View File

@@ -1128,9 +1128,9 @@ typedef struct VkInstanceCreateInfo {
const void* pNext; const void* pNext;
VkInstanceCreateFlags flags; VkInstanceCreateFlags flags;
const VkApplicationInfo* pApplicationInfo; const VkApplicationInfo* pApplicationInfo;
uint32_t enabledLayerNameCount; uint32_t enabledLayerCount;
const char* const* ppEnabledLayerNames; const char* const* ppEnabledLayerNames;
uint32_t enabledExtensionNameCount; uint32_t enabledExtensionCount;
const char* const* ppEnabledExtensionNames; const char* const* ppEnabledExtensionNames;
} VkInstanceCreateInfo; } VkInstanceCreateInfo;
@@ -1389,9 +1389,9 @@ typedef struct VkDeviceCreateInfo {
VkDeviceCreateFlags flags; VkDeviceCreateFlags flags;
uint32_t queueCreateInfoCount; uint32_t queueCreateInfoCount;
const VkDeviceQueueCreateInfo* pQueueCreateInfos; const VkDeviceQueueCreateInfo* pQueueCreateInfos;
uint32_t enabledLayerNameCount; uint32_t enabledLayerCount;
const char* const* ppEnabledLayerNames; const char* const* ppEnabledLayerNames;
uint32_t enabledExtensionNameCount; uint32_t enabledExtensionCount;
const char* const* ppEnabledExtensionNames; const char* const* ppEnabledExtensionNames;
const VkPhysicalDeviceFeatures* pEnabledFeatures; const VkPhysicalDeviceFeatures* pEnabledFeatures;
} VkDeviceCreateInfo; } VkDeviceCreateInfo;
@@ -1540,7 +1540,7 @@ typedef struct VkQueryPoolCreateInfo {
const void* pNext; const void* pNext;
VkQueryPoolCreateFlags flags; VkQueryPoolCreateFlags flags;
VkQueryType queryType; VkQueryType queryType;
uint32_t entryCount; uint32_t queryCount;
VkQueryPipelineStatisticFlags pipelineStatistics; VkQueryPipelineStatisticFlags pipelineStatistics;
} VkQueryPoolCreateInfo; } VkQueryPoolCreateInfo;
@@ -1914,7 +1914,7 @@ typedef struct VkDescriptorSetAllocateInfo {
VkStructureType sType; VkStructureType sType;
const void* pNext; const void* pNext;
VkDescriptorPool descriptorPool; VkDescriptorPool descriptorPool;
uint32_t setLayoutCount; uint32_t descriptorSetCount;
const VkDescriptorSetLayout* pSetLayouts; const VkDescriptorSetLayout* pSetLayouts;
} VkDescriptorSetAllocateInfo; } VkDescriptorSetAllocateInfo;
@@ -2031,7 +2031,7 @@ typedef struct VkCommandBufferAllocateInfo {
const void* pNext; const void* pNext;
VkCommandPool commandPool; VkCommandPool commandPool;
VkCommandBufferLevel level; VkCommandBufferLevel level;
uint32_t bufferCount; uint32_t commandBufferCount;
} VkCommandBufferAllocateInfo; } VkCommandBufferAllocateInfo;
typedef struct VkCommandBufferBeginInfo { 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_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_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_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_vkCmdBeginQuery)(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags);
typedef void (VKAPI_PTR *PFN_vkCmdEndQuery)(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t entry); 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_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_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_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_vkCmdBeginRenderPass)(VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo* pRenderPassBegin, VkSubpassContents contents);
typedef void (VKAPI_PTR *PFN_vkCmdNextSubpass)(VkCommandBuffer commandBuffer, 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_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 #ifdef VK_PROTOTYPES
VKAPI_ATTR VkResult VKAPI_CALL vkCreateInstance( VKAPI_ATTR VkResult VKAPI_CALL vkCreateInstance(
@@ -3058,13 +3058,13 @@ VKAPI_ATTR void VKAPI_CALL vkCmdPipelineBarrier(
VKAPI_ATTR void VKAPI_CALL vkCmdBeginQuery( VKAPI_ATTR void VKAPI_CALL vkCmdBeginQuery(
VkCommandBuffer commandBuffer, VkCommandBuffer commandBuffer,
VkQueryPool queryPool, VkQueryPool queryPool,
uint32_t entry, uint32_t query,
VkQueryControlFlags flags); VkQueryControlFlags flags);
VKAPI_ATTR void VKAPI_CALL vkCmdEndQuery( VKAPI_ATTR void VKAPI_CALL vkCmdEndQuery(
VkCommandBuffer commandBuffer, VkCommandBuffer commandBuffer,
VkQueryPool queryPool, VkQueryPool queryPool,
uint32_t entry); uint32_t query);
VKAPI_ATTR void VKAPI_CALL vkCmdResetQueryPool( VKAPI_ATTR void VKAPI_CALL vkCmdResetQueryPool(
VkCommandBuffer commandBuffer, VkCommandBuffer commandBuffer,
@@ -3076,7 +3076,7 @@ VKAPI_ATTR void VKAPI_CALL vkCmdWriteTimestamp(
VkCommandBuffer commandBuffer, VkCommandBuffer commandBuffer,
VkPipelineStageFlagBits pipelineStage, VkPipelineStageFlagBits pipelineStage,
VkQueryPool queryPool, VkQueryPool queryPool,
uint32_t entry); uint32_t query);
VKAPI_ATTR void VKAPI_CALL vkCmdCopyQueryPoolResults( VKAPI_ATTR void VKAPI_CALL vkCmdCopyQueryPoolResults(
VkCommandBuffer commandBuffer, VkCommandBuffer commandBuffer,
@@ -3110,7 +3110,7 @@ VKAPI_ATTR void VKAPI_CALL vkCmdEndRenderPass(
VKAPI_ATTR void VKAPI_CALL vkCmdExecuteCommands( VKAPI_ATTR void VKAPI_CALL vkCmdExecuteCommands(
VkCommandBuffer commandBuffer, VkCommandBuffer commandBuffer,
uint32_t commandBuffersCount, uint32_t commandBufferCount,
const VkCommandBuffer* pCommandBuffers); const VkCommandBuffer* pCommandBuffers);
#endif #endif

6
src/vulkan/anv_cmd_buffer.c
View File

@@ -217,7 +217,7 @@ VkResult anv_AllocateCommandBuffers(
VkResult result = VK_SUCCESS; VkResult result = VK_SUCCESS;
uint32_t i; 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, result = anv_create_cmd_buffer(device, pool, pAllocateInfo->level,
&pCommandBuffers[i]); &pCommandBuffers[i]);
if (result != VK_SUCCESS) if (result != VK_SUCCESS)
@@ -1010,7 +1010,7 @@ void anv_CmdPushConstants(
void anv_CmdExecuteCommands( void anv_CmdExecuteCommands(
VkCommandBuffer commandBuffer, VkCommandBuffer commandBuffer,
uint32_t commandBuffersCount, uint32_t commandBufferCount,
const VkCommandBuffer* pCmdBuffers) const VkCommandBuffer* pCmdBuffers)
{ {
ANV_FROM_HANDLE(anv_cmd_buffer, primary, commandBuffer); 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]); 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]); ANV_FROM_HANDLE(anv_cmd_buffer, secondary, pCmdBuffers[i]);
assert(secondary->level == VK_COMMAND_BUFFER_LEVEL_SECONDARY); assert(secondary->level == VK_COMMAND_BUFFER_LEVEL_SECONDARY);

2
src/vulkan/anv_descriptor_set.c
View File

@@ -421,7 +421,7 @@ VkResult anv_AllocateDescriptorSets(
struct anv_descriptor_set *set; struct anv_descriptor_set *set;
uint32_t i; 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, ANV_FROM_HANDLE(anv_descriptor_set_layout, layout,
pAllocateInfo->pSetLayouts[i]); pAllocateInfo->pSetLayouts[i]);

4
src/vulkan/anv_device.c
View File

@@ -213,7 +213,7 @@ VkResult anv_CreateInstance(
if (pCreateInfo->pApplicationInfo->apiVersion != VK_MAKE_VERSION(0, 210, 1)) if (pCreateInfo->pApplicationInfo->apiVersion != VK_MAKE_VERSION(0, 210, 1))
return vk_error(VK_ERROR_INCOMPATIBLE_DRIVER); 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; bool found = false;
for (uint32_t j = 0; j < ARRAY_SIZE(global_extensions); j++) { for (uint32_t j = 0; j < ARRAY_SIZE(global_extensions); j++) {
if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], if (strcmp(pCreateInfo->ppEnabledExtensionNames[i],
@@ -671,7 +671,7 @@ VkResult anv_CreateDevice(
assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO); 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; bool found = false;
for (uint32_t j = 0; j < ARRAY_SIZE(device_extensions); j++) { for (uint32_t j = 0; j < ARRAY_SIZE(device_extensions); j++) {
if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], if (strcmp(pCreateInfo->ppEnabledExtensionNames[i],

2
src/vulkan/anv_dump.c
View File

@@ -87,7 +87,7 @@ anv_dump_image_to_ppm(struct anv_device *device,
.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO,
.commandPool = commandPool, .commandPool = commandPool,
.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY, .level = VK_COMMAND_BUFFER_LEVEL_PRIMARY,
.bufferCount = 1, .commandBufferCount = 1,
}, &cmd); }, &cmd);
assert(result == VK_SUCCESS); assert(result == VK_SUCCESS);

2
src/vulkan/anv_meta.c
View File

@@ -564,7 +564,7 @@ meta_emit_blit(struct anv_cmd_buffer *cmd_buffer,
&(VkDescriptorSetAllocateInfo) { &(VkDescriptorSetAllocateInfo) {
.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO, .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO,
.descriptorPool = dummy_desc_pool, .descriptorPool = dummy_desc_pool,
.setLayoutCount = 1, .descriptorSetCount = 1,
.pSetLayouts = &device->meta_state.blit.ds_layout .pSetLayouts = &device->meta_state.blit.ds_layout
}, &set); }, &set);
anv_UpdateDescriptorSets(anv_device_to_handle(device), anv_UpdateDescriptorSets(anv_device_to_handle(device),

4
src/vulkan/anv_query.c
View File

@@ -60,9 +60,9 @@ VkResult anv_CreateQueryPool(
return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY); return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
pool->type = pCreateInfo->queryType; 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); result = anv_bo_init_new(&pool->bo, device, size);
if (result != VK_SUCCESS) if (result != VK_SUCCESS)
goto fail; goto fail;

16
src/vulkan/gen8_cmd_buffer.c
View File

@@ -890,7 +890,7 @@ emit_query_availability(struct anv_batch *batch,
void genX(CmdBeginQuery)( void genX(CmdBeginQuery)(
VkCommandBuffer commandBuffer, VkCommandBuffer commandBuffer,
VkQueryPool queryPool, VkQueryPool queryPool,
uint32_t entry, uint32_t query,
VkQueryControlFlags flags) VkQueryControlFlags flags)
{ {
ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer); ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer);
@@ -912,7 +912,7 @@ void genX(CmdBeginQuery)(
switch (pool->type) { switch (pool->type) {
case VK_QUERY_TYPE_OCCLUSION: case VK_QUERY_TYPE_OCCLUSION:
emit_ps_depth_count(&cmd_buffer->batch, &pool->bo, emit_ps_depth_count(&cmd_buffer->batch, &pool->bo,
entry * sizeof(struct anv_query_pool_slot)); query * sizeof(struct anv_query_pool_slot));
break; break;
case VK_QUERY_TYPE_PIPELINE_STATISTICS: case VK_QUERY_TYPE_PIPELINE_STATISTICS:
@@ -924,7 +924,7 @@ void genX(CmdBeginQuery)(
void genX(CmdEndQuery)( void genX(CmdEndQuery)(
VkCommandBuffer commandBuffer, VkCommandBuffer commandBuffer,
VkQueryPool queryPool, VkQueryPool queryPool,
uint32_t entry) uint32_t query)
{ {
ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer); ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer);
ANV_FROM_HANDLE(anv_query_pool, pool, queryPool); ANV_FROM_HANDLE(anv_query_pool, pool, queryPool);
@@ -932,10 +932,10 @@ void genX(CmdEndQuery)(
switch (pool->type) { switch (pool->type) {
case VK_QUERY_TYPE_OCCLUSION: case VK_QUERY_TYPE_OCCLUSION:
emit_ps_depth_count(&cmd_buffer->batch, &pool->bo, 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, 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; break;
case VK_QUERY_TYPE_PIPELINE_STATISTICS: case VK_QUERY_TYPE_PIPELINE_STATISTICS:
@@ -950,11 +950,11 @@ void genX(CmdWriteTimestamp)(
VkCommandBuffer commandBuffer, VkCommandBuffer commandBuffer,
VkPipelineStageFlagBits pipelineStage, VkPipelineStageFlagBits pipelineStage,
VkQueryPool queryPool, VkQueryPool queryPool,
uint32_t entry) uint32_t query)
{ {
ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer); ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer);
ANV_FROM_HANDLE(anv_query_pool, pool, queryPool); 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); assert(pool->type == VK_QUERY_TYPE_TIMESTAMP);
@@ -977,7 +977,7 @@ void genX(CmdWriteTimestamp)(
break; 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) #define alu_opcode(v) __gen_field((v), 20, 31)