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/device_limits.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'layers/device_limits.cpp') diff --git a/layers/device_limits.cpp b/layers/device_limits.cpp index c311f5d6..1d686dd1 100644 --- a/layers/device_limits.cpp +++ b/layers/device_limits.cpp @@ -168,7 +168,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateInstance(const VkInstanceCreateInfo* pCre my_data->report_data = debug_report_create_instance( pTable, *pInstance, - pCreateInfo->extensionCount, + pCreateInfo->enabledExtensionNameCount, pCreateInfo->ppEnabledExtensionNames); init_device_limits(my_data); @@ -349,7 +349,7 @@ static void createDeviceRegisterExtensions(const VkDeviceCreateInfo* pCreateInfo layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); my_data->device_extensions.debug_marker_enabled = false; - for (i = 0; i < pCreateInfo->extensionCount; i++) { + for (i = 0; i < pCreateInfo->enabledExtensionNameCount; i++) { if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], DEBUG_MARKER_EXTENSION_NAME) == 0) { /* Found a matching extension name, mark it enabled and init dispatch table*/ initDebugMarkerTable(device); @@ -405,9 +405,9 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateDevice(VkPhysicalDevice gpu, const VkDevi if (phy_dev_data->queueFamilyProperties.size() <= requestedIndex) { // requested index is out of bounds for this physical device skipCall |= log_msg(phy_dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_PHYSICAL_DEVICE, 0, 0, DEVLIMITS_INVALID_QUEUE_CREATE_REQUEST, "DL", "Invalid queue create request in vkCreateDevice(). Invalid queueFamilyIndex %u requested.", requestedIndex); - } else if (pCreateInfo->pRequestedQueues[i].queueCount > phy_dev_data->queueFamilyProperties[requestedIndex]->queueCount) { + } else if (pCreateInfo->pRequestedQueues[i].queuePriorityCount > phy_dev_data->queueFamilyProperties[requestedIndex]->queueCount) { skipCall |= log_msg(phy_dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_PHYSICAL_DEVICE, 0, 0, DEVLIMITS_INVALID_QUEUE_CREATE_REQUEST, "DL", - "Invalid queue create request in vkCreateDevice(). QueueFamilyIndex %u only has %u queues, but requested queueCount is %u.", requestedIndex, phy_dev_data->queueFamilyProperties[requestedIndex]->queueCount, pCreateInfo->pRequestedQueues[i].queueCount); + "Invalid queue create request in vkCreateDevice(). QueueFamilyIndex %u only has %u queues, but requested queuePriorityCount is %u.", requestedIndex, phy_dev_data->queueFamilyProperties[requestedIndex]->queueCount, pCreateInfo->pRequestedQueues[i].queuePriorityCount); } } } -- cgit v1.2.3