Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

This changes many different CMake places to mention Qt6 instead of
Qt5.

Note that some old qt5 cmake config files in corelib are probably not
needed anymore, but I still renamed and kept them for now.

Change-Id: Ie69e81540386a5af153f76c0242e18d48211bec4

2 files changed, 15 insertions, 5 deletions

diff --git a/src/platformsupport/vkconvenience/qbasicvulkanplatforminstance.cpp b/src/platformsupport/vkconvenience/qbasicvulkanplatforminstance.cpp
index b9c5669b3f..68340a3173 100644
--- a/src/platformsupport/vkconvenience/qbasicvulkanplatforminstance.cpp
+++ b/src/platformsupport/vkconvenience/qbasicvulkanplatforminstance.cpp
@@ -330,6 +330,11 @@ bool QBasicPlatformVulkanInstance::supportsPresent(VkPhysicalDevice physicalDevi
     return supported;
 }
 
+void QBasicPlatformVulkanInstance::setDebugFilters(const QVector<QVulkanInstance::DebugFilter> &filters)
+{
+    m_debugFilters = filters;
+}
+
 void QBasicPlatformVulkanInstance::destroySurface(VkSurfaceKHR surface) const
 {
     if (m_destroySurface && surface)
@@ -345,11 +350,11 @@ static VKAPI_ATTR VkBool32 VKAPI_CALL defaultDebugCallbackFunc(VkDebugReportFlag
                                                                const char *pMessage,
                                                                void *pUserData)
 {
-    Q_UNUSED(flags);
-    Q_UNUSED(objectType);
-    Q_UNUSED(object);
-    Q_UNUSED(location);
-    Q_UNUSED(pUserData);
+    QBasicPlatformVulkanInstance *self = static_cast<QBasicPlatformVulkanInstance *>(pUserData);
+    for (QVulkanInstance::DebugFilter filter : *self->debugFilters()) {
+        if (filter(flags, objectType, object, location, messageCode, pLayerPrefix, pMessage))
+            return VK_FALSE;
+    }
 
     // not categorized, just route to plain old qDebug
     qDebug("vkDebug: %s: %d: %s", pLayerPrefix, messageCode, pMessage);
@@ -374,6 +379,7 @@ void QBasicPlatformVulkanInstance::setupDebugOutput()
             | VK_DEBUG_REPORT_WARNING_BIT_EXT
             | VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT;
     dbgCallbackInfo.pfnCallback = defaultDebugCallbackFunc;
+    dbgCallbackInfo.pUserData = this;
 
     VkResult err = createDebugReportCallback(m_vkInst, &dbgCallbackInfo, nullptr, &m_debugCallback);
     if (err != VK_SUCCESS)
diff --git a/src/platformsupport/vkconvenience/qbasicvulkanplatforminstance_p.h b/src/platformsupport/vkconvenience/qbasicvulkanplatforminstance_p.h
index 566140b032..e59d9219fb 100644
--- a/src/platformsupport/vkconvenience/qbasicvulkanplatforminstance_p.h
+++ b/src/platformsupport/vkconvenience/qbasicvulkanplatforminstance_p.h
@@ -73,7 +73,10 @@ public:
     QByteArrayList enabledExtensions() const override;
     PFN_vkVoidFunction getInstanceProcAddr(const char *name) override;
     bool supportsPresent(VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, QWindow *window) override;
+    void setDebugFilters(const QVector<QVulkanInstance::DebugFilter> &filters) override;
+
     void destroySurface(VkSurfaceKHR surface) const;
+    const QVector<QVulkanInstance::DebugFilter> *debugFilters() const { return &m_debugFilters; }
 
 protected:
     void loadVulkanLibrary(const QString &defaultLibraryName);
@@ -105,6 +108,7 @@ private:
 
     VkDebugReportCallbackEXT m_debugCallback;
     PFN_vkDestroyDebugReportCallbackEXT m_vkDestroyDebugReportCallbackEXT;
+    QVector<QVulkanInstance::DebugFilter> m_debugFilters;
 };
 
 QT_END_NAMESPACE