1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Client: Cleanup vulkan surfaces on hide

Browse Source 
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 <eskil.abrahamsen-blomfeldt@qt.io>
This commit is contained in:
David Edmundson 2023-03-30 22:06:46 +01:00 committed by David Edmundson
parent e786b30e23
commit eabe2a039b
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/platforms/wayland/qwaylandvulkanwindow.cpp
View File

@ -14,11 +14,7 @@ QWaylandVulkanWindow::QWaylandVulkanWindow(QWindow *window, QWaylandDisplay *dis
QWaylandVulkanWindow::~QWaylandVulkanWindow() QWaylandVulkanWindow::~QWaylandVulkanWindow()
{ {
if (m_surface) { invalidateSurface();
QVulkanInstance *inst = window()->vulkanInstance();
if (inst)
static_cast<QWaylandVulkanInstance *>(inst->handle())->destroySurface(m_surface);
}
} }
QWaylandWindow::WindowType QWaylandVulkanWindow::windowType() const QWaylandWindow::WindowType QWaylandVulkanWindow::windowType() const
@ -26,6 +22,17 @@ QWaylandWindow::WindowType QWaylandVulkanWindow::windowType() const
return QWaylandWindow::Vulkan; return QWaylandWindow::Vulkan;
} }
void QWaylandVulkanWindow::invalidateSurface()
{
if (m_surface) {
QVulkanInstance *inst = window()->vulkanInstance();
if (inst)
static_cast<QWaylandVulkanInstance *>(inst->handle())->destroySurface(m_surface);
}
m_surface = nullptr;
QWaylandWindow::invalidateSurface();
}
VkSurfaceKHR *QWaylandVulkanWindow::vkSurface() VkSurfaceKHR *QWaylandVulkanWindow::vkSurface()
{ {
if (m_surface) if (m_surface)

1
src/plugins/platforms/wayland/qwaylandvulkanwindow_p.h
View File

@ -29,6 +29,7 @@ public:
~QWaylandVulkanWindow() override; ~QWaylandVulkanWindow() override;
WindowType windowType() const override; WindowType windowType() const override;
void invalidateSurface() override;
VkSurfaceKHR *vkSurface(); VkSurfaceKHR *vkSurface();