Archive/Play-
0
0
Fork 0
mirror of https://github.com/jpd002/Play-.git synced 2025-04-28 13:47:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Qt6 build with Vulkan on Linux.

Browse source
This commit is contained in:
Jean-Philip Desjardins 2024-02-19 14:10:20 -05:00
parent 1a6a554f43
commit 3eb0b9852b
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Source/ui_qt/GSH_VulkanQt.cpp
View file

@ -2,14 +2,17 @@
#include "vulkan/StructDefs.h" #include "vulkan/StructDefs.h"
#include "vulkan/Loader.h" #include "vulkan/Loader.h"
#include <QWindow> #include <QWindow>
#include <QGuiApplication>
#ifdef __APPLE__ #ifdef __APPLE__
#include <MoltenVK/vk_mvk_moltenvk.h> #include <MoltenVK/vk_mvk_moltenvk.h>
#endif #endif
#ifdef __linux__ #ifdef __linux__
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include <QX11Info> #include <QX11Info>
#endif #endif
#endif
CGSH_VulkanQt::CGSH_VulkanQt(QWindow* renderWindow) CGSH_VulkanQt::CGSH_VulkanQt(QWindow* renderWindow)
: m_renderWindow(renderWindow) : m_renderWindow(renderWindow)
@ -42,7 +45,11 @@ void CGSH_VulkanQt::InitializeImpl()
#ifdef __linux__ #ifdef __linux__
auto surfaceCreateInfo = Framework::Vulkan::XcbSurfaceCreateInfoKHR(); auto surfaceCreateInfo = Framework::Vulkan::XcbSurfaceCreateInfoKHR();
surfaceCreateInfo.window = static_cast<xcb_window_t>(m_renderWindow->winId()); surfaceCreateInfo.window = static_cast<xcb_window_t>(m_renderWindow->winId());
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
surfaceCreateInfo.connection = qGuiApp->nativeInterface<QNativeInterface::QX11Application>()->connection();
#else
surfaceCreateInfo.connection = QX11Info::connection(); surfaceCreateInfo.connection = QX11Info::connection();
#endif
auto result = m_instance.vkCreateXcbSurfaceKHR(m_instance, &surfaceCreateInfo, nullptr, &m_context->surface); auto result = m_instance.vkCreateXcbSurfaceKHR(m_instance, &surfaceCreateInfo, nullptr, &m_context->surface);
CHECKVULKANERROR(result); CHECKVULKANERROR(result);
#endif #endif