From 3dfc13470d037c5681ae716bfbeb65b7e59f9018 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Mon, 26 Oct 2015 20:48:51 +0800 Subject: 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 --- layers/shader_checker.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'layers/shader_checker.cpp') diff --git a/layers/shader_checker.cpp b/layers/shader_checker.cpp index 37bcc682..53efcad7 100644 --- a/layers/shader_checker.cpp +++ b/layers/shader_checker.cpp @@ -111,8 +111,8 @@ struct render_pass { std::vector color_formats; uint32_t j; - color_formats.reserve(subpass->colorCount); - for (j = 0; j < subpass->colorCount; j++) { + color_formats.reserve(subpass->colorAttachmentCount); + for (j = 0; j < subpass->colorAttachmentCount; j++) { const uint32_t att = subpass->pColorAttachments[j].attachment; const VkFormat format = pCreateInfo->pAttachments[att].format; @@ -148,7 +148,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateDescriptorSetLayout( loader_platform_thread_lock_mutex(&globalLock); auto& bindings = my_data->descriptor_set_layout_map[*pSetLayout]; bindings = new std::vector( - pCreateInfo->pBinding, pCreateInfo->pBinding + pCreateInfo->count); + pCreateInfo->pBindings, pCreateInfo->pBindings + pCreateInfo->bindingCount); loader_platform_thread_unlock_mutex(&globalLock); } @@ -167,8 +167,8 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreatePipelineLayout( loader_platform_thread_lock_mutex(&globalLock); auto& layouts = my_data->pipeline_layout_map[*pPipelineLayout]; layouts = new std::vector*>(); - layouts->reserve(pCreateInfo->descriptorSetCount); - for (unsigned i = 0; i < pCreateInfo->descriptorSetCount; i++) { + layouts->reserve(pCreateInfo->setLayoutCount); + for (unsigned i = 0; i < pCreateInfo->setLayoutCount; i++) { layouts->push_back(my_data->descriptor_set_layout_map[pCreateInfo->pSetLayouts[i]]); } loader_platform_thread_unlock_mutex(&globalLock); @@ -810,7 +810,7 @@ validate_vi_consistency(layer_data *my_data, VkDevice dev, VkPipelineVertexInput std::unordered_map bindings; bool pass = true; - for (unsigned i = 0; i < vi->bindingCount; i++) { + for (unsigned i = 0; i < vi->vertexBindingDescriptionCount; i++) { auto desc = &vi->pVertexBindingDescriptions[i]; auto & binding = bindings[desc->binding]; if (binding) { @@ -843,7 +843,7 @@ validate_vi_against_vs_inputs(layer_data *my_data, VkDevice dev, VkPipelineVerte /* Build index by location */ std::map attribs; if (vi) { - for (unsigned i = 0; i < vi->attributeCount; i++) + for (unsigned i = 0; i < vi->vertexAttributeDescriptionCount; i++) attribs[vi->pVertexAttributeDescriptions[i].location] = &vi->pVertexAttributeDescriptions[i]; } @@ -1184,7 +1184,7 @@ VkResult VKAPI vkCreateInstance( my_data->report_data = debug_report_create_instance( pTable, *pInstance, - pCreateInfo->extensionCount, + pCreateInfo->enabledExtensionNameCount, pCreateInfo->ppEnabledExtensionNames); init_shader_checker(my_data); -- cgit v1.2.3