From 6f968e3fd7510419047be5b8b095d30556734dac Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Mon, 25 Apr 2022 16:09:37 +0600 Subject: [PATCH] qt: Fix compiling with Vulkan support unavailable --- src/qt/qt_mainwindow.cpp | 5 +++++ src/qt/qt_rendererstack.cpp | 3 +++ src/qt/qt_vulkanrenderer.cpp | 2 ++ src/qt/qt_vulkanrenderer.hpp | 2 ++ src/qt/qt_vulkanwindowrenderer.cpp | 2 ++ src/qt/qt_vulkanwindowrenderer.hpp | 2 ++ 6 files changed, 16 insertions(+) diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp index 1e9c3501c..d15151039 100644 --- a/src/qt/qt_mainwindow.cpp +++ b/src/qt/qt_mainwindow.cpp @@ -280,6 +280,11 @@ MainWindow::MainWindow(QWidget *parent) : ui->actionOpenGL_3_0_Core->setVisible(false); } +#if !QT_CONFIG(vulkan) + if (vid_api == 4) vid_api = 0; + ui->actionVulkan->setVisible(false); +#endif + QActionGroup* actGroup = nullptr; actGroup = new QActionGroup(this); diff --git a/src/qt/qt_rendererstack.cpp b/src/qt/qt_rendererstack.cpp index ac60d6f70..2f1649126 100644 --- a/src/qt/qt_rendererstack.cpp +++ b/src/qt/qt_rendererstack.cpp @@ -245,6 +245,7 @@ void RendererStack::createRenderer(Renderer renderer) { switch (renderer) { + default: case Renderer::Software: { auto sw = new SoftwareRenderer(this); @@ -296,6 +297,7 @@ RendererStack::createRenderer(Renderer renderer) current.reset(this->createWindowContainer(hw, this)); break; } +#if QT_CONFIG(vulkan) case Renderer::Vulkan: { this->createWinId(); @@ -331,6 +333,7 @@ RendererStack::createRenderer(Renderer renderer) current.reset(this->createWindowContainer(hw, this)); break; } +#endif } current->setFocusPolicy(Qt::NoFocus); diff --git a/src/qt/qt_vulkanrenderer.cpp b/src/qt/qt_vulkanrenderer.cpp index 0f8f0c5a3..bb1d8c3a3 100644 --- a/src/qt/qt_vulkanrenderer.cpp +++ b/src/qt/qt_vulkanrenderer.cpp @@ -34,6 +34,7 @@ #include #include #include "qt_vulkanrenderer.hpp" +#if QT_CONFIG(vulkan) #include extern "C" @@ -1003,3 +1004,4 @@ void VulkanRenderer2::startNextFrame() m_window->frameReady(); m_window->requestUpdate(); // render continuously, throttled by the presentation rate } +#endif diff --git a/src/qt/qt_vulkanrenderer.hpp b/src/qt/qt_vulkanrenderer.hpp index c2f52cada..abd4d7a13 100644 --- a/src/qt/qt_vulkanrenderer.hpp +++ b/src/qt/qt_vulkanrenderer.hpp @@ -35,6 +35,7 @@ #include #include +#if QT_CONFIG(vulkan) #include "qt_vulkanwindowrenderer.hpp" class VulkanRenderer2 : public QVulkanWindowRenderer @@ -91,3 +92,4 @@ private: QMatrix4x4 m_proj; float m_rotation = 0.0f; }; +#endif diff --git a/src/qt/qt_vulkanwindowrenderer.cpp b/src/qt/qt_vulkanwindowrenderer.cpp index b6b85bd37..4563bd349 100644 --- a/src/qt/qt_vulkanwindowrenderer.cpp +++ b/src/qt/qt_vulkanwindowrenderer.cpp @@ -5,6 +5,7 @@ #include #include +#if QT_CONFIG(vulkan) #include #include @@ -847,3 +848,4 @@ std::vector> VulkanWindowRenderer::get { return std::vector{std::make_tuple((uint8_t*)renderer->mappedPtr, &this->buf_usage[0])}; } +#endif diff --git a/src/qt/qt_vulkanwindowrenderer.hpp b/src/qt/qt_vulkanwindowrenderer.hpp index 96f127d23..df252d393 100644 --- a/src/qt/qt_vulkanwindowrenderer.hpp +++ b/src/qt/qt_vulkanwindowrenderer.hpp @@ -3,6 +3,7 @@ #include +#if QT_CONFIG(vulkan) #include "qt_renderercommon.hpp" #include "qt_vulkanrenderer.hpp" @@ -33,5 +34,6 @@ private: VulkanRenderer2* renderer; }; +#endif #endif // VULKANWINDOWRENDERER_HPP