From dd2d2b1934da3b8bd6f04ef6d951b155eb5e1bc6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jean-Philippe=20Bruy=C3=A8re?= Date: Wed, 13 May 2020 04:01:56 +0200 Subject: [PATCH] update vkh --- tests/common/vkengine.c | 47 ++++++++--------------------------------- vkh | 2 +- 2 files changed, 10 insertions(+), 39 deletions(-) diff --git a/tests/common/vkengine.c b/tests/common/vkengine.c index 4c126c6..0547bf1 100644 --- a/tests/common/vkengine.c +++ b/tests/common/vkengine.c @@ -159,43 +159,15 @@ vk_engine_t* vkengine_create (VkPhysicalDeviceType preferedGPU, VkPresentModeKHR e->gpu_props = pi->properties; uint32_t qCount = 0; + float qPriorities[] = {0.0}; + VkDeviceQueueCreateInfo pQueueInfos[3]; - float queue_priorities[] = {0.0}; - - VkDeviceQueueCreateInfo qiG = { .sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO, - .queueCount = 1, - .queueFamilyIndex = pi->gQueue, - .pQueuePriorities = queue_priorities }; - VkDeviceQueueCreateInfo qiC = { .sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO, - .queueCount = 1, - .queueFamilyIndex = pi->cQueue, - .pQueuePriorities = queue_priorities }; - VkDeviceQueueCreateInfo qiT = { .sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO, - .queueCount = 1, - .queueFamilyIndex = pi->tQueue, - .pQueuePriorities = queue_priorities }; - - if (pi->gQueue == pi->cQueue){ - if(pi->gQueue == pi->tQueue){ - qCount=1; - pQueueInfos[0] = qiG; - }else{ - qCount=2; - pQueueInfos[0] = qiG; - pQueueInfos[1] = qiT; - } - }else{ - if((pi->gQueue == pi->tQueue) || (pi->cQueue==pi->tQueue)){ - qCount=2; - pQueueInfos[0] = qiG; - pQueueInfos[1] = qiC; - }else{ - qCount=3; - pQueueInfos[0] = qiG; - pQueueInfos[1] = qiC; - pQueueInfos[2] = qiT; - } - } + if (vkh_phyinfo_create_presentable_queues (pi, 1, qPriorities, &pQueueInfos[qCount])) + qCount++; + if (vkh_phyinfo_create_compute_queues (pi, 1, qPriorities, &pQueueInfos[qCount])) + qCount++; + if (vkh_phyinfo_create_transfer_queues (pi, 1, qPriorities, &pQueueInfos[qCount])) + qCount++; char const * dex [] = {"VK_KHR_swapchain"}; enabledExtsCount = 1; @@ -210,8 +182,7 @@ vk_engine_t* vkengine_create (VkPhysicalDeviceType preferedGPU, VkPresentModeKHR .pQueueCreateInfos = (VkDeviceQueueCreateInfo*)&pQueueInfos, .enabledExtensionCount = enabledExtsCount, .ppEnabledExtensionNames = dex, - .pEnabledFeatures = &enabledFeatures - }; + .pEnabledFeatures = &enabledFeatures}; e->dev = vkh_device_create(e->app, pi, &device_info); diff --git a/vkh b/vkh index bc156f3..333f82e 160000 --- a/vkh +++ b/vkh @@ -1 +1 @@ -Subproject commit bc156f3b64bea8f5c3734e9d63f2c03a39150063 +Subproject commit 333f82ef13820d39f40b02952369f9aa12efe1a5 -- 2.47.3