1 files changed, 111 insertions, 13 deletions

diff --git a/src/gui/vulkan/qvulkanwindow.cpp b/src/gui/vulkan/qvulkanwindow.cpp
index 4b5c2b56ee..e211863f21 100644
--- a/src/gui/vulkan/qvulkanwindow.cpp
+++ b/src/gui/vulkan/qvulkanwindow.cpp
@@ -647,18 +647,40 @@ void QVulkanWindowPrivate::init()
 #endif
     qCDebug(lcGuiVk, "Using queue families: graphics = %u present = %u", gfxQueueFamilyIdx, presQueueFamilyIdx);
 
-    VkDeviceQueueCreateInfo queueInfo[2];
+    QVector<VkDeviceQueueCreateInfo> queueInfo;
+    queueInfo.reserve(2);
     const float prio[] = { 0 };
-    memset(queueInfo, 0, sizeof(queueInfo));
-    queueInfo[0].sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
-    queueInfo[0].queueFamilyIndex = gfxQueueFamilyIdx;
-    queueInfo[0].queueCount = 1;
-    queueInfo[0].pQueuePriorities = prio;
+    VkDeviceQueueCreateInfo addQueueInfo;
+    memset(&addQueueInfo, 0, sizeof(addQueueInfo));
+    addQueueInfo.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
+    addQueueInfo.queueFamilyIndex = gfxQueueFamilyIdx;
+    addQueueInfo.queueCount = 1;
+    addQueueInfo.pQueuePriorities = prio;
+    queueInfo.append(addQueueInfo);
     if (gfxQueueFamilyIdx != presQueueFamilyIdx) {
-        queueInfo[1].sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
-        queueInfo[1].queueFamilyIndex = presQueueFamilyIdx;
-        queueInfo[1].queueCount = 1;
-        queueInfo[1].pQueuePriorities = prio;
+        addQueueInfo.queueFamilyIndex = presQueueFamilyIdx;
+        addQueueInfo.queueCount = 1;
+        addQueueInfo.pQueuePriorities = prio;
+        queueInfo.append(addQueueInfo);
+    }
+    if (queueCreateInfoModifier) {
+        queueCreateInfoModifier(queueFamilyProps.constData(), queueCount, queueInfo);
+        bool foundGfxQueue = false;
+        bool foundPresQueue = false;
+        for (const VkDeviceQueueCreateInfo& createInfo : qAsConst(queueInfo)) {
+            foundGfxQueue |= createInfo.queueFamilyIndex == gfxQueueFamilyIdx;
+            foundPresQueue |= createInfo.queueFamilyIndex == presQueueFamilyIdx;
+        }
+        if (!foundGfxQueue) {
+            qWarning("QVulkanWindow: Graphics queue missing after call to queueCreateInfoModifier");
+            status = StatusFail;
+            return;
+        }
+        if (!foundPresQueue) {
+            qWarning("QVulkanWindow: Present queue missing after call to queueCreateInfoModifier");
+            status = StatusFail;
+            return;
+        }
     }
 
     // Filter out unsupported extensions in order to keep symmetry
@@ -667,6 +689,15 @@ void QVulkanWindowPrivate::init()
     QVulkanInfoVector<QVulkanExtension> supportedExtensions = q->supportedDeviceExtensions();
     QByteArrayList reqExts = requestedDevExtensions;
     reqExts.append("VK_KHR_swapchain");
