commit c7af14b7eb1862586e93b90cb789b1912704fb80
author Jeremy Gebben <jeremyg@lunarg.com> Fri Oct 22 11:16:48 2021 -0600
committer jeremyg-lunarg <jeremyg@lunarg.com> Mon Oct 25 14:57:25 2021 -0600
tree 2b1910d1dad653421f10787c953a554a20228eb6
parent 73904228e32c19fcf973452b14905b0607fec642

tests: Only get requested queues in Device::init_queues()

Make sure it only calls vkGetDeviceQueue() on the queues specified
in the device create info. This allows creating devices with a limited
set of queues rather than everything the phyiscal device supports.

tests/vktestbinding.cpp

diff --git a/tests/vktestbinding.cpp b/tests/vktestbinding.cpp
index 1fb3d06..d3a770a 100644
--- a/tests/vktestbinding.cpp
+++ b/tests/vktestbinding.cpp
@@ -293,11 +293,11 @@
 
     if (EXPECT(vk::CreateDevice(phy_.handle(), &info, NULL, &dev) == VK_SUCCESS)) Handle::init(dev);
 
-    init_queues();
+    init_queues(info);
     init_formats();
 }
 
-void Device::init_queues() {
+void Device::init_queues(const VkDeviceCreateInfo &info) {
     uint32_t queue_node_count;
     vk::GetPhysicalDeviceQueueFamilyProperties(phy_.handle(), &queue_node_count, NULL);
     EXPECT(queue_node_count >= 1);
@@ -306,12 +306,14 @@
     vk::GetPhysicalDeviceQueueFamilyProperties(phy_.handle(), &queue_node_count, queue_props.data());
 
     queue_families_.resize(queue_node_count);
-    for (uint32_t queue_family_i = 0; queue_family_i < queue_node_count; ++queue_family_i) {
-        const auto &queue_prop = queue_props[queue_family_i];
+    for (uint32_t i = 0; i < info.queueCreateInfoCount; i++) {
+        const auto &queue_create_info = info.pQueueCreateInfos[i];
+        auto queue_family_i = queue_create_info.queueFamilyIndex;
+        const auto &queue_family_prop = queue_props[queue_family_i];
 
         QueueFamilyQueues &queue_storage = queue_families_[queue_family_i];
-        queue_storage.reserve(queue_prop.queueCount);
-        for (uint32_t queue_i = 0; queue_i < queue_prop.queueCount; ++queue_i) {
+        queue_storage.reserve(queue_create_info.queueCount);
+        for (uint32_t queue_i = 0; queue_i < queue_create_info.queueCount; ++queue_i) {
             // TODO: Need to add support for separate MEMMGR and work queues,
             // including synchronization
             VkQueue queue;
@@ -320,21 +322,21 @@
             // Store single copy of the queue object that will self destruct
             queue_storage.emplace_back(new Queue(queue, queue_family_i));
 
-            if (queue_prop.queueFlags & VK_QUEUE_GRAPHICS_BIT) {
+            if (queue_family_prop.queueFlags & VK_QUEUE_GRAPHICS_BIT) {
                 queues_[GRAPHICS].push_back(queue_storage.back().get());
             }
 
-            if (queue_prop.queueFlags & VK_QUEUE_COMPUTE_BIT) {
+            if (queue_family_prop.queueFlags & VK_QUEUE_COMPUTE_BIT) {
                 queues_[COMPUTE].push_back(queue_storage.back().get());
             }
 
-            if (queue_prop.queueFlags & VK_QUEUE_TRANSFER_BIT) {
+            if (queue_family_prop.queueFlags & VK_QUEUE_TRANSFER_BIT) {
                 queues_[DMA].push_back(queue_storage.back().get());
             }
         }
     }
 
-    EXPECT(!queues_[GRAPHICS].empty() || !queues_[COMPUTE].empty());
+    EXPECT(!queues_[GRAPHICS].empty() || !queues_[COMPUTE].empty() || !queues_[DMA].empty());
 }
 
 const Device::QueueFamilyQueues &Device::queue_family_queues(uint32_t queue_family) const {

tests/vktestbinding.h

diff --git a/tests/vktestbinding.h b/tests/vktestbinding.h
index 5412df1..b58a253 100644
--- a/tests/vktestbinding.h
+++ b/tests/vktestbinding.h
@@ -270,7 +270,7 @@
         QUEUE_COUNT,
     };
 
-    void init_queues();
+    void init_queues(const VkDeviceCreateInfo &info);
     void init_formats();
 
     PhysicalDevice phy_;