diff options
| -rw-r--r-- | demos/cube.c | 2 | ||||
| -rw-r--r-- | demos/tri.c | 2 | ||||
| -rw-r--r-- | demos/vulkaninfo.c | 4 | ||||
| -rw-r--r-- | icd/nulldrv/nulldrv.c | 2 | ||||
| -rw-r--r-- | include/vulkan.h | 2 | ||||
| -rw-r--r-- | layers/device_limits.cpp | 2 | ||||
| -rw-r--r-- | loader/loader.c | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/demos/cube.c b/demos/cube.c index 335f11c8..394a2d6c 100644 --- a/demos/cube.c +++ b/demos/cube.c @@ -2306,7 +2306,7 @@ static void demo_init_vk(struct demo *demo) VkDeviceCreateInfo device = { .sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO, .pNext = NULL, - .queueRecordCount = 1, + .requestedQueueCount = 1, .pRequestedQueues = &queue, .layerCount = enabled_layer_count, .ppEnabledLayerNames = (const char *const*) ((demo->validate) ? device_validation_layers : NULL), diff --git a/demos/tri.c b/demos/tri.c index 174f877d..dc450f8a 100644 --- a/demos/tri.c +++ b/demos/tri.c @@ -1896,7 +1896,7 @@ static void demo_init_vk(struct demo *demo) VkDeviceCreateInfo device = { .sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO, .pNext = NULL, - .queueRecordCount = 1, + .requestedQueueCount = 1, .pRequestedQueues = &queue, .layerCount = enabled_layer_count, .ppEnabledLayerNames = (const char *const*) ((demo->validate) ? device_validation_layers : NULL), diff --git a/demos/vulkaninfo.c b/demos/vulkaninfo.c index 4eeba067..3c634e40 100644 --- a/demos/vulkaninfo.c +++ b/demos/vulkaninfo.c @@ -394,7 +394,7 @@ static void app_dev_init(struct app_dev *dev, struct app_gpu *gpu) VkDeviceCreateInfo info = { .sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO, .pNext = NULL, - .queueRecordCount = 0, + .requestedQueueCount = 0, .pRequestedQueues = NULL, .layerCount = 0, .ppEnabledLayerNames = NULL, @@ -478,7 +478,7 @@ static void app_dev_init(struct app_dev *dev, struct app_gpu *gpu) } /* request all queues */ - info.queueRecordCount = gpu->queue_count; + info.requestedQueueCount = gpu->queue_count; info.pRequestedQueues = gpu->queue_reqs; info.layerCount = 0; diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c index c01e1111..c1c958f5 100644 --- a/icd/nulldrv/nulldrv.c +++ b/icd/nulldrv/nulldrv.c @@ -213,7 +213,7 @@ static VkResult nulldrv_dev_create(struct nulldrv_gpu *gpu, } ret = dev_create_queues(dev, info->pRequestedQueues, - info->queueRecordCount); + info->requestedQueueCount); if (ret != VK_SUCCESS) { return ret; } diff --git a/include/vulkan.h b/include/vulkan.h index fae3267c..61a0b009 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -1366,7 +1366,7 @@ typedef struct { typedef struct { VkStructureType sType; const void* pNext; - uint32_t queueRecordCount; + uint32_t requestedQueueCount; const VkDeviceQueueCreateInfo* pRequestedQueues; uint32_t layerCount; const char*const* ppEnabledLayerNames; diff --git a/layers/device_limits.cpp b/layers/device_limits.cpp index 34acb207..1c3018b1 100644 --- a/layers/device_limits.cpp +++ b/layers/device_limits.cpp @@ -408,7 +408,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateDevice(VkPhysicalDevice gpu, const VkDevi "Invalid call to vkCreateDevice() w/o first calling vkGetPhysicalDeviceQueueFamilyProperties()."); } else { // Check that the requested queue properties are valid - for (uint32_t i=0; i<pCreateInfo->queueRecordCount; i++) { + for (uint32_t i=0; i<pCreateInfo->requestedQueueCount; i++) { uint32_t requestedIndex = pCreateInfo->pRequestedQueues[i].queueFamilyIndex; 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", diff --git a/loader/loader.c b/loader/loader.c index 31615c84..22a80b15 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -2933,7 +2933,7 @@ VkResult VKAPI loader_CreateDevice( char **filtered_extension_names = NULL; VkResult res; - assert(pCreateInfo->queueRecordCount >= 1); + assert(pCreateInfo->requestedQueueCount >= 1); if (!icd->CreateDevice) { return VK_ERROR_INITIALIZATION_FAILED; |