+
+    QByteArray envExts = qgetenv("QT_VULKAN_DEVICE_EXTENSIONS");
+    if (!envExts.isEmpty()) {
+        QByteArrayList envExtList =  envExts.split(';');
+        for (auto ext : reqExts)
+            envExtList.removeAll(ext);
+        reqExts.append(envExtList);
+    }
+
     for (const QByteArray &ext : reqExts) {
         if (supportedExtensions.contains(ext))
             devExts.append(ext.constData());
@@ -676,8 +707,8 @@ void QVulkanWindowPrivate::init()
     VkDeviceCreateInfo devInfo;
     memset(&devInfo, 0, sizeof(devInfo));
     devInfo.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO;
-    devInfo.queueCreateInfoCount = gfxQueueFamilyIdx == presQueueFamilyIdx ? 1 : 2;
-    devInfo.pQueueCreateInfos = queueInfo;
+    devInfo.queueCreateInfoCount = queueInfo.size();
+    devInfo.pQueueCreateInfos = queueInfo.constData();
     devInfo.enabledExtensionCount = devExts.count();
     devInfo.ppEnabledExtensionNames = devExts.constData();
 
@@ -1546,6 +1577,52 @@ bool QVulkanWindow::event(QEvent *e)
 }
 
 /*!
+    \typedef QVulkanWindow::QueueCreateInfoModifier
+
+    A function function that is called during graphics initialization to add
+    additAional queues that should be created.
+
+    Set if the renderer needs additional queues besides the default graphics
+    queue (e.g. a transfer queue).
+    The provided queue family properties can be used to select the indices for
+    the additional queues.
+    The renderer can subsequently request the actual queue in initResources().
+
+    Note when requesting additional graphics queues: Qt itself always requests
+    a graphics queue, you'll need to search queueCreateInfo for the appropriate
+    entry and manipulate it to obtain the additional queue.
+
+    \sa setQueueCreateInfoModifier()
+ */
+
+/*!
+    Return a previously set queue create info modification function.
+
+    \sa setQueueCreateInfoModifier()
+
+    \since 5.15
+ */
+QVulkanWindow::QueueCreateInfoModifier QVulkanWindow::queueCreateInfoModifier() const
+{
+    Q_D(const QVulkanWindow);
+    return d->queueCreateInfoModifier;
+}
+
+/*!
+    Set a queue create info modification function.
+
+    \sa queueCreateInfoModifier()
+
+    \since 5.15
+ */
+void QVulkanWindow::setQueueCreateInfoModifier(QueueCreateInfoModifier modifier)
+{
+    Q_D(QVulkanWindow);
+    d->queueCreateInfoModifier = modifier;
+}
+
+
+/*!
     Returns true if this window has successfully initialized all Vulkan
     resources, including the swapchain.
 
@@ -1798,7 +1875,7 @@ void QVulkanWindowPrivate::beginFrame()
     // build new draw command buffer
     if (image.cmdBuf) {
         devFuncs->vkFreeCommandBuffers(dev, cmdPool, 1, &image.cmdBuf);
-        image.cmdBuf = 0;
+        image.cmdBuf = nullptr;
     }
 
     VkCommandBufferAllocateInfo cmdBufInfo = {
@@ -1950,6 +2027,10 @@ void QVulkanWindowPrivate::endFrame()
     presInfo.waitSemaphoreCount = 1;
     presInfo.pWaitSemaphores = gfxQueueFamilyIdx == presQueueFamilyIdx ? &frame.drawSem : &frame.presTransSem;
 
+    // Do platform-specific WM notification. F.ex. essential on Wayland in
+    // order to circumvent driver frame callbacks
+    inst->presentAboutToBeQueued(q);
+
     err = vkQueuePresentKHR(gfxQueue, &presInfo);
     if (err != VK_SUCCESS) {
         if (err == VK_ERROR_OUT_OF_DATE_KHR) {
@@ -2211,6 +2292,23 @@ VkQueue QVulkanWindow::graphicsQueue() const
 }
 
 /*!
+    Returns the family index of the active graphics queue.
+
+    \note Calling this function is only valid from the invocation of
+    QVulkanWindowRenderer::initResources() up until
+    QVulkanWindowRenderer::releaseResources(). Implementations of
+    QVulkanWindowRenderer::updateQueueCreateInfo() can also call this
+    function.
+
+    \since 5.15
+ */
+uint32_t QVulkanWindow::graphicsQueueFamilyIndex() const
+{
+    Q_D(const QVulkanWindow);
+    return d->gfxQueueFamilyIdx;
+}
+
+/*!
     Returns the active graphics command pool.
 
     \note Calling this function is only valid from the invocation of