Client: Guard our surface from being destroyed whilst rendering from Vulkan

Change-Id: Ibac173b769186b49251bad9b94c71b9ccea26a7e
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

2 files changed, 23 insertions, 0 deletions

diff --git a/src/client/qwaylandvulkaninstance.cpp b/src/client/qwaylandvulkaninstance.cpp
index 2f95ff307..be55130a4 100644
--- a/src/client/qwaylandvulkaninstance.cpp
+++ b/src/client/qwaylandvulkaninstance.cpp
@@ -101,6 +101,26 @@ void QWaylandVulkanInstance::presentAboutToBeQueued(QWindow *window)
     w->handleUpdate();
 }
 
+void QWaylandVulkanInstance::beginFrame(QWindow *window)
+{
+    auto *w = static_cast<QWaylandWindow *>(window->handle());
+    if (!w) {
+        qWarning() << "Attempted to call beginFrame() without a valid platform window";
+        return;
+    }
+    w->beginFrame();
+}
+
+void QWaylandVulkanInstance::endFrame(QWindow *window)
+{
+    auto *w = static_cast<QWaylandWindow *>(window->handle());
+    if (!w) {
+        qWarning() << "Attempted to call endFrame() without a valid platform window";
+        return;
+    }
+    w->endFrame();
+}
+
 } // namespace QtWaylandClient
 
 QT_END_NAMESPACE
diff --git a/src/client/qwaylandvulkaninstance_p.h b/src/client/qwaylandvulkaninstance_p.h
index abeca95db..7683ce566 100644
--- a/src/client/qwaylandvulkaninstance_p.h
+++ b/src/client/qwaylandvulkaninstance_p.h
@@ -42,6 +42,9 @@ public:
 
     VkSurfaceKHR createSurface(QWaylandWindow *window);
 
+    void beginFrame(QWindow *window) override;
+    void endFrame(QWindow *window) override;
+
 private:
     QVulkanInstance *m_instance = nullptr;
     PFN_vkGetPhysicalDeviceWaylandPresentationSupportKHR m_getPhysDevPresSupport = nullptr;