Vulkan: Share destroySurface() implementation

The macOS, Windows, and XCB implementations are identical
and can be moved to QBasicPlatformVulkanInstance.

Change-Id: I1380b2bd03080710084a1458bdce3a362ba5c287
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

2 files changed, 13 insertions, 0 deletions

diff --git a/src/platformsupport/vkconvenience/qbasicvulkanplatforminstance.cpp b/src/platformsupport/vkconvenience/qbasicvulkanplatforminstance.cpp
index 382d142334..d8b4e0a7e0 100644
--- a/src/platformsupport/vkconvenience/qbasicvulkanplatforminstance.cpp
+++ b/src/platformsupport/vkconvenience/qbasicvulkanplatforminstance.cpp
@@ -256,6 +256,11 @@ void QBasicPlatformVulkanInstance::initInstance(QVulkanInstance *instance, const
     if (!m_getPhysDevSurfaceSupport)
         qWarning("Failed to find vkGetPhysicalDeviceSurfaceSupportKHR");
 
+    m_destroySurface = reinterpret_cast<PFN_vkDestroySurfaceKHR>(
+                m_vkGetInstanceProcAddr(m_vkInst, "vkDestroySurfaceKHR"));
+    if (!m_destroySurface)
+        qWarning("Failed to find vkDestroySurfaceKHR");
+
     if (!flags.testFlag(QVulkanInstance::NoDebugOutputRedirect))
         setupDebugOutput();
 }
@@ -310,6 +315,12 @@ bool QBasicPlatformVulkanInstance::supportsPresent(VkPhysicalDevice physicalDevi
     return supported;
 }
 
+void QBasicPlatformVulkanInstance::destroySurface(VkSurfaceKHR surface) const
+{
+    if (m_destroySurface && surface)
+        m_destroySurface(m_vkInst, surface, nullptr);
+}
+
 static VKAPI_ATTR VkBool32 VKAPI_CALL defaultDebugCallbackFunc(VkDebugReportFlagsEXT flags,
                                                                VkDebugReportObjectTypeEXT objectType,
                                                                uint64_t object,
diff --git a/src/platformsupport/vkconvenience/qbasicvulkanplatforminstance_p.h b/src/platformsupport/vkconvenience/qbasicvulkanplatforminstance_p.h
index 748b138f01..7395ee0323 100644
--- a/src/platformsupport/vkconvenience/qbasicvulkanplatforminstance_p.h
+++ b/src/platformsupport/vkconvenience/qbasicvulkanplatforminstance_p.h
@@ -72,6 +72,7 @@ public:
     QByteArrayList enabledExtensions() const override;
     PFN_vkVoidFunction getInstanceProcAddr(const char *name) override;
     bool supportsPresent(VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, QWindow *window) override;
+    void destroySurface(VkSurfaceKHR surface) const;
 
 protected:
     void init(QLibrary *lib);
@@ -80,6 +81,7 @@ protected:
     VkInstance m_vkInst;
     PFN_vkGetInstanceProcAddr m_vkGetInstanceProcAddr;
     PFN_vkGetPhysicalDeviceSurfaceSupportKHR m_getPhysDevSurfaceSupport;
+    PFN_vkDestroySurfaceKHR m_destroySurface;
 
 private:
     void setupDebugOutput();