vulkan hacking

rectalogic · Apr 18, 2024 · 6965dd2 · 6965dd2
1 parent efd246b
commit 6965dd2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/src/MediaFX/render_window.cpp b/src/MediaFX/render_window.cpp
@@ -38,16 +38,6 @@ RenderWindow::RenderWindow()
         m_vulkanInstance.setExtensions(QQuickGraphicsConfiguration::preferredInstanceExtensions());
         m_vulkanInstance.setApiVersion(QVersionNumber(1, 0));
         m_vulkanInstance.create();
-    }
-#endif
-}
-
-RenderWindow::~RenderWindow() = default;
-
-void RenderWindow::classBegin()
-{
-#ifdef MEDIAFX_ENABLE_VULKAN
-    if (rendererInterface()->graphicsApi() == QSGRendererInterface::Vulkan) {
         if (!m_vulkanInstance.isValid()) {
             qCritical() << "Invalid Vulkan instance";
             return;
@@ -62,6 +52,8 @@ void RenderWindow::classBegin()
     m_isValid = true;
 }
 
+RenderWindow::~RenderWindow() = default;
+
 void RenderWindow::componentComplete()
 {
     // QQuickWindow does not resize contentItem

diff --git a/src/MediaFX/render_window.h b/src/MediaFX/render_window.h
@@ -40,7 +40,7 @@ public slots:
     void render();
 
 protected:
-    void classBegin() override;
+    void classBegin() override { }
     void componentComplete() override;
 
 private:
@@ -51,9 +51,9 @@ public slots:
     RenderSession* renderSession();
 
     RenderSession* m_renderSession = nullptr;
-    std::unique_ptr<RenderControl> m_renderControl;
 #ifdef MEDIAFX_ENABLE_VULKAN
     QVulkanInstance m_vulkanInstance;
 #endif
+    std::unique_ptr<RenderControl> m_renderControl;
     bool m_isValid = false;
 };