From d78e8c02846a3634445a808d9845be8613bb1bfe Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Thu, 30 Mar 2023 22:06:46 +0100 Subject: Client: Cleanup vulkan surfaces on hide Otherwise a hide/show combination will result in use of wl_surface after it has been destroyed by QWaylandWindow. This closely matches what the pattern we use for QWaylandEGLWindow. Pick-to: 6.5 Change-Id: Ic23f947046ce521125dfa8a3c22f5529dfcbece2 Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/client/qwaylandvulkanwindow.cpp | 17 ++++++++++++----- src/client/qwaylandvulkanwindow_p.h | 1 + 2 files changed, 13 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/client/qwaylandvulkanwindow.cpp b/src/client/qwaylandvulkanwindow.cpp index db25a271..6a284658 100644 --- a/src/client/qwaylandvulkanwindow.cpp +++ b/src/client/qwaylandvulkanwindow.cpp @@ -14,11 +14,7 @@ QWaylandVulkanWindow::QWaylandVulkanWindow(QWindow *window, QWaylandDisplay *dis QWaylandVulkanWindow::~QWaylandVulkanWindow() { - if (m_surface) { - QVulkanInstance *inst = window()->vulkanInstance(); - if (inst) - static_cast(inst->handle())->destroySurface(m_surface); - } + invalidateSurface(); } QWaylandWindow::WindowType QWaylandVulkanWindow::windowType() const @@ -26,6 +22,17 @@ QWaylandWindow::WindowType QWaylandVulkanWindow::windowType() const return QWaylandWindow::Vulkan; } +void QWaylandVulkanWindow::invalidateSurface() +{ + if (m_surface) { + QVulkanInstance *inst = window()->vulkanInstance(); + if (inst) + static_cast(inst->handle())->destroySurface(m_surface); + } + m_surface = nullptr; + QWaylandWindow::invalidateSurface(); +} + VkSurfaceKHR *QWaylandVulkanWindow::vkSurface() { if (m_surface) diff --git a/src/client/qwaylandvulkanwindow_p.h b/src/client/qwaylandvulkanwindow_p.h index df24e5db..c5692bc7 100644 --- a/src/client/qwaylandvulkanwindow_p.h +++ b/src/client/qwaylandvulkanwindow_p.h @@ -29,6 +29,7 @@ public: ~QWaylandVulkanWindow() override; WindowType windowType() const override; + void invalidateSurface() override; VkSurfaceKHR *vkSurface(); -- cgit v1.2.1