diff options
| author | Chia-I Wu <olv@lunarg.com> | 2015-10-26 20:48:51 +0800 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-11-02 13:40:50 -0700 |
| commit | 3dfc13470d037c5681ae716bfbeb65b7e59f9018 (patch) | |
| tree | 57e3af6b43557afbb039eb1c7f53bc6bf63ba3a4 /layers/param_checker.cpp | |
| parent | 3f72dda365a3289d988160b6fdbcaa28dc059a71 (diff) | |
| download | usermoji-3dfc13470d037c5681ae716bfbeb65b7e59f9018.tar.xz | |
bug 14892: 'count' parameters and members named inconsistently in many cases (WIP)
s/waitSemCount/waitSemaphoreCount/g
s/signalSemCount/signalSemaphoreCount/g
s/cmdBufferCount/commandBufferCount/g
s/queueFamilyCount/queueFamilyIndexCount/g
s/layerCount/enabledLayerNameCount/g
s/extensionCount/enabledExtensionNameCount/g
https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14892
Diffstat (limited to 'layers/param_checker.cpp')
| -rw-r--r-- | layers/param_checker.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp index 645df9c2..359a8c2e 100644 --- a/layers/param_checker.cpp +++ b/layers/param_checker.cpp @@ -1829,7 +1829,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateInstance( if (result == VK_SUCCESS) { layer_data *data = get_my_data_ptr(get_dispatch_key(*pInstance), layer_data_map); - data->report_data = debug_report_create_instance(pTable, *pInstance, pCreateInfo->extensionCount, + data->report_data = debug_report_create_instance(pTable, *pInstance, pCreateInfo->enabledExtensionNameCount, pCreateInfo->ppEnabledExtensionNames); InitParamChecker(data); @@ -2167,7 +2167,7 @@ bool PreQueueSubmit( bool PostQueueSubmit( VkQueue queue, - uint32_t cmdBufferCount, + uint32_t commandBufferCount, VkFence fence, VkResult result) { @@ -4435,16 +4435,16 @@ bool PreCreateDescriptorSetLayout( "vkCreateDescriptorSetLayout parameter, VkStructureType pCreateInfo->sType, is an invalid enumerator"); return false; } - if(pCreateInfo->pBinding != nullptr) + if(pCreateInfo->pBindings != nullptr) { - if(pCreateInfo->pBinding->descriptorType < VK_DESCRIPTOR_TYPE_BEGIN_RANGE || - pCreateInfo->pBinding->descriptorType > VK_DESCRIPTOR_TYPE_END_RANGE) + if(pCreateInfo->pBindings->descriptorType < VK_DESCRIPTOR_TYPE_BEGIN_RANGE || + pCreateInfo->pBindings->descriptorType > VK_DESCRIPTOR_TYPE_END_RANGE) { log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", "vkCreateDescriptorSetLayout parameter, VkDescriptorType pCreateInfo->pBinding->descriptorType, is an unrecognized enumerator"); return false; } - if(pCreateInfo->pBinding->pImmutableSamplers != nullptr) + if(pCreateInfo->pBindings->pImmutableSamplers != nullptr) { } } @@ -4499,10 +4499,10 @@ bool PreCreateDescriptorPool( "vkCreateDescriptorPool parameter, VkStructureType pCreateInfo->sType, is an invalid enumerator"); return false; } - if(pCreateInfo->pTypeCount != nullptr) + if(pCreateInfo->pTypeCounts != nullptr) { - if(pCreateInfo->pTypeCount->type < VK_DESCRIPTOR_TYPE_BEGIN_RANGE || - pCreateInfo->pTypeCount->type > VK_DESCRIPTOR_TYPE_END_RANGE) + if(pCreateInfo->pTypeCounts->type < VK_DESCRIPTOR_TYPE_BEGIN_RANGE || + pCreateInfo->pTypeCounts->type > VK_DESCRIPTOR_TYPE_END_RANGE) { log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", "vkCreateDescriptorPool parameter, VkDescriptorType pCreateInfo->pTypeCount->type, is an unrecognized enumerator"); @@ -4623,7 +4623,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkAllocDescriptorSets( VkResult result = get_dispatch_table(pc_device_table_map, device)->AllocDescriptorSets(device, pAllocInfo, pDescriptorSets); - PostAllocDescriptorSets(device, pAllocInfo->descriptorPool, pAllocInfo->count, pDescriptorSets, result); + PostAllocDescriptorSets(device, pAllocInfo->descriptorPool, pAllocInfo->setLayoutCount, pDescriptorSets, result); return result; } |